From cd527155f5cdef7042b4dc33f5844c9f5eb08de1 Mon Sep 17 00:00:00 2001
From: Neha Naithani <neha.naithani828@gmail.com>
Date: Tue, 30 Jan 2024 21:45:12 +1300
Subject: [PATCH 1/3] Updated CI and changelog

---
 .github/workflows/ci.yaml | 28 ++++++++++++++++++++++++++++
 CHANGELOG.md              |  4 ++++
 build.gradle              |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2404ec93..66ffb858 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -233,6 +233,34 @@ jobs:
           PACKAGECLOUD-DISTRIB: rpm_any/rpm_any
           PACKAGECLOUD-TOKEN: ${{ secrets.packagecloud_token }}
 
+      - uses: actions/download-artifact@v2
+        with:
+          name: deb-package
+
+      - name: Publish tagged deb package to packagecloud
+        if: contains(github.ref_name, '^v.*')
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: iofog-agent_${{ steps.pkg_version.outputs.version }}_all.deb
+          PACKAGECLOUD-USERNAME: iofog
+          PACKAGECLOUD-REPO: iofog-agent
+          PACKAGECLOUD-DISTRIB: any/any
+          PACKAGECLOUD-TOKEN: ${{ secrets.packagecloud_token }}
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: rpm-package
+
+      - name: Publish tagged rpm package to packagecloud
+        if: contains(github.ref_name, '^v.*')
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: packaging/iofog-agent/iofog-agent-${{ steps.sub.outputs.result }}-1.noarch.rpm
+          PACKAGECLOUD-USERNAME: iofog
+          PACKAGECLOUD-REPO: iofog-agent
+          PACKAGECLOUD-DISTRIB: rpm_any/rpm_any
+          PACKAGECLOUD-TOKEN: ${{ secrets.packagecloud_token }}
+
       - name: Upload Agent Artifact
         uses: actions/upload-artifact@v3
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b104fcf..5a3eddde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
 ## [unreleased]
+## [v3.1.0] - 30 -June 2024
+* Migrated junit4 to junit5
+* Support for java17
+* Upgraded gradle to v8.4
 
 ## [v3.0.1] - 16- May 2022
 * Declared Agent dependency i.e. java and docker. 
diff --git a/build.gradle b/build.gradle
index eeb7b0af..3e5d6d0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = 'org.eclipse'
-    version = '3.0.0-dev'
+    version = '3.1.0'
 }
 
 subprojects {

From c0122d80909d66ede628c4dde1d5faf384644dcc Mon Sep 17 00:00:00 2001
From: Neha Naithani <neha.naithani828@gmail.com>
Date: Tue, 30 Jan 2024 23:01:55 +1300
Subject: [PATCH 2/3] Updated dockerfile to support java-17

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5dee4996..2a81fb79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04 AS builder
+FROM docker.io/library/ubuntu:22.04 AS builder
 
 RUN apt-get update && \
     apt-get install -y unzip apt-utils curl openjdk-17-jdk && \
@@ -12,7 +12,7 @@ ARG GRADLE_BASE_URL=https://services.gradle.org/distributions
 
 # 3- Define the SHA key to validate the gradle download
 #    obtained from here https://gradle.org/release-checksums/
-ARG GRADLE_SHA=c8c17574245ecee9ed7fe4f6b593b696d1692d1adbfef425bef9b333e3a0e8de
+ARG GRADLE_SHA=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 
 # 4- Create the directories, download gradle, validate the download, install it, remove downloaded file and set links
 RUN mkdir -p /usr/share/gradle /usr/share/gradle/ref \
@@ -39,9 +39,9 @@ VOLUME $GRADLE_USER_HOME
 
 COPY . .
 
-RUN gradle build copyJar -x test --no-daemon
+RUN gradle build copy -x test --no-daemon
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
 
 RUN true && \
     microdnf install -y curl ca-certificates java-17-openjdk-headless sudo shadow-utils && \

From ac224c45b86b261d688cd1525a4421ecda82bf74 Mon Sep 17 00:00:00 2001
From: Neha Naithani <neha.naithani828@gmail.com>
Date: Wed, 31 Jan 2024 10:52:16 +1300
Subject: [PATCH 3/3] Updated ci yaml

---
 .github/workflows/ci.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 66ffb858..0bae2979 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -233,10 +233,6 @@ jobs:
           PACKAGECLOUD-DISTRIB: rpm_any/rpm_any
           PACKAGECLOUD-TOKEN: ${{ secrets.packagecloud_token }}
 
-      - uses: actions/download-artifact@v2
-        with:
-          name: deb-package
-
       - name: Publish tagged deb package to packagecloud
         if: contains(github.ref_name, '^v.*')
         uses: danielmundi/upload-packagecloud@v1
@@ -247,10 +243,6 @@ jobs:
           PACKAGECLOUD-DISTRIB: any/any
           PACKAGECLOUD-TOKEN: ${{ secrets.packagecloud_token }}
 
-      - uses: actions/download-artifact@v2
-        with:
-          name: rpm-package
-
       - name: Publish tagged rpm package to packagecloud
         if: contains(github.ref_name, '^v.*')
         uses: danielmundi/upload-packagecloud@v1