s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup classpath generation in Maven config files

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-09-11 15:18:03 +01:00
parent a978317559
commit 9b659c618c
9 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/database/pom.xml
View File

@ -92,9 +92,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

3
extensions/gdata/pom.xml
View File

@ -90,9 +90,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

3
extensions/jython/pom.xml
View File

@ -77,9 +77,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

3
extensions/pc-axis/pom.xml
View File

@ -75,9 +75,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

3
extensions/sample/pom.xml
View File

@ -66,9 +66,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

3
extensions/wikidata/pom.xml
View File

@ -82,9 +82,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

3
main/pom.xml
View File

@ -93,9 +93,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration>
<outputFile>target/classpath.txt</outputFile>
</configuration>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>

20
refine
View File

@ -327,12 +327,6 @@ mvn_prepare() {
fi fi
} }
classpath_prepare() {
mvn_prepare
$MVN compile dependency:build-classpath
}
appengine_prepare() { appengine_prepare() {
if [ -z "$APPENGINE_HOME" ] ; then 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." 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 if [ -z "$IS_JAR" ] ; then
mvn_prepare mvn_prepare
$MVN process-resources $MVN process-resources
$MVN compile test-compile dependency:build-classpath $MVN compile
echo "" echo ""
fi fi
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 if [ -d $REFINE_CLASSES_DIR ] ; then
add_option "-Drefine.autoreload=true -Dbutterfly.autoreload=true" add_option "-Drefine.autoreload=true -Dbutterfly.autoreload=true"
fi fi
@ -688,8 +677,7 @@ run() {
add_option "-Drefine.autosave=$REFINE_AUTOSAVE_PERIOD" add_option "-Drefine.autosave=$REFINE_AUTOSAVE_PERIOD"
fi fi
LIB_PATHS=`cat server/target/classpath.txt` CLASSPATH="$REFINE_CLASSES_DIR${SEP}$REFINE_LIB_DIR"
CLASSPATH="$REFINE_CLASSES_DIR${SEP}$LIB_PATHS"
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine" RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
@ -982,7 +970,7 @@ if [ -z "$REFINE_CLASSES_DIR" ] ; then
fi fi
if [ -z "$REFINE_LIB_DIR" ] ; then if [ -z "$REFINE_LIB_DIR" ] ; then
REFINE_LIB_DIR="server/lib" REFINE_LIB_DIR="server/target/lib"
fi fi
if [ -z "$REFINE_BUILD_DIR" ] ; then 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 -------------------------------------------- # ----- Respond to the action given --------------------------------------------
case "$ACTION" in 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;; clean) mvn clean;;
whitespace) whitespace $1;; whitespace) whitespace $1;;
distclean) mvn distclean;; distclean) mvn distclean;;

1
server/pom.xml
View File

@ -112,7 +112,6 @@
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<configuration> <configuration>
<outputFile>target/classpath.txt</outputFile>
<includeScope>runtime</includeScope> <includeScope>runtime</includeScope>
</configuration> </configuration>
<executions> <executions>