From 3416bf70881c8b086f66e2aa4108b60de4b84b98 Mon Sep 17 00:00:00 2001 From: Daniel Bower Date: Thu, 3 Aug 2023 10:35:41 -0400 Subject: [PATCH 1/6] Correct the url of the documentation --- client/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/README.md b/client/README.md index c2044684d..206f83033 100644 --- a/client/README.md +++ b/client/README.md @@ -4,7 +4,7 @@ This SDK is designed to work with [Split](https://www.split.io), the platform fo ### Quick setup -For specific instructions on how to set up the Split SDK refer to our [official SDK documentation](http://docs.split.io/docs/sdk-overview). +For specific instructions on how to set up the Split SDK refer to our [official SDK documentation](https://help.split.io/hc/en-us/articles/360020405151-Java-SDK). ### Commitment to Quality: From 6e99069fe975ae10faaa2f6bd25e5c2048208b36 Mon Sep 17 00:00:00 2001 From: Daniel Bower Date: Thu, 3 Aug 2023 10:47:39 -0400 Subject: [PATCH 2/6] The pom will now create a shaded version java-client at the classifier with-deps and a non-shaded version. The pom that is produced just has the dependencies for the shaded version though. Need to figure out how to supply the non-shaded deps --- client/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/pom.xml b/client/pom.xml index a775f5fb4..5d5171c3c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -57,6 +57,8 @@ false true + true + with-deps io.split.engine:* From 5fd16e581749d1508a4602ecb818cb306f93e4d6 Mon Sep 17 00:00:00 2001 From: Daniel Bower Date: Thu, 3 Aug 2023 11:55:59 -0400 Subject: [PATCH 3/6] Simple modularized version --- client-with-deps/pom.xml | 227 ++++++++++++++++++ .../main/resources/splitversion.properties | 1 + client/pom.xml | 90 ------- pom.xml | 83 ++++++- 4 files changed, 310 insertions(+), 91 deletions(-) create mode 100644 client-with-deps/pom.xml create mode 100644 client-with-deps/src/main/resources/splitversion.properties diff --git a/client-with-deps/pom.xml b/client-with-deps/pom.xml new file mode 100644 index 000000000..26cdcc3b2 --- /dev/null +++ b/client-with-deps/pom.xml @@ -0,0 +1,227 @@ + + + 4.0.0 + + io.split.client + java-client-parent + 4.8.1 + + java-client-with-deps + jar + Java Client With Dependencies + Java SDK for Split with Dependencies bundled + + + + release + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.3 + true + + false + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + false + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + false + true + + + io.split.engine:* + io.split.client:* + io.split.schemas:* + io.codigo.grammar:* + org.apache.httpcomponents.* + com.google.* + org.yaml:snakeyaml:* + + + org.checkerframework:* + + + commons-codec:* + + + + + + + + + org.apache + split.org.apache + + + org.checkerframework + split.org.checkerframework + + + org.yaml.snakeyaml + split.org.yaml.snakeyaml + + + com.google + split.com.google + + + + + *:* + + META-INF/license/** + META-INF/* + META-INF/maven/** + META-INF/services/** + LICENSE + NOTICE + /*.txt + build.properties + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + src/main/resources/splitversion.properties + + + + src/main/resources + true + + + + + + 8 + 8 + + + + + io.split.client + pluggable-storage + compile + + + com.google.guava + guava + + + org.slf4j + slf4j-api + + + org.apache.httpcomponents.client5 + httpclient5 + + + com.google.code.gson + gson + + + org.yaml + snakeyaml + + + + + org.apache.commons + commons-lang3 + test + + + junit + junit + test + + + org.hamcrest + hamcrest-all + test + + + org.mockito + mockito-core + test + + + org.slf4j + slf4j-log4j12 + test + + + org.glassfish.jersey.media + jersey-media-sse + test + + + org.glassfish.jersey.inject + jersey-hk2 + test + + + org.glassfish.jersey.containers + jersey-container-grizzly2-http + test + + + com.squareup.okhttp3 + mockwebserver + test + + + org.awaitility + awaitility + test + + + \ No newline at end of file diff --git a/client-with-deps/src/main/resources/splitversion.properties b/client-with-deps/src/main/resources/splitversion.properties new file mode 100644 index 000000000..325bf7683 --- /dev/null +++ b/client-with-deps/src/main/resources/splitversion.properties @@ -0,0 +1 @@ +sdk.version=${project.version} \ No newline at end of file diff --git a/client/pom.xml b/client/pom.xml index 5d5171c3c..199aa8b5e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -43,80 +43,6 @@ ${maven.compiler.target} - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - false - true - true - with-deps - - - io.split.engine:* - io.split.client:* - io.split.schemas:* - io.codigo.grammar:* - org.apache.httpcomponents.* - com.google.* - org.yaml:snakeyaml:* - - - org.checkerframework:* - - - commons-codec:* - - - - - - - - - org.apache - split.org.apache - - - org.checkerframework - split.org.checkerframework - - - org.yaml.snakeyaml - split.org.yaml.snakeyaml - - - com.google - split.com.google - - - - - *:* - - META-INF/license/** - META-INF/* - META-INF/maven/** - META-INF/services/** - LICENSE - NOTICE - /*.txt - build.properties - - - - - - - org.apache.maven.plugins maven-source-plugin @@ -142,7 +68,6 @@ - 1.7.36 8 8 @@ -151,40 +76,33 @@ io.split.client pluggable-storage - 2.0.0 compile com.google.guava guava - 32.0.1-jre org.slf4j slf4j-api - ${slf4j.api.version} org.apache.httpcomponents.client5 httpclient5 - 5.0.3 com.google.code.gson gson - 2.9.0 org.yaml snakeyaml - 2.0 org.apache.commons commons-lang3 - 3.4 test @@ -195,49 +113,41 @@ org.hamcrest hamcrest-all - 1.3 test org.mockito mockito-core - 1.10.19 test org.slf4j slf4j-log4j12 - ${slf4j.api.version} test org.glassfish.jersey.media jersey-media-sse - 2.31 test org.glassfish.jersey.inject jersey-hk2 - 2.31 test org.glassfish.jersey.containers jersey-container-grizzly2-http - 2.26 test com.squareup.okhttp3 mockwebserver - 4.8.0 test org.awaitility awaitility - 4.0.3 test diff --git a/pom.xml b/pom.xml index 9b4160086..a63079614 100644 --- a/pom.xml +++ b/pom.xml @@ -12,10 +12,87 @@ junit 4.13.1 + + io.split.client + pluggable-storage + 2.0.0 + + + com.google.guava + guava + 32.0.1-jre + + + org.slf4j + slf4j-api + ${slf4j.api.version} + + + org.apache.httpcomponents.client5 + httpclient5 + 5.0.3 + + + com.google.code.gson + gson + 2.9.0 + + + org.yaml + snakeyaml + 2.0 + + + + + org.apache.commons + commons-lang3 + 3.4 + + + org.hamcrest + hamcrest-all + 1.3 + + + org.mockito + mockito-core + 1.10.19 + + + org.slf4j + slf4j-log4j12 + ${slf4j.api.version} + + + org.glassfish.jersey.media + jersey-media-sse + 2.31 + + + org.glassfish.jersey.inject + jersey-hk2 + 2.31 + + + org.glassfish.jersey.containers + jersey-container-grizzly2-http + 2.26 + + + com.squareup.okhttp3 + mockwebserver + 4.8.0 + + + org.awaitility + awaitility + 4.0.3 + pom - Java Client + Split IO Java Client Parent Java SDK for Split www.split.io @@ -79,13 +156,16 @@ UTF-8 1.8 1.8 + 1.7.36 testing client pluggable-storage redis-wrapper + client-with-deps + @@ -150,6 +230,7 @@ + test From b0b73313f9637351695ec814bfa2c0dce3572faf Mon Sep 17 00:00:00 2001 From: Daniel Bower Date: Thu, 3 Aug 2023 12:11:14 -0400 Subject: [PATCH 4/6] Version the library and update Changelist --- CHANGES.txt | 3 +++ client-with-deps/pom.xml | 2 +- client/pom.xml | 2 +- pluggable-storage/pom.xml | 2 +- pom.xml | 2 +- redis-wrapper/pom.xml | 2 +- testing/pom.xml | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 44b8d4593..9f870d1f5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +4.9.0 (Aug 3, 2023) +- Shuffled maven poms around to release both a client only jar and a client with dependencies version + 4.8.1 (Aug 1, 2023) - Applied linting rules to the code. - Fixed an issue when the prefix is empty for Redis settings. diff --git a/client-with-deps/pom.xml b/client-with-deps/pom.xml index 26cdcc3b2..694120fd8 100644 --- a/client-with-deps/pom.xml +++ b/client-with-deps/pom.xml @@ -6,7 +6,7 @@ io.split.client java-client-parent - 4.8.1 + 4.9.0 java-client-with-deps jar diff --git a/client/pom.xml b/client/pom.xml index 199aa8b5e..89a5b6e7c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.8.1 + 4.9.0 java-client jar diff --git a/pluggable-storage/pom.xml b/pluggable-storage/pom.xml index f2a69fc6a..290fe939d 100644 --- a/pluggable-storage/pom.xml +++ b/pluggable-storage/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.8.1 + 4.9.0 2.0.0 diff --git a/pom.xml b/pom.xml index a63079614..7ce0bd99a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.split.client java-client-parent - 4.8.1 + 4.9.0 diff --git a/redis-wrapper/pom.xml b/redis-wrapper/pom.xml index 99b77073e..c733a21ab 100644 --- a/redis-wrapper/pom.xml +++ b/redis-wrapper/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.8.1 + 4.9.0 redis-wrapper 3.0.1 diff --git a/testing/pom.xml b/testing/pom.xml index d35996d06..11160430e 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.8.1 + 4.9.0 java-client-testing jar From c2a469213e2206c554676f582cfe47bd0cfbba26 Mon Sep 17 00:00:00 2001 From: Daniel Bower Date: Thu, 3 Aug 2023 12:15:19 -0400 Subject: [PATCH 5/6] Simplify the dependency list in the client-with-deps --- client-with-deps/pom.xml | 75 ++-------------------------------------- 1 file changed, 2 insertions(+), 73 deletions(-) diff --git a/client-with-deps/pom.xml b/client-with-deps/pom.xml index 694120fd8..ec62c2779 100644 --- a/client-with-deps/pom.xml +++ b/client-with-deps/pom.xml @@ -148,80 +148,9 @@ io.split.client - pluggable-storage + java-client + ${project.version} compile - - com.google.guava - guava - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents.client5 - httpclient5 - - - com.google.code.gson - gson - - - org.yaml - snakeyaml - - - - - org.apache.commons - commons-lang3 - test - - - junit - junit - test - - - org.hamcrest - hamcrest-all - test - - - org.mockito - mockito-core - test - - - org.slf4j - slf4j-log4j12 - test - - - org.glassfish.jersey.media - jersey-media-sse - test - - - org.glassfish.jersey.inject - jersey-hk2 - test - - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - test - - - com.squareup.okhttp3 - mockwebserver - test - - - org.awaitility - awaitility - test - \ No newline at end of file From a437814f212553d5421b04e619f8b123dab789da Mon Sep 17 00:00:00 2001 From: Daniel Bower Date: Thu, 3 Aug 2023 12:21:57 -0400 Subject: [PATCH 6/6] Resolve maven warning on the maven-source-plugin missing a version --- client-with-deps/pom.xml | 1 + client/pom.xml | 1 + pom.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/client-with-deps/pom.xml b/client-with-deps/pom.xml index ec62c2779..cc97f57e0 100644 --- a/client-with-deps/pom.xml +++ b/client-with-deps/pom.xml @@ -119,6 +119,7 @@ org.apache.maven.plugins maven-source-plugin + 3.3.0 attach-sources diff --git a/client/pom.xml b/client/pom.xml index 89a5b6e7c..f959bf842 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -46,6 +46,7 @@ org.apache.maven.plugins maven-source-plugin + 3.3.0 attach-sources diff --git a/pom.xml b/pom.xml index 7ce0bd99a..cb007deaa 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,7 @@ org.apache.maven.plugins maven-source-plugin + 3.3.0 attach-sources