From 9f18bc8c7bf9dd022e83505a862e812d73145284 Mon Sep 17 00:00:00 2001
From: Alfonso Altamirano <alfonso.altamirano@payara.fish>
Date: Mon, 11 Dec 2023 11:17:13 -0600
Subject: [PATCH 1/4] FISH-7835: upgrading okhttp and skipping kotlin
 dependencies

---
 core/core-parent/pom.xml                                   | 1 +
 nucleus/packager/external/opentelemetry-repackaged/pom.xml | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/core-parent/pom.xml b/core/core-parent/pom.xml
index a7f7d392db3..1cfea083698 100644
--- a/core/core-parent/pom.xml
+++ b/core/core-parent/pom.xml
@@ -635,6 +635,7 @@
                                 <excludes>
                                     <exclude>io.opentelemetry.extension</exclude>
                                     <exclude>io.opentelemetry.instrumentation</exclude>
+                                    <exclude>fish.payara.shaded</exclude>
                                 </excludes>
                             </parameter>
                         </configuration>
diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
index b954c9c4709..afdd8f1431f 100644
--- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml
+++ b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
@@ -60,6 +60,7 @@
 
     <properties>
         <jar.manifest/>
+        <okhttp3-version>4.12.0</okhttp3-version>
     </properties>
 
     <dependencies>
@@ -126,7 +127,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.14.9</version>
+            <version>${okhttp3-version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -157,6 +158,9 @@
                             !dalvik.*,
                             io.opentelemetry.exporter.prometheus;resolution:=optional,
                             sun.security.ssl;resolution:=optional,
+                            !kotlin.*,
+                            !org.bouncycastle.*,
+                            !org.openjsse.*,
                             *
                         </Import-Package>
                         <!-- Embed the dependencies and then shade them in next step -->

From ae1d8a674f3c147c282a700c9b2c02464a9dd43e Mon Sep 17 00:00:00 2001
From: Alfonso Altamirano <alfonso.altamirano@payara.fish>
Date: Mon, 11 Dec 2023 16:16:35 -0600
Subject: [PATCH 2/4] FISH-7835: doing relocation for kotlin sources

---
 .../external/opentelemetry-repackaged/pom.xml | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
index afdd8f1431f..f18c3106e05 100644
--- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml
+++ b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
@@ -61,6 +61,7 @@
     <properties>
         <jar.manifest/>
         <okhttp3-version>4.12.0</okhttp3-version>
+        <kotlin-version>1.8.21</kotlin-version>
     </properties>
 
     <dependencies>
@@ -131,6 +132,13 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin-version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <!-- next we need to relocate okhttp, and add OSGi manifest -->
@@ -167,7 +175,8 @@
                         <Embed-Dependency>
                             *;groupId=com.squareup.*;inline=true,
                             *;groupId=io.opentelemetry;inline=true,
-                            *;groupId=io.opentelemetry.instrumentation;inline=true
+                            *;groupId=io.opentelemetry.instrumentation;inline=true,
+                            *;groupId=org.jetbrains.*;inline=true
                         </Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
@@ -199,6 +208,7 @@
                     <artifactSet>
                         <includes>
                             <include>com.squareup.*:*</include>
+                            <inclue>org.jetbrains.*:*</inclue>
                         </includes>
                     </artifactSet>
                     <filters>
@@ -209,6 +219,12 @@
                                 <exclude>**</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>org.jetbrains.*:*</artifact>
+                            <excludes>
+                                <exclude>**</exclude>
+                            </excludes>
+                        </filter>
                     </filters>
                     <relocations>
                         <relocation>
@@ -219,6 +235,10 @@
                             <pattern>okio.</pattern>
                             <shadedPattern>fish.payara.shaded.okio.</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>kotlin.</pattern>
+                            <shadedPattern>fish.payara.shaded.kotlin.</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
             </plugin>

From b402a39d20914fa95966ea4f94e3a00f68d13f60 Mon Sep 17 00:00:00 2001
From: Alfonso Altamirano <alfonso.altamirano@payara.fish>
Date: Mon, 11 Dec 2023 19:46:25 -0600
Subject: [PATCH 3/4] FISH-7835: improving relocation for kotlin sources

---
 nucleus/packager/external/opentelemetry-repackaged/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
index f18c3106e05..1669e3e86bc 100644
--- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml
+++ b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
@@ -176,7 +176,7 @@
                             *;groupId=com.squareup.*;inline=true,
                             *;groupId=io.opentelemetry;inline=true,
                             *;groupId=io.opentelemetry.instrumentation;inline=true,
-                            *;groupId=org.jetbrains.*;inline=true
+                            *;groupId=org.jetbrains.kotlin.*;inline=true
                         </Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
@@ -208,7 +208,7 @@
                     <artifactSet>
                         <includes>
                             <include>com.squareup.*:*</include>
-                            <inclue>org.jetbrains.*:*</inclue>
+                            <inclue>org.jetbrains.kotlin.*:*</inclue>
                         </includes>
                     </artifactSet>
                     <filters>
@@ -220,7 +220,7 @@
                             </excludes>
                         </filter>
                         <filter>
-                            <artifact>org.jetbrains.*:*</artifact>
+                            <artifact>org.jetbrains.kotlin.*:*</artifact>
                             <excludes>
                                 <exclude>**</exclude>
                             </excludes>

From 63e2fa65beec7ecff4cafb5fcc75012d12511953 Mon Sep 17 00:00:00 2001
From: Alfonso Altamirano <alfonso.altamirano@payara.fish>
Date: Fri, 15 Dec 2023 17:59:07 -0600
Subject: [PATCH 4/4] FISH-7835: moving versions to core-aggregator

---
 core/pom.xml                                               | 4 +++-
 nucleus/packager/external/opentelemetry-repackaged/pom.xml | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index fe947c1959a..e4a7cf55eaf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -118,7 +118,9 @@
         <stax2-api.version>4.2.1</stax2-api.version>
         <stax-api.version>1.0-2</stax-api.version>
         <jbi.version>1.0</jbi.version>
-
+        <okhttp3-version>4.12.0</okhttp3-version>
+        <kotlin-version>1.8.21</kotlin-version>
+        
         <!-- implementation and build dependencies -->
         <glassfish-management-api.version>3.2.3.payara-p1</glassfish-management-api.version>
         <glassfish-corba.version>4.2.4.payara-p2</glassfish-corba.version>
diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
index 1669e3e86bc..3c5b709421c 100644
--- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml
+++ b/nucleus/packager/external/opentelemetry-repackaged/pom.xml
@@ -60,8 +60,6 @@
 
     <properties>
         <jar.manifest/>
-        <okhttp3-version>4.12.0</okhttp3-version>
-        <kotlin-version>1.8.21</kotlin-version>
     </properties>
 
     <dependencies>