From 1e29b1309ba94c524a24f66f609814fc26f53d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Fri, 15 Nov 2024 13:23:24 +0200
Subject: [PATCH 1/5] Add job build-aks-dev-docker-image

---
 .github/workflows/test-and-build.yml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index dd87e1e..fae10a4 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@v2
+        uses: actions/upload-artifact@v4
         with:
           name: transitdata-stop-cancellation-processor.jar
           path: target/transitdata-stop-cancellation-processor.jar
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Download .jar file
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: transitdata-stop-cancellation-processor.jar
           path: target
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Download .jar file
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: transitdata-stop-cancellation-processor.jar
           path: target
@@ -59,4 +59,23 @@ jobs:
           name: hsldevcom/transitdata-stop-cancellation-processor
           username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
           password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }}
-          tag_semver: true
\ No newline at end of file
+          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-stop-cancellation-processor.jar
+          path: target
+      - name: Build and publish aks-dev Docker image
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: hsldevcom/transitdata-stop-cancellation-processor
+          username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }}
+          password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }}
+          tags: aks-dev
\ No newline at end of file

From a68bded967db997e25d92f2990ce615feb29435f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Fri, 15 Nov 2024 13:25:43 +0200
Subject: [PATCH 2/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 dd410b4..d7a5492 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.1</common.version>
+        <common.version>1.6.6-RC</common.version>
     </properties>
     <profiles>
         <!-- The Configuration of the unit-test profile -->

From 90f75b911bad6a374f46bf74132a20a9e50f1341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Fri, 15 Nov 2024 13:38:37 +0200
Subject: [PATCH 3/5] Add environment variable pulsar.consumer.topics

---
 src/main/resources/environment.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/environment.conf b/src/main/resources/environment.conf
index 7f561de..86c4e15 100644
--- a/src/main/resources/environment.conf
+++ b/src/main/resources/environment.conf
@@ -4,8 +4,8 @@ pulsar {
   consumer {
     multipleTopics=true
     multipleTopics=${?PULSAR_CONSUMER_ENABLE_MULTIPLE_TOPICS}
-    topicsPattern="persistent://public/default/(trip-update-raw|stop-cancellation)"
-    topicsPattern=${?PULSAR_CONSUMER_MULTIPLE_TOPICS_PATTERN}
+    topics=["trip-update-raw, stop-cancellation"]
+    topics=${?PULSAR_CONSUMER_TOPICS}
     subscription="stop-cancellation-subscription"
     subscription=${?PULSAR_CONSUMER_SUBSCRIPTION}
   }

From a601e9dc63750569776ae9c7e8bbdb84b9016c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Thu, 28 Nov 2024 11:13:53 +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 d7a5492..0e1b111 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>
     <profiles>
         <!-- The Configuration of the unit-test profile -->

From be295f450ba570c06db00a0fa531f3dc6aceb334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= <timo.jarvinen@yahoo.com>
Date: Thu, 28 Nov 2024 11:14:32 +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 0e1b111..c45b2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.hsl.transitdata</groupId>
     <artifactId>transitdata-stop-cancellation-processor</artifactId>
-    <version>1.0.2</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <repositories>