From b09bf2bdfb143aa4f2e271a05d925ee24c9b5854 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Tue, 21 Apr 2020 11:06:08 +0300
Subject: [PATCH] Add kotlin equivalent of rest-assured

Fixes: #8713
---
 bom/runtime/pom.xml                           | 24 +++++++++++++++++++
 .../kotlin/build.gradle-template.ftl          |  2 +-
 .../basic-rest/kotlin/pom.xml-template.ftl    |  2 +-
 .../kotlin/build.gradle-template.ftl          |  4 ++--
 .../basic-rest/kotlin/pom.xml-template.ftl    |  2 +-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index e35c511026be88..e270952f030cdf 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -1268,6 +1268,30 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>kotlin-extensions</artifactId>
+                <version>${rest-assured.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <!-- https://github.com/quarkusio/quarkus/issues/1991 -->
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-osgi</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
             <dependency>
                 <groupId>io.debezium</groupId>
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/build.gradle-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
index f604d4391c0dae..0b0cc1dd822f95 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
@@ -15,7 +15,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
     testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
+    testImplementation 'io.rest-assured:kotlin-extensions'
 }
 
 group '${project_groupId}'
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
index 1fb4dc6cd9a899..214f06c3bb121e 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
+            <artifactId>kotlin-extensions</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl b/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
index c0774559fc9d78..789fc1222d6509 100644
--- a/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
+++ b/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
@@ -26,10 +26,10 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
     testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
+    testImplementation 'io.rest-assured:kotlin-extensions'
 
     nativeTestImplementation 'io.quarkus:quarkus-junit5'
-    nativeTestImplementation 'io.rest-assured:rest-assured'
+    nativeTestImplementation 'io.rest-assured:kotlin-extensions'
 }
 
 group '${project_groupId}'
diff --git a/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl b/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
index 5d48567e7523dc..0ae708068ba059 100644
--- a/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
+++ b/independent-projects/tools/common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
+            <artifactId>kotlin-extensions</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>