Skip to content

Commit d39e6d9

Browse files
author
Nicolai Parlog
committed
Streamline POM and scripts
1 parent 7224a74 commit d39e6d9

File tree

5 files changed

+53
-91
lines changed

5 files changed

+53
-91
lines changed

‎compile.sh

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/bash
22
set -e
33

4-
echo "--- COMPILATION & PACKAGING ---"
5-
64
#Java executable for standard Linux environment
7-
export JAVAC_EXE=javac
8-
export JAR_EXE=jar
5+
export JAVAC=javac
6+
export JAR=jar
97
#Java executable for MinGW environment
10-
#export JAVAC_EXE=/c/jdk9/bin/javac.exe
11-
#export JAR_EXE=/c/jdk9/bin/jar.exe
8+
#export JAVAC=/c/jdk9/bin/javac.exe
9+
#export JAR=/c/jdk9/bin/jar.exe
10+
11+
echo "--- COMPILATION & PACKAGING ---"
1212

1313
echo " > creating clean directories"
1414
rm -rf classes
@@ -17,68 +17,68 @@ rm -rf mods
1717
mkdir mods
1818

1919
echo " > creating monitor.observer"
20-
$JAVAC_EXE \
20+
$JAVAC \
2121
-d classes/monitor.observer \
2222
$(find monitor.observer -name '*.java')
23-
$JAR_EXE --create \
23+
$JAR --create \
2424
--file mods/monitor.observer.jar \
2525
-C classes/monitor.observer .
2626

2727
echo " > creating monitor.observer.alpha"
28-
$JAVAC_EXE \
28+
$JAVAC \
2929
--module-path mods \
3030
-d classes/monitor.observer.alpha \
3131
$(find monitor.observer.alpha -name '*.java')
32-
$JAR_EXE --create \
32+
$JAR --create \
3333
--file mods/monitor.observer.alpha.jar \
3434
-C classes/monitor.observer.alpha .
3535

3636

3737
echo " > creating monitor.observer.beta"
38-
$JAVAC_EXE \
38+
$JAVAC \
3939
--module-path mods \
4040
-d classes/monitor.observer.beta \
4141
$(find monitor.observer.beta -name '*.java')
42-
$JAR_EXE --create \
42+
$JAR --create \
4343
--file mods/monitor.observer.beta.jar \
4444
-C classes/monitor.observer.beta .
4545

4646

4747
echo " > creating monitor.statistics"
48-
$JAVAC_EXE \
48+
$JAVAC \
4949
--module-path mods \
5050
-d classes/monitor.statistics \
5151
$(find monitor.statistics -name '*.java')
52-
$JAR_EXE --create \
52+
$JAR --create \
5353
--file mods/monitor.statistics.jar \
5454
-C classes/monitor.statistics .
5555

5656
echo " > creating monitor.persistence"
57-
$JAVAC_EXE \
57+
$JAVAC \
5858
--module-path mods \
5959
-d classes/monitor.persistence \
6060
$(find monitor.persistence -name '*.java')
61-
$JAR_EXE --create \
61+
$JAR --create \
6262
--file mods/monitor.persistence.jar \
6363
-C classes/monitor.persistence .
6464

6565
echo " > creating monitor.rest"
6666
# spark is required as an automatic module, so copy it to mods
6767
cp libs/spark-core-* mods/spark.core.jar
68-
$JAVAC_EXE \
68+
$JAVAC \
6969
--module-path mods \
7070
-d classes/monitor.rest \
7171
$(find monitor.rest -name '*.java')
72-
$JAR_EXE --create \
72+
$JAR --create \
7373
--file mods/monitor.rest.jar \
7474
-C classes/monitor.rest .
7575

7676
echo " > creating monitor"
77-
$JAVAC_EXE \
77+
$JAVAC \
7878
--module-path mods \
7979
-d classes/monitor \
8080
$(find monitor -name '*.java')
81-
$JAR_EXE --create \
81+
$JAR --create \
8282
--file mods/monitor.jar \
8383
--main-class monitor.Main \
8484
-C classes/monitor .

‎dry-run.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
#!/bin/bash
22

3-
echo ""
4-
echo "--- LAUNCH ---"
5-
63
#Java executable for standard Linux environment
7-
export JAVA_EXE=java
4+
export JAVA=java
85
#Java executable for MinGW environment
9-
#export JAVA_EXE=/c/jdk9/bin/java.exe
6+
#export JAVA=/c/jdk9/bin/java.exe
7+
8+
echo ""
9+
echo "--- LAUNCH ---"
1010

1111
echo " > dry-run monitor"
1212
echo ""
1313

1414
if [ "$1" == "mvn" ]
1515
then
1616
# the classpath is needed for Spark's dependencies
17-
$JAVA_EXE \
17+
$JAVA \
1818
--module-path mods-mvn \
1919
--class-path "libs/*" \
2020
--dry-run \
2121
--module monitor
2222
else
2323
# the classpath is needed for Spark's dependencies
24-
$JAVA_EXE \
24+
$JAVA \
2525
--module-path mods \
2626
--class-path "libs/*" \
2727
--dry-run \

‎multi-compile.sh

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/bash
22
set -e
33

4-
echo "--- COMPILATION & PACKAGING ---"
5-
64
#Java executable for standard Linux environment
7-
export JAVAC_EXE=javac
8-
export JAR_EXE=jar
5+
export JAVAC=javac
6+
export JAR=jar
97
#Java executable for MinGW environment
10-
#export JAVAC_EXE=/c/jdk9/bin/javac.exe
11-
#export JAR_EXE=/c/jdk9/bin/jar.exe
8+
#export JAVAC=/c/jdk9/bin/javac.exe
9+
#export JAR=/c/jdk9/bin/jar.exe
10+
11+
echo "--- COMPILATION & PACKAGING ---"
1212

1313
echo " > creating clean directories"
1414
rm -rf classes
@@ -19,32 +19,32 @@ mkdir mods
1919
echo " > multi-compiling modules"
2020
# spark is required as an automatic module, so copy it to mods
2121
cp libs/spark-core-* mods/spark.core.jar
22-
$JAVAC_EXE \
22+
$JAVAC \
2323
--module-path mods \
2424
--module-source-path "./*/src/main/java" \
2525
-d classes \
2626
--module monitor
2727

2828
echo " > packaging modules"
29-
$JAR_EXE --create \
29+
$JAR --create \
3030
--file mods/monitor.observer.jar \
3131
-C classes/monitor.observer .
32-
$JAR_EXE --create \
32+
$JAR --create \
3333
--file mods/monitor.observer.alpha.jar \
3434
-C classes/monitor.observer.alpha .
35-
$JAR_EXE --create \
35+
$JAR --create \
3636
--file mods/monitor.observer.beta.jar \
3737
-C classes/monitor.observer.beta .
38-
$JAR_EXE --create \
38+
$JAR --create \
3939
--file mods/monitor.statistics.jar \
4040
-C classes/monitor.statistics .
41-
$JAR_EXE --create \
41+
$JAR --create \
4242
--file mods/monitor.persistence.jar \
4343
-C classes/monitor.persistence .
44-
$JAR_EXE --create \
44+
$JAR --create \
4545
--file mods/monitor.rest.jar \
4646
-C classes/monitor.rest .
47-
$JAR_EXE --create \
47+
$JAR --create \
4848
--file mods/monitor.jar \
4949
--main-class monitor.Main \
5050
-C classes/monitor .

‎pom.xml

+5-43
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<packaging>pom</packaging>
1111

1212
<properties>
13+
<java>java</java>
1314
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1415
<maven.compiler.source>9</maven.compiler.source>
1516
<maven.compiler.target>9</maven.compiler.target>
@@ -46,8 +47,6 @@
4647
<artifactId>maven-compiler-plugin</artifactId>
4748
<version>3.7.0</version>
4849
<configuration>
49-
<source>9</source>
50-
<target>9</target>
5150
<fork>true</fork>
5251
</configuration>
5352
</plugin>
@@ -65,53 +64,16 @@
6564
</execution>
6665
</executions>
6766
<configuration>
68-
<executable>java</executable>
67+
<executable>${java}</executable>
6968
<workingDirectory>.</workingDirectory>
7069
<longModulepath>false</longModulepath>
7170
<arguments>
72-
<argument>--module-path</argument>
73-
<argument>mods-mvn</argument>
74-
<argument>--class-path</argument>
75-
<argument>libs/*</argument>
76-
<argument>--module</argument>
77-
<argument>monitor/monitor.Main</argument>
71+
<argument>--module-path=mods-mvn</argument>
72+
<argument>--class-path=libs/*</argument>
73+
<argument>--module=monitor/monitor.Main</argument>
7874
</arguments>
7975
</configuration>
8076
</plugin>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-jar-plugin</artifactId>
84-
<version>3.0.2</version>
85-
<configuration>
86-
<archive>
87-
<addMavenDescriptor>true</addMavenDescriptor>
88-
<forced>false</forced>
89-
<manifest>
90-
<addClasspath>true</addClasspath>
91-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
92-
</manifest>
93-
</archive>
94-
</configuration>
95-
</plugin>
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-source-plugin</artifactId>
99-
<version>3.0.1</version>
100-
<executions>
101-
<execution>
102-
<id>package-sources</id>
103-
<goals>
104-
<goal>jar</goal>
105-
<goal>test-jar</goal>
106-
</goals>
107-
<phase>package</phase>
108-
<inherited>true</inherited>
109-
<configuration>
110-
<attach>true</attach>
111-
</configuration>
112-
</execution>
113-
</executions>
114-
</plugin>
11577
</plugins>
11678
</build>
11779

‎run.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#!/bin/bash
22

3-
echo ""
4-
echo "--- LAUNCH ---"
5-
63
#Java executable for standard Linux environment
7-
export JAVA_EXE=java
4+
export JAVA=java
85
#Java executable for MinGW environment
9-
#export JAVA_EXE=/c/jdk9/bin/java.exe
6+
#export JAVA=/c/jdk9/bin/java.exe
7+
8+
echo ""
9+
echo "--- LAUNCH ---"
1010

1111
echo " > run monitor"
1212
echo ""
1313

1414
if [ "$1" == "mvn" ]
1515
then
1616
# the classpath is needed for Spark's dependencies
17-
$JAVA_EXE \
17+
$JAVA \
1818
--module-path mods-mvn \
1919
--class-path "libs/*" \
2020
--module monitor
2121
else
2222
# the classpath is needed for Spark's dependencies
23-
$JAVA_EXE \
23+
$JAVA \
2424
--module-path mods \
2525
--class-path "libs/*" \
2626
--module monitor

0 commit comments

Comments
 (0)