Updated scripts and dependencies

Author: jeffmorin

compile.sh

@@ -3,75 +3,82 @@ set -e
 
 echo "--- COMPILATION & PACKAGING ---"
 
+#Java executable for standard Linux environment
+export JAVAC_EXE=javac
+export JAR_EXE=jar
+#Java executable for MinGW environment
+#export JAVAC_EXE=/c/jdk9/bin/javac.exe
+#export JAR_EXE=/c/jdk9/bin/jar.exe
+
 echo " > creating clean directories"
 rm -rf classes
 mkdir classes
 rm -rf mods
 mkdir mods
 
 echo " > creating monitor.observer"
-javac \
+$JAVAC_EXE \
 	-d classes/monitor.observer \
 	$(find monitor.observer -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.observer.jar \
 	-C classes/monitor.observer .
 
 echo " > creating monitor.observer.alpha"
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	-d classes/monitor.observer.alpha \
 	$(find monitor.observer.alpha -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.observer.alpha.jar \
 	-C classes/monitor.observer.alpha .
 
 
 echo " > creating monitor.observer.beta"
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	-d classes/monitor.observer.beta \
 	$(find monitor.observer.beta -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.observer.beta.jar \
 	-C classes/monitor.observer.beta .
 
 
 echo " > creating monitor.statistics"
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	-d classes/monitor.statistics \
 	$(find monitor.statistics -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.statistics.jar \
 	-C classes/monitor.statistics .
 
 echo " > creating monitor.persistence"
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	-d classes/monitor.persistence \
 	$(find monitor.persistence -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.persistence.jar \
 	-C classes/monitor.persistence .
 
 echo " > creating monitor.rest"
 # spark is required as an automatic module, so copy it to mods
 cp libs/spark-core-* mods/spark.core.jar
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	-d classes/monitor.rest \
 	$(find monitor.rest -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.rest.jar \
 	-C classes/monitor.rest .
 
 echo " > creating monitor"
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	-d classes/monitor \
 	$(find monitor -name '*.java')
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.jar \
 	--main-class monitor.Main \
 	-C classes/monitor .

dry-run.sh

@@ -3,20 +3,25 @@
 echo ""
 echo "--- LAUNCH ---"
 
+#Java executable for standard Linux environment
+export JAVA_EXE=java
+#Java executable for MinGW environment
+#export JAVA_EXE=/c/jdk9/bin/java.exe
+
 echo " > dry-run monitor"
 echo ""
 
 if [ "$1" == "mvn" ]
 then
 # the classpath is needed for Spark's dependencies
-	java \
+	$JAVA_EXE \
 		--module-path mods-mvn \
 		--class-path "libs/*" \
 		--dry-run \
 		--module monitor
 else
 # the classpath is needed for Spark's dependencies
-	java \
+	$JAVA_EXE \
 		--module-path mods \
 		--class-path "libs/*" \
 		--dry-run \

libs/spark-core-2.7.0.jar renamed to libs/spark-core-2.7.1.jar

@@ -3,6 +3,13 @@ set -e
 
 echo "--- COMPILATION & PACKAGING ---"
 
+#Java executable for standard Linux environment
+export JAVAC_EXE=javac
+export JAR_EXE=jar
+#Java executable for MinGW environment
+#export JAVAC_EXE=/c/jdk9/bin/javac.exe
+#export JAR_EXE=/c/jdk9/bin/jar.exe
+
 echo " > creating clean directories"
 rm -rf classes
 mkdir classes
@@ -12,32 +19,32 @@ mkdir mods
 echo " > multi-compiling modules"
 # spark is required as an automatic module, so copy it to mods
 cp libs/spark-core-* mods/spark.core.jar
-javac \
+$JAVAC_EXE \
 	--module-path mods \
 	--module-source-path "./*/src/main/java" \
 	-d classes \
 	--module monitor
 
 echo " > packaging modules"
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.observer.jar \
 	-C classes/monitor.observer .
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.observer.alpha.jar \
 	-C classes/monitor.observer.alpha .
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.observer.beta.jar \
 	-C classes/monitor.observer.beta .
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.statistics.jar \
 	-C classes/monitor.statistics .
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.persistence.jar \
 	-C classes/monitor.persistence .
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.rest.jar \
 	-C classes/monitor.rest .
-jar --create \
+$JAR_EXE --create \
 	--file mods/monitor.jar \
 	--main-class monitor.Main \
 	-C classes/monitor .

multi-compile.sh

@@ -31,7 +31,7 @@
 			<dependency>
 				<groupId>com.sparkjava</groupId>
 				<artifactId>spark-core</artifactId>
-				<version>2.7.0</version>
+				<version>2.7.1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

pom.xml

@@ -3,19 +3,24 @@
 echo ""
 echo "--- LAUNCH ---"
 
+#Java executable for standard Linux environment
+export JAVA_EXE=java
+#Java executable for MinGW environment
+#export JAVA_EXE=/c/jdk9/bin/java.exe
+
 echo " > run monitor"
 echo ""
 
 if [ "$1" == "mvn" ]
 then
 # the classpath is needed for Spark's dependencies
-	java \
+	$JAVA_EXE \
 		--module-path mods-mvn \
 		--class-path "libs/*" \
 		--module monitor
 else
 # the classpath is needed for Spark's dependencies
-	java \
+	$JAVA_EXE \
 		--module-path mods \
 		--class-path "libs/*" \
 		--module monitor