Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-7835: upgrading okhttp and skipping kotlin dependencies #6507

Merged
merged 4 commits into from
Dec 17, 2023
Merged

FISH-7835: upgrading okhttp and skipping kotlin dependencies #6507

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f18bc8
FISH-7835: upgrading okhttp and skipping kotlin dependencies
breakponchito Dec 11, 2023
ae1d8a6
FISH-7835: doing relocation for kotlin sources
breakponchito Dec 11, 2023
b402a39
FISH-7835: improving relocation for kotlin sources
breakponchito Dec 12, 2023
63e2fa6
FISH-7835: moving versions to core-aggregator
breakponchito Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/core-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@
<excludes>
<exclude>io.opentelemetry.extension</exclude>
<exclude>io.opentelemetry.instrumentation</exclude>
<exclude>fish.payara.shaded</exclude>
</excludes>
</parameter>
</configuration>
Expand Down
28 changes: 26 additions & 2 deletions nucleus/packager/external/opentelemetry-repackaged/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@

<properties>
<jar.manifest/>
<okhttp3-version>4.12.0</okhttp3-version>
<kotlin-version>1.8.21</kotlin-version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer if these were defined in the core-aggregator pom (Payara/core/pom.xml) along with all of the other dependency versions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already moved to the aggregator, thanks

</properties>

<dependencies>
Expand Down Expand Up @@ -126,7 +128,14 @@
<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>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin-version}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -157,13 +166,17 @@
!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 -->
<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.kotlin.*;inline=true
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Expand Down Expand Up @@ -195,6 +208,7 @@
<artifactSet>
<includes>
<include>com.squareup.*:*</include>
<inclue>org.jetbrains.kotlin.*:*</inclue>
</includes>
</artifactSet>
<filters>
Expand All @@ -205,6 +219,12 @@
<exclude>**</exclude>
</excludes>
</filter>
<filter>
<artifact>org.jetbrains.kotlin.*:*</artifact>
<excludes>
<exclude>**</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
Expand All @@ -215,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>
Expand Down