From 02c461395cae87648fedc1f19dd68562483962cc Mon Sep 17 00:00:00 2001
From: Jonathan Christison <jochrist@redhat.com>
Date: Wed, 21 Jun 2023 18:12:00 +0100
Subject: [PATCH] Fix problem with openshift deploy and jakarta injection

---
 pom.xml                                  | 24 ++++++------------------
 src/main/java/rest/GreetingResource.java |  2 +-
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab6b239..996e8a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,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>2.16.5.Final</quarkus.platform.version>
+    <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
@@ -73,11 +73,6 @@
       <scope>test</scope>
     </dependency>
 <!-- https://mvnrepository.com/artifact/jakarta.inject/jakarta.inject-api -->
-<dependency>
-    <groupId>jakarta.inject</groupId>
-    <artifactId>jakarta.inject-api</artifactId>
-    <version>2.0.1</version>
-</dependency>
 <!-- https://mvnrepository.com/artifact/jakarta.ws.rs/jakarta.ws.rs-api -->
 <dependency>
     <groupId>jakarta.ws.rs</groupId>
@@ -90,18 +85,11 @@
     <artifactId>commons-lang3</artifactId>
     <version>3.12.0</version>
 </dependency>
-<!-- https://mvnrepository.com/artifact/javax.inject/javax.inject -->
-<dependency>
-    <groupId>javax.inject</groupId>
-    <artifactId>javax.inject</artifactId>
-    <version>1</version>
-</dependency>
-    <dependency>
-    <groupId>io.fabric8</groupId>
-    <artifactId>tekton-client</artifactId>
-    <version>6.7.2</version>
-  </dependency>
-
+  <dependency>
+       <groupId>io.quarkiverse.tektonclient</groupId>
+       <artifactId>quarkus-tekton-client</artifactId>
+       <version>0.6.0</version>
+     </dependency>
     <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
     <dependency>
       <groupId>org.postgresql</groupId>
diff --git a/src/main/java/rest/GreetingResource.java b/src/main/java/rest/GreetingResource.java
index f7b247e..bf64094 100644
--- a/src/main/java/rest/GreetingResource.java
+++ b/src/main/java/rest/GreetingResource.java
@@ -1,6 +1,6 @@
 package rest;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;