From 7fb9f8d24b98b7894ae445b700921ab691300177 Mon Sep 17 00:00:00 2001
From: The-Huginn <rbudinsk@redhat.com>
Date: Mon, 25 Mar 2024 10:34:46 +0100
Subject: [PATCH] Update quarkus and remove clutter around fixed quarkus bug

---
 README.md                                 | 11 +----------
 deploy.sh                                 |  6 ------
 pom.xml                                   |  2 +-
 src/main/resources/application.properties |  4 +---
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 5dc9d5a..9100cc2 100644
--- a/README.md
+++ b/README.md
@@ -90,17 +90,8 @@ oc create secret generic jira-lottery
 --from-literal=QUARKUS_MAILER_USERNAME={TBD}
 --from-literal=QUARKUS_MAILER_PASSWORD={TBD}
 ```
-3. Build the application, this step will eventually fail due to bug in quarkus
+3. Build and deploy the application
 > **_NOTE:_**  You can use script `deploy.sh` for convenience.
 ```shell
 ./mvnw clean package -Dquarkus.openshift.deploy=true
-```
-4. Update CronJob deployment
-```shell
-cd target/kubernetes
-```
-And in file `openshift.yml` delete the following line `selector: {}`
-5. Deploy the YAML file
-```shell
-oc apply -f openshift.yml
 ```
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index e725b80..53eea6d 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,7 +1 @@
-# Tracker issue for quarkus bug. This script serves
-# as a workaround for the time being.
-# issue: https://github.com/quarkusio/quarkus/issues/38880
-# Please delete this script once the fix is released
 ./mvnw clean package -Dquarkus.kubernetes.deploy=true
-sed -i '/^\s*selector: {}/d' target/kubernetes/openshift.yml
-oc apply -f target/kubernetes/openshift.yml
diff --git a/pom.xml b/pom.xml
index 4cc9ffa..1dcca84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>3.5.3</quarkus.platform.version>
+    <quarkus.platform.version>3.8.3</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
     <version.checkstyle>3.3.1</version.checkstyle>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 57be80b..634e2a1 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -8,9 +8,7 @@ quarkus.kubernetes.cron-job.schedule=0 0 * * 1
 quarkus.openshift.env.secrets=jira-lottery
 quarkus.openshift.labels.app=jira-issue-lottery
 
-# These 2 options are disabled to remove labels from selector field. However,
-#   a manual removal of selector field all together is needed in the generated yml file under target/kubernetes.
-#   [Tracker] Currently filled issue in quarkus: https://github.com/quarkusio/quarkus/issues/38880
+# These 2 options are disabled in order to remove labels from selector field, thus not generating this selector at all. Otherwise, the deployment will fail.
 quarkus.openshift.add-version-to-label-selectors=false
 quarkus.openshift.add-name-to-label-selectors=false