Skip to content
Merged
2 changes: 1 addition & 1 deletion .ci.settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</activation>
<properties>
<sonar.projectName>java-client</sonar.projectName>
<sonar.host.url>https://sonarqube.split-internal.com</sonar.host.url>
<sonar.host.url>${vars.SONARQUBE_HOST}</sonar.host.url>
<sonar.login>${env.SONAR_TOKEN}</sonar.login>
<sonar.sources>.</sonar.sources>
<sonar.inclusions>pom.xml,src/main/**</sonar.inclusions>
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ jobs:

- name: SonarQube Scan (Pull Request)
if: matrix.jdk == '11' && github.event_name == 'pull_request'
env:
SONARQUBE_HOST_URL: ${{ vars.SONARQUBE_HOST }}
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
MAVEN_OPTS: '-XX:+PrintCommandLineFlags -XX:ThreadStackSize=65536 -XX:-TieredCompilation -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
run: |
mvn --batch-mode clean verify sonar:sonar \
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2025 Split Software, Inc.
Copyright © 2026 Split Software, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
36 changes: 25 additions & 11 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<parent>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.18.2</version>
<version>4.18.3-rc</version>
</parent>
<version>4.18.2</version>

<version>4.18.3-rc</version>
<artifactId>java-client</artifactId>
<packaging>jar</packaging>
<name>Java Client</name>
Expand Down Expand Up @@ -47,6 +48,24 @@
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>non-shaded-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>non-shaded</classifier>
</configuration>
</execution>
</executions>
</plugin>

<!-- Shade dependencies to avoid conflicts with other customer's libs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -81,8 +100,8 @@
</includes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<relocations>
<relocation>
Expand All @@ -106,10 +125,7 @@
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/license/**</exclude>
<exclude>META-INF/*</exclude>
<exclude>META-INF/maven/**</exclude>
<exclude>META-INF/services/**</exclude>
<exclude>META-INF/**</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
<exclude>/*.txt</exclude>
Expand Down Expand Up @@ -144,7 +160,6 @@
</resource>
</resources>
</build>

<properties>
<slf4j.api.version>1.7.36</slf4j.api.version>
<maven.compiler.source>8</maven.compiler.source>
Expand Down Expand Up @@ -183,7 +198,6 @@
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>

<!-- Test deps -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -257,4 +271,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

broken end of file here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated.

4 changes: 2 additions & 2 deletions okhttp-modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.18.2</version>
<version>4.18.3-rc</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>4.18.2</version>
<version>4.18.3-rc</version>
<artifactId>okhttp-modules</artifactId>
<packaging>jar</packaging>
<name>http-modules</name>
Expand Down
2 changes: 1 addition & 1 deletion pluggable-storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.18.2</version>
<version>4.18.3-rc</version>
</parent>

<version>2.1.0</version>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.18.2</version>
<version>4.18.3-rc</version>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion redis-wrapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.18.2</version>
<version>4.18.3-rc</version>
</parent>
<artifactId>redis-wrapper</artifactId>
<version>3.1.2</version>
Expand Down
4 changes: 2 additions & 2 deletions testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.18.2</version>
<version>4.18.3-rc</version>
</parent>
<artifactId>java-client-testing</artifactId>
<packaging>jar</packaging>
<version>4.18.2</version>
<version>4.18.3-rc</version>
<name>Java Client For Testing</name>
<description>Testing suite for Java SDK for Split</description>
<dependencies>
Expand Down
Loading