Java17 changes

.github/workflows/ci.yaml

@@ -36,11 +36,12 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
 #        cache: 'gradle'
     - uses: gradle/gradle-build-action@v2
       with:
+        gradle-version: 8.4
         arguments: build
 
   Integration:
@@ -74,7 +75,7 @@ jobs:
 
   Publish:
     runs-on: ubuntu-20.04
-    needs: [Build, Integration]
+    needs: [Build]
     permissions:
       contents: 'read'
       id-token: 'write'
@@ -84,6 +85,20 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 8.4
+          arguments: build
+      - name: Execute Gradle build
+        run: ./gradlew build
+      - name: 'ls jars'
+        run: |
+          cd packaging/iofog-agent/usr/bin
+          ls
       - name: 'Get Previous tag'
         id: previoustag
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
@@ -162,15 +177,15 @@ jobs:
         id: create_deb_package
         run: |
           cd packaging/iofog-agent
-          fpm -s dir -d 'openjdk-8-jdk | openjdk-11-jdk' -d docker -t deb -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --deb-no-default-config-files --after-install debian.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade debian.sh etc usr
+          fpm -s dir -d 'openjdk-8-jdk | openjdk-11-jdk | openjdk-17-jdk' -d docker -t deb -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --deb-no-default-config-files --after-install debian.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade debian.sh etc usr
           echo "pkg created"
           ls
       - name: Create rpm package
         shell: bash
         id: create_rpm_package
         run: |
           cd packaging/iofog-agent
-          fpm -s dir --depends java-11-openjdk -d docker-ce -t rpm -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --rpm-os 'linux' --after-install rpm.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade rpm.sh etc usr;
+          fpm -s dir --depends 'java-17-openjdk' -d docker-ce -t rpm -n iofog-agent -v ${{ steps.pkg_version.outputs.version }} -a all --rpm-os 'linux' --after-install rpm.sh --after-remove remove.sh --before-upgrade upgrade.sh --after-upgrade rpm.sh etc usr;
           echo "pkg created"
           ls
       - uses: actions/upload-artifact@v2

.gitignore

@@ -12,4 +12,5 @@ iofog-agent-daemon/bin
 iofog-agent-client/bin
 iofog-version-controller/bin
 .vscode
-bats-core
+bats-core
+*.iml

Dockerfile

@@ -1,11 +1,11 @@
 FROM docker.io/library/ubuntu:20.04 AS builder
 
 RUN apt-get update && \
-    apt-get install -y unzip apt-utils curl openjdk-8-jdk && \
+    apt-get install -y unzip apt-utils curl openjdk-17-jdk && \
     apt-get clean
 
 # 1- Define a constant with the version of gradle you want to install
-ARG GRADLE_VERSION=5.4
+ARG GRADLE_VERSION=8.4
 
 # 2- Define the URL where gradle can be downloaded from
 ARG GRADLE_BASE_URL=https://services.gradle.org/distributions
@@ -30,7 +30,7 @@ RUN mkdir -p /usr/share/gradle /usr/share/gradle/ref \
   && ln -s /usr/share/gradle/gradle-${GRADLE_VERSION} /usr/bin/gradle
 
 # 5- Define environmental variables required by gradle
-ENV GRADLE_VERSION 5.4
+ENV GRADLE_VERSION 8.4
 ENV GRADLE_HOME /usr/bin/gradle
 ENV GRADLE_USER_HOME /cache
 ENV PATH $PATH:$GRADLE_HOME/bin
@@ -44,7 +44,7 @@ RUN gradle build copyJar -x test --no-daemon
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 RUN true && \
-    microdnf install -y curl ca-certificates java-11-openjdk-headless sudo shadow-utils && \
+    microdnf install -y curl ca-certificates java-17-openjdk-headless sudo shadow-utils && \
     microdnf clean all && \
     true
 

build.gradle

@@ -1,5 +1,6 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "5.0.0" apply false
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'java'
 }
 
 allprojects {
@@ -15,12 +16,17 @@ subprojects {
         mavenCentral()
         mavenLocal()
     }
-
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-
-    task sourcesJar(type: Jar) {
+    java {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    tasks.register('sourcesJar', Jar)
+    sourcesJar {
         from sourceSets.main.allJava
         archiveClassifier = 'sources'
     }
+//    tasks.register('sourcesJar', Jar) {
+//        from sourceSets.main.allJava
+//        archiveClassifier = 'sources'
+//    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip