From ccc1fc825393f3627aba210873ee6d1ccc0a8317 Mon Sep 17 00:00:00 2001 From: marcin-cebo <102806110+marcin-cebo@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:12:09 +0100 Subject: [PATCH] Changed license type from MIT to PubNub Software Development Kit License (#287) * Changed license type from MIT to PubNub Software Development Kit License * Updated the JSON library to version 20231013 * PubNub SDK v6.4.1 release. --------- Co-authored-by: PubNub Release Bot <120067856+pubnub-release-bot@users.noreply.github.com> --- .pubnub.yml | 21 +++++++++++++------- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- build.gradle | 4 ++-- gradle.properties | 6 +++--- src/main/java/com/pubnub/api/PubNub.java | 2 +- src/test/java/com/pubnub/api/PubNubTest.java | 2 +- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 981a1791c..3093ea563 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,9 +1,9 @@ name: java -version: 6.4.0 +version: 6.4.1 schema: 1 scm: github.com/pubnub/java files: - - build/libs/pubnub-gson-6.4.0-all.jar + - build/libs/pubnub-gson-6.4.1-all.jar sdks: - type: library @@ -23,8 +23,8 @@ sdks: - distribution-type: library distribution-repository: maven - package-name: pubnub-gson-6.4.0 - location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-gson/6.4.0/pubnub-gson-6.4.0.jar + package-name: pubnub-gson-6.4.1 + location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-gson/6.4.1/pubnub-gson-6.4.1.jar supported-platforms: supported-operating-systems: Android: @@ -108,13 +108,20 @@ sdks: is-required: Required - name: json - min-version: "20230227" - location: https://repo.maven.apache.org/maven2/org/json/json/20230227/json-20230227.jar + min-version: "20231013" + location: https://repo.maven.apache.org/maven2/org/json/json/20231013/json-20231013.jar license: Public Domain - license-url: https://github.com/stleary/JSON-java/blob/20230227/LICENSE + license-url: https://github.com/stleary/JSON-java/blob/20231013/LICENSE is-required: Required changelog: + - date: 2023-10-30 + version: v6.4.1 + changes: + - type: bug + text: "Updated the JSON lib to version 20231013." + - type: bug + text: "Changed license type from MIT to PubNub Software Development Kit License." - date: 2023-10-16 version: v6.4.0 changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index c82312dce..161b38ae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## v6.4.1 +October 30 2023 + +#### Fixed +- Updated the JSON lib to version 20231013. +- Changed license type from MIT to PubNub Software Development Kit License. + ## v6.4.0 October 16 2023 diff --git a/README.md b/README.md index 352245b22..3f361762f 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ You will need the publish and subscribe keys to authenticate your app. Get your com.pubnub pubnub-gson - 6.4.0 + 6.4.1 ``` * for Gradle, add the following dependency in your `gradle.build`: ```groovy - implementation 'com.pubnub:pubnub-gson:6.4.0' + implementation 'com.pubnub:pubnub-gson:6.4.1' ``` 2. Configure your keys: diff --git a/build.gradle b/build.gradle index 4872f9a38..e165f2960 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { } group = 'com.pubnub' -version = '6.4.0' +version = '6.4.1' description = """""" @@ -70,7 +70,7 @@ dependencies { testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1' testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.8.1' integrationTestImplementation group: 'org.aeonbits.owner', name: 'owner', version: '1.0.8' - implementation group: 'org.json', name: 'json', version: '20230227' + implementation group: 'org.json', name: 'json', version: '20231013' testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '6.10.4' testImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '6.10.4' testImplementation group: 'io.cucumber', name: 'cucumber-picocontainer', version: '6.10.4' diff --git a/gradle.properties b/gradle.properties index 8de554250..4977421a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ SONATYPE_HOST=DEFAULT SONATYPE_AUTOMATIC_RELEASE=true GROUP=com.pubnub POM_ARTIFACT_ID=pubnub-gson -VERSION_NAME=6.4.0 +VERSION_NAME=6.4.1 POM_PACKAGING=jar POM_NAME=PubNub Java SDK @@ -11,8 +11,8 @@ POM_DESCRIPTION=PubNub is a cross-platform client-to-client (1:1 and 1:many) pus POM_INCEPTION_YEAR=2009 POM_URL=https://github.com/pubnub/java -POM_LICENSE_NAME=MIT License -POM_LICENSE_URL=https://github.com/pubnub/pubnub-api/blob/master/LICENSE +POM_LICENSE_NAME=PubNub Software Development Kit License +POM_LICENSE_URL=https://github.com/pubnub/java/blob/master/LICENSE POM_LICENSE_DIST=repo POM_SCM_URL=https://github.com/pubnub/java diff --git a/src/main/java/com/pubnub/api/PubNub.java b/src/main/java/com/pubnub/api/PubNub.java index da8c689b7..86748ae83 100644 --- a/src/main/java/com/pubnub/api/PubNub.java +++ b/src/main/java/com/pubnub/api/PubNub.java @@ -105,7 +105,7 @@ public class PubNub { private static final int TIMESTAMP_DIVIDER = 1000; private static final int MAX_SEQUENCE = 65535; - private static final String SDK_VERSION = "6.4.0"; + private static final String SDK_VERSION = "6.4.1"; private final ListenerManager listenerManager; private final StateManager stateManager; diff --git a/src/test/java/com/pubnub/api/PubNubTest.java b/src/test/java/com/pubnub/api/PubNubTest.java index 109256c2d..e73073f05 100644 --- a/src/test/java/com/pubnub/api/PubNubTest.java +++ b/src/test/java/com/pubnub/api/PubNubTest.java @@ -100,7 +100,7 @@ public void getVersionAndTimeStamp() { pubnub = new PubNub(pnConfiguration); String version = pubnub.getVersion(); int timeStamp = pubnub.getTimestamp(); - Assert.assertEquals("6.4.0", version); + Assert.assertEquals("6.4.1", version); Assert.assertTrue(timeStamp > 0); }