Skip to content

Commit bd72220

Browse files
authored
Merge pull request #619 from splitio/development
Release to support non shaded dependencies
2 parents 3b2cd16 + a2c3652 commit bd72220

File tree

9 files changed

+36
-18
lines changed

9 files changed

+36
-18
lines changed

.ci.settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</activation>
2626
<properties>
2727
<sonar.projectName>java-client</sonar.projectName>
28-
<sonar.host.url>https://sonarqube.split-internal.com</sonar.host.url>
28+
<sonar.host.url>${env.SONARQUBE_HOST_URL}</sonar.host.url>
2929
<sonar.login>${env.SONAR_TOKEN}</sonar.login>
3030
<sonar.sources>.</sonar.sources>
3131
<sonar.inclusions>pom.xml,src/main/**</sonar.inclusions>

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
- '11'
3131
- '19'
3232
env:
33+
SONARQUBE_HOST_URL: ${{ vars.SONARQUBE_HOST }}
3334
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
3435
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
3536
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}

CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
4.18.3 (Feb 27, 2025)
2+
-Added support for non-shaded dependencies, allowing customers to manage transitive dependencies manually and avoid classpath conflicts.
3+
14
4.18.2 (Oct 15, 2025)
25
- Fixed an issue where Manager.splitNames() return incorrect formatted result using redis storage and no custom prefix.
36
- Added using String only parameter for treatments in FallbackTreatmentConfiguration class.

client/pom.xml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
<parent>
66
<groupId>io.split.client</groupId>
77
<artifactId>java-client-parent</artifactId>
8-
<version>4.18.2</version>
8+
<version>4.18.3-rc</version>
99
</parent>
10-
<version>4.18.2</version>
10+
11+
<version>4.18.3-rc</version>
1112
<artifactId>java-client</artifactId>
1213
<packaging>jar</packaging>
1314
<name>Java Client</name>
@@ -47,6 +48,24 @@
4748
<target>${maven.compiler.target}</target>
4849
</configuration>
4950
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-jar-plugin</artifactId>
54+
<version>3.3.0</version>
55+
<executions>
56+
<execution>
57+
<id>non-shaded-jar</id>
58+
<phase>package</phase>
59+
<goals>
60+
<goal>jar</goal>
61+
</goals>
62+
<configuration>
63+
<classifier>non-shaded</classifier>
64+
</configuration>
65+
</execution>
66+
</executions>
67+
</plugin>
68+
5069
<!-- Shade dependencies to avoid conflicts with other customer's libs -->
5170
<plugin>
5271
<groupId>org.apache.maven.plugins</groupId>
@@ -81,8 +100,8 @@
81100
</includes>
82101
</artifactSet>
83102
<transformers>
84-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
85-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
103+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
104+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
86105
</transformers>
87106
<relocations>
88107
<relocation>
@@ -106,10 +125,7 @@
106125
<filter>
107126
<artifact>*:*</artifact>
108127
<excludes>
109-
<exclude>META-INF/license/**</exclude>
110-
<exclude>META-INF/*</exclude>
111-
<exclude>META-INF/maven/**</exclude>
112-
<exclude>META-INF/services/**</exclude>
128+
<exclude>META-INF/**</exclude>
113129
<exclude>LICENSE</exclude>
114130
<exclude>NOTICE</exclude>
115131
<exclude>/*.txt</exclude>
@@ -144,7 +160,6 @@
144160
</resource>
145161
</resources>
146162
</build>
147-
148163
<properties>
149164
<slf4j.api.version>1.7.36</slf4j.api.version>
150165
<maven.compiler.source>8</maven.compiler.source>
@@ -183,7 +198,6 @@
183198
<artifactId>snakeyaml</artifactId>
184199
<version>2.0</version>
185200
</dependency>
186-
187201
<!-- Test deps -->
188202
<dependency>
189203
<groupId>org.apache.commons</groupId>

okhttp-modules/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<parent>
66
<artifactId>java-client-parent</artifactId>
77
<groupId>io.split.client</groupId>
8-
<version>4.18.2</version>
8+
<version>4.18.3-rc</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
11-
<version>4.18.2</version>
11+
<version>4.18.3-rc</version>
1212
<artifactId>okhttp-modules</artifactId>
1313
<packaging>jar</packaging>
1414
<name>http-modules</name>

pluggable-storage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>java-client-parent</artifactId>
88
<groupId>io.split.client</groupId>
9-
<version>4.18.2</version>
9+
<version>4.18.3-rc</version>
1010
</parent>
1111

1212
<version>2.1.0</version>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.split.client</groupId>
66
<artifactId>java-client-parent</artifactId>
7-
<version>4.18.2</version>
7+
<version>4.18.3-rc</version>
88
<dependencyManagement>
99
<dependencies>
1010
<dependency>

redis-wrapper/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>java-client-parent</artifactId>
88
<groupId>io.split.client</groupId>
9-
<version>4.18.2</version>
9+
<version>4.18.3-rc</version>
1010
</parent>
1111
<artifactId>redis-wrapper</artifactId>
1212
<version>3.1.2</version>

testing/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>io.split.client</groupId>
77
<artifactId>java-client-parent</artifactId>
8-
<version>4.18.2</version>
8+
<version>4.18.3-rc</version>
99
</parent>
1010
<artifactId>java-client-testing</artifactId>
1111
<packaging>jar</packaging>
12-
<version>4.18.2</version>
12+
<version>4.18.3-rc</version>
1313
<name>Java Client For Testing</name>
1414
<description>Testing suite for Java SDK for Split</description>
1515
<dependencies>

0 commit comments

Comments
 (0)