Skip to content

Commit

Permalink
Changed license type from MIT to PubNub Software Development Kit Lice…
Browse files Browse the repository at this point in the history
…nse (#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 <[email protected]>
  • Loading branch information
marcin-cebo and pubnub-release-bot authored Oct 30, 2023
1 parent adafcd2 commit ccc1fc8
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 16 deletions.
21 changes: 14 additions & 7 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ You will need the publish and subscribe keys to authenticate your app. Get your
<dependency>
<groupId>com.pubnub</groupId>
<artifactId>pubnub-gson</artifactId>
<version>6.4.0</version>
<version>6.4.1</version>
</dependency>
```

* 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:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}
group = 'com.pubnub'

version = '6.4.0'
version = '6.4.1'

description = """"""

Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ 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
POM_DESCRIPTION=PubNub is a cross-platform client-to-client (1:1 and 1:many) push service in the cloud, capable of broadcasting real-time messages to millions of web and mobile clients simultaneously, in less than a quarter second!
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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pubnub/api/PubNub.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/pubnub/api/PubNubTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit ccc1fc8

Please sign in to comment.