diff --git a/extensions/database/pom.xml b/extensions/database/pom.xml index 5e838225c..76e2a8965 100644 --- a/extensions/database/pom.xml +++ b/extensions/database/pom.xml @@ -92,9 +92,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml index dc676aab5..178632b3f 100644 --- a/extensions/gdata/pom.xml +++ b/extensions/gdata/pom.xml @@ -90,9 +90,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/extensions/jython/pom.xml b/extensions/jython/pom.xml index 638e99d8c..fad16bc26 100644 --- a/extensions/jython/pom.xml +++ b/extensions/jython/pom.xml @@ -77,9 +77,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/extensions/pc-axis/pom.xml b/extensions/pc-axis/pom.xml index 9da99da62..ff93e3a08 100644 --- a/extensions/pc-axis/pom.xml +++ b/extensions/pc-axis/pom.xml @@ -75,9 +75,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/extensions/sample/pom.xml b/extensions/sample/pom.xml index 0603833a1..1b2dd8145 100644 --- a/extensions/sample/pom.xml +++ b/extensions/sample/pom.xml @@ -66,9 +66,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml index d7bdd21f8..b6850ede0 100644 --- a/extensions/wikidata/pom.xml +++ b/extensions/wikidata/pom.xml @@ -82,9 +82,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/main/pom.xml b/main/pom.xml index db0c981ed..48a68c1c4 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -93,9 +93,6 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.1 - - target/classpath.txt - compile diff --git a/refine b/refine index 074442d91..112cfad3c 100755 --- a/refine +++ b/refine @@ -327,12 +327,6 @@ mvn_prepare() { fi } -classpath_prepare() { - mvn_prepare - - $MVN compile dependency:build-classpath -} - appengine_prepare() { if [ -z "$APPENGINE_HOME" ] ; then error "You have to have the APPENGINE_HOME environment variable set and pointing to the local installation of the Google AppEngine SDK." @@ -646,16 +640,11 @@ run() { if [ -z "$IS_JAR" ] ; then mvn_prepare $MVN process-resources - $MVN compile test-compile dependency:build-classpath + $MVN compile echo "" fi fi - if [ ! -e "server/target/classpath.txt" ] ; then - mvn_prepare - $MVN compile test-compile dependency:build-classpath - fi - if [ -d $REFINE_CLASSES_DIR ] ; then add_option "-Drefine.autoreload=true -Dbutterfly.autoreload=true" fi @@ -688,8 +677,7 @@ run() { add_option "-Drefine.autosave=$REFINE_AUTOSAVE_PERIOD" fi - LIB_PATHS=`cat server/target/classpath.txt` - CLASSPATH="$REFINE_CLASSES_DIR${SEP}$LIB_PATHS" + CLASSPATH="$REFINE_CLASSES_DIR${SEP}$REFINE_LIB_DIR" RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine" @@ -982,7 +970,7 @@ if [ -z "$REFINE_CLASSES_DIR" ] ; then fi if [ -z "$REFINE_LIB_DIR" ] ; then - REFINE_LIB_DIR="server/lib" + REFINE_LIB_DIR="server/target/lib" fi if [ -z "$REFINE_BUILD_DIR" ] ; then @@ -1017,7 +1005,7 @@ add_option "-Dpython.cachedir=$HOME/.local/share/google/refine/cachedir" # ----- Respond to the action given -------------------------------------------- case "$ACTION" in - build) build_prepare; mvn process-resources; mvn compile test-compile dependency:build-classpath;; + build) build_prepare; mvn process-resources; mvn compile;; clean) mvn clean;; whitespace) whitespace $1;; distclean) mvn distclean;; diff --git a/server/pom.xml b/server/pom.xml index 57a7f15b1..a1676b359 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -112,7 +112,6 @@ maven-dependency-plugin 3.1.1 - target/classpath.txt runtime