From 76a148c27268027a41e64fd4fe62570d2c9268ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ignacio=20Escribano?=
 <jiep@users.noreply.github.com>
Date: Wed, 1 May 2024 15:16:51 +0000
Subject: [PATCH 1/4] Revert to Java 8

---
 .github/workflows/CI.yml |  4 ++--
 pom.xml                  | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3077322..fcdd571 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -19,11 +19,11 @@ 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
 
diff --git a/pom.xml b/pom.xml
index d7f38f3..af36153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,8 @@
 
   <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.6.0</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>

From 89b9090c020a21ff028fbbff061a54bbbd7c61d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ignacio=20Escribano?=
 <jiep@users.noreply.github.com>
Date: Wed, 1 May 2024 15:19:46 +0000
Subject: [PATCH 2/4] Update Maven command

---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index fcdd571..652e6db 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -25,7 +25,7 @@ jobs:
         distribution: 'zulu'
         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)

From d2add1c62cd7e4a85e1cfe6ab477c4e856259855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ignacio=20Escribano?=
 <jiep@users.noreply.github.com>
Date: Wed, 1 May 2024 15:22:16 +0000
Subject: [PATCH 3/4] Update plugin version to 3.7.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index af36153..53c6e86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.7.1</version>
           <configuration>
             <archive>
               <manifest>

From 0a697d2f2500dd9508cd9e026ba10bbfbca519aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ignacio=20Escribano?=
 <jiep@users.noreply.github.com>
Date: Wed, 1 May 2024 15:23:41 +0000
Subject: [PATCH 4/4] Bump version 1.4.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 53c6e86..cb7bcfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <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>