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 @@ io.opentelemetry.extension io.opentelemetry.instrumentation + fish.payara.shaded 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 @@ 4.2.1 1.0-2 1.0 - + 4.12.0 + 1.8.21 + 3.2.3.payara-p1 4.2.4.payara-p2 diff --git a/nucleus/packager/external/opentelemetry-repackaged/pom.xml b/nucleus/packager/external/opentelemetry-repackaged/pom.xml index b954c9c4709..3c5b709421c 100644 --- a/nucleus/packager/external/opentelemetry-repackaged/pom.xml +++ b/nucleus/packager/external/opentelemetry-repackaged/pom.xml @@ -126,7 +126,14 @@ com.squareup.okhttp3 okhttp - 3.14.9 + ${okhttp3-version} + compile + true + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin-version} compile true @@ -157,13 +164,17 @@ !dalvik.*, io.opentelemetry.exporter.prometheus;resolution:=optional, sun.security.ssl;resolution:=optional, + !kotlin.*, + !org.bouncycastle.*, + !org.openjsse.*, * *;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.kotlin.*;inline=true true @@ -195,6 +206,7 @@ com.squareup.*:* + org.jetbrains.kotlin.*:* @@ -205,6 +217,12 @@ ** + + org.jetbrains.kotlin.*:* + + ** + + @@ -215,6 +233,10 @@ okio. fish.payara.shaded.okio. + + kotlin. + fish.payara.shaded.kotlin. +