Migrate to Java 21 (#119)

* Migrate to Java 21
  That way the project benefit from the last java features and keep tech debt under control
* Update docker-compose
  That way it is more independent of the host

.code/docker-compose/docker-compose.yml

@@ -18,7 +18,7 @@ services:
 #      - mqtt-server
 #    image: cookiecodedev/rika2mqtt
 #    environment:
-#      - MQTT_HOST=localhost
+#      - MQTT_HOST=mqtt-server
 #      - MQTT_USERNAME=testuser
 #      - MQTT_PASSWORD=secret
 #      - RIKA_EMAIL=<your email>

.github/workflows/build.yml

@@ -16,10 +16,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '20'
+          java-version: '21'
           distribution: 'temurin'
       - name: Check code formatting
         run: mvn -B com.spotify.fmt:fmt-maven-plugin:check

.github/workflows/release-latest.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Java for building
         uses: actions/setup-java@v3
         with:
-          java-version: '20'
+          java-version: '21'
           distribution: 'temurin'
       - name: Set version in pom.xml as github run build number for traceability
         run: mvn -B versions:set -DnewVersion=${{github.run_number}} -DgenerateBackupPoms=false

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Java for publishing to Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '20'
+          java-version: '21'
           distribution: 'temurin'
           server-id: ossrh
           server-username: MAVEN_USERNAME

.github/workflows/sonar.yml

@@ -58,10 +58,10 @@ jobs:
           name: BUILD_FILES
       - name: List files
         run: ls
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '20'
+          java-version: '21'
           distribution: 'temurin'
       - name: SonarCloud Scan on PR
         if: github.event.workflow_run.event == 'pull_request'
@@ -75,10 +75,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '20'
+          java-version: '21'
           distribution: 'temurin'
       - name: Build on push for sonarscan (not PR branch)
         if: github.event.workflow_run.event == 'push' && github.event.workflow_run.head_repository.full_name == github.event.repository.full_name

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

Dockerfile

@@ -21,16 +21,16 @@
 # THE SOFTWARE.
 #
 
-FROM eclipse-temurin:20.0.2_9-jre-jammy
+FROM eclipse-temurin:21.0.1_12-jre-jammy
 
 RUN mkdir -p /opt/rika2mqtt
 
 WORKDIR /opt/rika2mqtt
 COPY .docker/ .
-COPY bridge/target/*.jar rika2mqtt.jar
+COPY bridge/target/rika2mqtt.jar rika2mqtt.jar
 RUN sh -c 'touch rika2mqtt.jar'
 
 RUN chmod a+x init.sh
 
 # set the startup command to run
-ENTRYPOINT ["/opt/rika2mqtt/init.sh"]
+ENTRYPOINT ["/opt/rika2mqtt/init.sh"]

bridge/pom.xml

@@ -71,6 +71,25 @@
         </configuration>
         <groupId>org.springframework.boot</groupId>
       </plugin>
+      <plugin>
+        <groupId>com.coderplus.maven.plugins</groupId>
+        <artifactId>copy-rename-maven-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>copy-rename-file</id>
+            <phase>install</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <!-- copy rika2mqtt-bridge-<version>.jar rika2mqtt.jar file (ease copy from Dockerfile -->
+              <sourceFile>target/rika2mqtt-bridge-${project.version}.jar</sourceFile>
+              <destinationFile>target/rika2mqtt.jar</destinationFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>

pom.xml

@@ -49,7 +49,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <java.sdk.version>20</java.sdk.version>
+    <java.sdk.version>21</java.sdk.version>
     <source.encoding>UTF-8</source.encoding>
     <rika2mqtt.root>${basedir}</rika2mqtt.root>
     <!-- dependencies version-->

scripts/docker.sh

@@ -27,4 +27,4 @@ set -e
 
 echo "Building docker image cookiecodedev/rika2mqtt:latest"
 
-docker build . -t cookiecodedev/rika2mqtt:latest
+docker build . -t cookiecodedev/rika2mqtt:latest