From 2bdb2f05fc2d66ed15b8e79566d01c6a2f2295a0 Mon Sep 17 00:00:00 2001
From: Jaakko Malkki <32361480+mjaakko@users.noreply.github.com>
Date: Fri, 19 May 2023 13:24:51 +0300
Subject: [PATCH 1/5] Use organization level secrets in GitHub Actions

---
 .github/workflows/test-and-build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 11964fc..d183e4c 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -38,8 +38,8 @@ jobs:
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: hsldevcom/transitdata-alert-processor
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
+          password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }}
           tags: develop
   build-release-docker-image:
     needs: test
@@ -57,6 +57,6 @@ jobs:
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: hsldevcom/transitdata-alert-processor
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_semver: true
\ No newline at end of file
+          username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
+          password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }}
+          tag_semver: true

From ae5670071d6d922a8c093d34017806868612646b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Tue, 12 Nov 2024 16:43:38 +0200
Subject: [PATCH 2/5] Add job build-aks-dev-docker-image

---
 .github/workflows/test-and-build.yml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index d183e4c..a801eec 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -18,7 +18,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload .jar file
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: transitdata-alert-processor-jar-with-dependencies.jar
           path: target/transitdata-alert-processor-jar-with-dependencies.jar
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download .jar file
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: transitdata-alert-processor-jar-with-dependencies.jar
           path: target
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download .jar file
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: transitdata-alert-processor-jar-with-dependencies.jar
           path: target
@@ -60,3 +60,22 @@ jobs:
           username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
           password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }}
           tag_semver: true
+  build-aks-dev-docker-image:
+    needs: test
+    runs-on: ubuntu-latest
+    # Run only on aks-dev branch
+    if: github.ref == 'refs/heads/aks-dev'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download .jar file
+        uses: actions/download-artifact@v4
+        with:
+          name: transitdata-alert-processor-jar-with-dependencies.jar
+          path: target
+      - name: Build and publish aks-dev Docker image
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: hsldevcom/transitdata-alert-processor
+          username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
+          password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }}
+          tags: aks-dev
\ No newline at end of file

From 8070ef00377bf70e94e1da0ab691b99640b30c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Tue, 12 Nov 2024 16:45:14 +0200
Subject: [PATCH 3/5] Update transitdata-common version to 1.6.6-RC (that uses
 Pulsar-client 3.0.6)

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

diff --git a/pom.xml b/pom.xml
index 3531fc0..e198ef7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <common.version>1.5.2</common.version>
+        <common.version>1.6.6-RC</common.version>
     </properties>
 
     <dependencies>

From ffebc4a8dcd27d682d87d394ae631dcf9c2fb7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Wed, 27 Nov 2024 10:18:21 +0200
Subject: [PATCH 4/5] Update transitdata-common to 2.0.1

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

diff --git a/pom.xml b/pom.xml
index e198ef7..e1f987e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <common.version>1.6.6-RC</common.version>
+        <common.version>2.0.1</common.version>
     </properties>
 
     <dependencies>

From 01c408225cd5567857ad774d302d8698dd206730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Wed, 27 Nov 2024 10:20:10 +0200
Subject: [PATCH 5/5] Update version to 2.0.0

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

diff --git a/pom.xml b/pom.xml
index e1f987e..8566c1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl.transitdata</groupId>
     <artifactId>transitdata-alert-processor</artifactId>
-    <version>1.0.8</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <repositories>