Merge pull request #54 from jiep/45-update-java-version

Revert to Java 8
jiep · May 1, 2024 · fee183e · fee183e
2 parents 0b6b11c + 0a697d2
commit fee183e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,13 +19,13 @@ jobs:
       run: sudo mkdir -p /usr/share/man/man1/ && sudo apt update && sudo apt install -y maven python3 hub
 
     - uses: actions/checkout@v4
-    - name: Set up JDK 21
+    - name: Set up JDK 8
       uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: '21'
+        java-version: '8'
     - name: Build with Maven
-      run: mvn clean resources:resources assembly:assembly -DdescriptorId=jar-with-dependencies
+      run: mvn clean compile resources:resources assembly:single
 
     - name: Set release
       if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)

diff --git a/pom.xml b/pom.xml
@@ -5,15 +5,15 @@
 
   <groupId>com.aebd.jMetro</groupId>
   <artifactId>jMetro</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1</version>
 
   <name>jMetro</name>
   <url>https://github.com/jiep/jMetro</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
   <dependencies></dependencies>
@@ -64,13 +64,26 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.7.1</version>
           <configuration>
             <archive>
               <manifest>
                 <mainClass>com.aebd.jMetro.gui.JMetro</mainClass>
               </manifest>
             </archive>
+            <descriptorRefs>
+              <descriptorRef>jar-with-dependencies</descriptorRef>
+            </descriptorRefs>
           </configuration>
+          <executions>
+            <execution>
+              <id>make-assembly</id> <!-- this is used for inheritance merges -->
+              <phase>package</phase> <!-- bind to the packaging phase -->
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>