Updated dependencies and POM, and added .bat scripts

Author: jeffmorin

compile.bat

@@ -0,0 +1,55 @@
+@echo off
+echo "--- COMPILATION & PACKAGING ---"
+
+echo " > creating clean directories"
+del /s /q classes
+rmdir /s /q classes
+mkdir classes
+del /s /q mods
+rmdir /s /q mods
+mkdir mods
+
+echo " > creating monitor.observer"
+dir /S /B monitor.observer\src\*.java > sources.txt
+javac -d classes/monitor.observer @sources.txt
+del sources.txt
+jar --create --file mods/monitor.observer.jar -C classes/monitor.observer .
+
+echo " > creating monitor.observer.alpha"
+dir /S /B monitor.observer.alpha\src\*.java > sources.txt
+javac --module-path mods -d classes/monitor.observer.alpha @sources.txt
+del sources.txt
+jar --create --file mods/monitor.observer.alpha.jar -C classes/monitor.observer.alpha .
+
+echo " > creating monitor.observer.beta"
+dir /S /B monitor.observer.beta\src\*.java > sources.txt
+javac --module-path mods -d classes/monitor.observer.beta @sources.txt
+del sources.txt
+jar --create --file mods/monitor.observer.beta.jar -C classes/monitor.observer.beta .
+
+echo " > creating monitor.statistics"
+dir /S /B monitor.statistics\src\*.java > sources.txt
+javac --module-path mods -d classes/monitor.statistics @sources.txt
+del sources.txt
+jar --create --file mods/monitor.statistics.jar -C classes/monitor.statistics .
+
+echo " > creating monitor.persistence"
+dir /S /B monitor.persistence\src\*.java > sources.txt
+javac --module-path mods -d classes/monitor.persistence @sources.txt
+del sources.txt
+jar --create --file mods/monitor.persistence.jar -C classes/monitor.persistence .
+
+echo " > creating monitor.rest"
+rem spark is required as an automatic module, so copy it to mods
+copy /y libs\spark-core-* mods\
+ren mods\spark-core-*.jar spark.core.jar
+dir /S /B monitor.rest\src\*.java > sources.txt
+javac --module-path mods -d classes/monitor.rest @sources.txt
+del sources.txt
+jar --create --file mods/monitor.rest.jar -C classes/monitor.rest .
+
+echo " > creating monitor"
+dir /S /B monitor\src\*.java > sources.txt
+javac --module-path mods -d classes/monitor @sources.txt
+del sources.txt
+jar --create --file mods/monitor.jar --main-class monitor.Main -C classes/monitor .

compile.sh

@@ -10,68 +10,68 @@ rm -rf mods
 mkdir mods
 
 echo " > creating monitor.observer"
-javac9 \
+javac \
 	-d classes/monitor.observer \
 	$(find monitor.observer -name '*.java')
-jar9 --create \
+jar --create \
 	--file mods/monitor.observer.jar \
 	-C classes/monitor.observer .
 
 echo " > creating monitor.observer.alpha"
-javac9 \
+javac \
 	--module-path mods \
 	-d classes/monitor.observer.alpha \
 	$(find monitor.observer.alpha -name '*.java')
-jar9 --create \
+jar --create \
 	--file mods/monitor.observer.alpha.jar \
 	-C classes/monitor.observer.alpha .
 
 
 echo " > creating monitor.observer.beta"
-javac9 \
+javac \
 	--module-path mods \
 	-d classes/monitor.observer.beta \
 	$(find monitor.observer.beta -name '*.java')
-jar9 --create \
+jar --create \
 	--file mods/monitor.observer.beta.jar \
 	-C classes/monitor.observer.beta .
 
 
 echo " > creating monitor.statistics"
-javac9 \
+javac \
 	--module-path mods \
 	-d classes/monitor.statistics \
 	$(find monitor.statistics -name '*.java')
-jar9 --create \
+jar --create \
 	--file mods/monitor.statistics.jar \
 	-C classes/monitor.statistics .
 
 echo " > creating monitor.persistence"
-javac9 \
+javac \
 	--module-path mods \
 	-d classes/monitor.persistence \
 	$(find monitor.persistence -name '*.java')
-jar9 --create \
+jar --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
-javac9 \
+javac \
 	--module-path mods \
 	-d classes/monitor.rest \
 	$(find monitor.rest -name '*.java')
-jar9 --create \
+jar --create \
 	--file mods/monitor.rest.jar \
 	-C classes/monitor.rest .
 
 echo " > creating monitor"
-javac9 \
+javac \
 	--module-path mods \
 	-d classes/monitor \
 	$(find monitor -name '*.java')
-jar9 --create \
+jar --create \
 	--file mods/monitor.jar \
 	--main-class monitor.Main \
 	-C classes/monitor .

dry-run.bat

@@ -0,0 +1,19 @@
+@echo off
+echo ""
+echo "--- LAUNCH ---"
+
+if "%1" == "mvn" goto maven
+echo " > dry-run monitor"
+echo ""
+rem the classpath is needed for Spark's dependencies
+java --module-path mods --class-path "libs/*" --dry-run --module monitor
+goto end
+
+:maven
+echo " > dry-run monitor from Maven build"
+echo ""
+rem This version runs the application when built with Maven.
+rem the classpath is needed for Spark's dependencies
+java --module-path mods-mvn --class-path "libs/*" --dry-run --module monitor/monitor.Main
+
+:end

dry-run.sh

@@ -6,9 +6,19 @@ echo "--- LAUNCH ---"
 echo " > dry-run monitor"
 echo ""
 
+if [ "$1" == "mvn" ]
+then
 # the classpath is needed for Spark's dependencies
-java9 \
-	--module-path mods \
-	--class-path "libs/*" \
-	--dry-run \
-	--module monitor
+	java \
+		--module-path mods-mvn \
+		--class-path "libs/*" \
+		--dry-run \
+		--module monitor
+else
+# the classpath is needed for Spark's dependencies
+	java \
+		--module-path mods \
+		--class-path "libs/*" \
+		--dry-run \
+		--module monitor
+fi

libs/jetty-http-9.3.22.v20171030.jar

@@ -0,0 +1,24 @@
+@echo off
+echo "--- COMPILATION & PACKAGING ---"
+
+echo " > creating clean directories"
+del /s /q classes
+rmdir /s /q classes
+mkdir classes
+del /s /q mods
+rmdir /s /q mods
+mkdir mods
+
+echo " > multi-compiling modules"
+rem spark is required as an automatic module, so copy it to mods
+copy libs\spark-core-*.jar mods\
+javac --module-path mods --module-source-path "./*/src/main/java" -d classes --module monitor
+
+echo " > packaging modules"
+jar --create --file mods/monitor.observer.jar -C classes/monitor.observer .
+jar --create --file mods/monitor.observer.alpha.jar -C classes/monitor.observer.alpha .
+jar --create --file mods/monitor.observer.beta.jar -C classes/monitor.observer.beta .
+jar --create --file mods/monitor.statistics.jar -C classes/monitor.statistics .
+jar --create --file mods/monitor.persistence.jar -C classes/monitor.persistence .
+jar --create --file mods/monitor.rest.jar -C classes/monitor.rest .
+jar --create --file mods/monitor.jar --main-class monitor.Main -C classes/monitor .

libs/jetty-http-9.3.6.v20151106.jar

@@ -12,32 +12,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
-javac9 \
+javac \
 	--module-path mods \
 	--module-source-path "./*/src/main/java" \
 	-d classes \
 	--module monitor
 
 echo " > packaging modules"
-jar9 --create \
+jar --create \
 	--file mods/monitor.observer.jar \
 	-C classes/monitor.observer .
-jar9 --create \
+jar --create \
 	--file mods/monitor.observer.alpha.jar \
 	-C classes/monitor.observer.alpha .
-jar9 --create \
+jar --create \
 	--file mods/monitor.observer.beta.jar \
 	-C classes/monitor.observer.beta .
-jar9 --create \
+jar --create \
 	--file mods/monitor.statistics.jar \
 	-C classes/monitor.statistics .
-jar9 --create \
+jar --create \
 	--file mods/monitor.persistence.jar \
 	-C classes/monitor.persistence .
-jar9 --create \
+jar --create \
 	--file mods/monitor.rest.jar \
 	-C classes/monitor.rest .
-jar9 --create \
+jar --create \
 	--file mods/monitor.jar \
 	--main-class monitor.Main \
 	-C classes/monitor .

libs/jetty-io-9.3.22.v20171030.jar

@@ -31,7 +31,7 @@
 			<dependency>
 				<groupId>com.sparkjava</groupId>
 				<artifactId>spark-core</artifactId>
-				<version>2.6.0</version>
+				<version>2.7.0</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -46,6 +46,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.7.0</version>
 				<configuration>
+					<source>9</source>
+					<target>9</target>
 					<fork>true</fork>
 				</configuration>
 			</plugin>
@@ -63,7 +65,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<executable>java9</executable>
+					<executable>java</executable>
 					<workingDirectory>.</workingDirectory>
 					<longModulepath>false</longModulepath>
 					<arguments>
@@ -76,6 +78,40 @@
 					</arguments>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>true</addMavenDescriptor>
+						<forced>false</forced>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.0.1</version>
+				<executions>
+					<execution>
+						<id>package-sources</id>
+						<goals>
+							<goal>jar</goal>
+							<goal>test-jar</goal>
+						</goals>
+						<phase>package</phase>
+						<inherited>true</inherited>
+						<configuration>
+							<attach>true</attach>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

libs/jetty-io-9.3.6.v20151106.jar

@@ -0,0 +1,19 @@
+@echo off
+echo ""
+echo "--- LAUNCH ---"
+
+if "%1" == "mvn" goto maven
+echo " > run monitor"
+echo ""
+rem the classpath is needed for Spark's dependencies
+java --module-path mods --class-path "libs/*" --module monitor
+goto end
+
+:maven
+echo " > run monitor from Maven build"
+echo ""
+rem This version runs the application when built with Maven.
+rem the classpath is needed for Spark's dependencies
+java --module-path mods-mvn --class-path "libs/*" --module monitor/monitor.Main
+
+:end

libs/jetty-security-9.3.22.v20171030.jar

@@ -6,8 +6,17 @@ echo "--- LAUNCH ---"
 echo " > run monitor"
 echo ""
 
+if [ "$1" == "mvn" ]
+then
 # the classpath is needed for Spark's dependencies
-java9 \
-	--module-path mods \
-	--class-path "libs/*" \
-	--module monitor
+	java \
+		--module-path mods-mvn \
+		--class-path "libs/*" \
+		--module monitor
+else
+# the classpath is needed for Spark's dependencies
+	java \
+		--module-path mods \
+		--class-path "libs/*" \
+		--module monitor
+fi