From ccb7b89f05bb5987ac8628a745355f0ec0829e2e Mon Sep 17 00:00:00 2001
From: Andy Damevin <ia3andy@gmail.com>
Date: Thu, 6 Apr 2023 16:36:56 +0200
Subject: [PATCH] Fix base-codestart 2.x

---
 .../java/src/{resource.class-name}.tpl.qute.java            | 6 ++++++
 .../gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts      | 5 +++++
 .../quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle   | 5 +++++
 .../quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml         | 5 +++++
 4 files changed, 21 insertions(+)

diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java
index 615b3616e2bd8..99093a93267ab 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java
@@ -7,9 +7,15 @@
 {/for}
 
 import io.quarkus.runtime.Quarkus;
+{#if quarkus.bom.version.startsWith("2.") or quarkus.bom.version.startsWith("1.")}
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+{#else}
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
+{/if}
 
 @Path("{resource.path}")
 @ApplicationScoped
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts
index a5b4296979942..ed99b5f16072d 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts
@@ -9,8 +9,13 @@ plugins {
 {/include}
 
 allOpen {
+    {#if quarkus.platform.version.startsWith("2.") or quarkus.platform.version.startsWith("1.")}
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    {#else}
     annotation("jakarta.ws.rs.Path")
     annotation("jakarta.enterprise.context.ApplicationScoped")
+    {/if}
     annotation("io.quarkus.test.junit.QuarkusTest")
 }
 
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
index dc49170064537..062bb795e42e1 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
@@ -9,8 +9,13 @@ plugins {
 {/include}
 
 allOpen {
+    {#if quarkus.platform.version.startsWith("2.") or quarkus.platform.version.startsWith("1.")}
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    {#else}
     annotation("jakarta.ws.rs.Path")
     annotation("jakarta.enterprise.context.ApplicationScoped")
+    {/if}
     annotation("io.quarkus.test.junit.QuarkusTest")
 }
 
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
index 0532b34698708..d3581f35c5b45 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
@@ -48,8 +48,13 @@
 
                     <pluginOptions>
                         <!-- Each annotation is placed on its own line -->
+                        {#if quarkus.platform.version.startsWith("2.") or quarkus.platform.version.startsWith("1.")}
+                        <option>all-open:annotation=javax.ws.rs.Path</option>
+                        <option>all-open:annotation=javax.enterprise.context.ApplicationScoped</option>
+                        {#else}
                         <option>all-open:annotation=jakarta.ws.rs.Path</option>
                         <option>all-open:annotation=jakarta.enterprise.context.ApplicationScoped</option>
+                        {/if}
                         <option>all-open:annotation=io.quarkus.test.junit.QuarkusTest</option>
                     </pluginOptions>
                 </configuration>