diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eb9ce56..67a2caee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,31 +1,43 @@ # Changelog + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/), -and this project adheres to [Calendar Versioning](https://calver.org/) starting v20.03.0. + +## [24.1.0] - 2024-12-06 + +### Added + +- add support for big float and fix tests (#246) +- Provide shaded jar with dgraph4j's dependencies (#239) + +### Fixed + +- build(deps): bump the minor-and-patch group across 1 directory with 4 updates (#245) (#243) (#244) (#241) (#237) +- Upgrade to gradle 7.6.4 (#238) ## [24.0.0] - 2024-08-06 ### Added -* feat: Add Vector Support. ([#220]) +- feat: Add Vector Support. ([#220]) ### Fixed -* fix: Issues with disconnects addressed with Netty, protoc and protobuf-java updates. ([#212]) -### Security +- fix: Issues with disconnects addressed with Netty, protoc and protobuf-java updates. ([#212]) -* chore: Bump com.google.protobuf:protoc from 3.2.0 to 4.27.2 ([#215]) -* chore: Bump org.slf4j:slf4j-simple from 1.7.21 to 2.0.13 ([#214]) -* chore: Bump the minor-and-patch group in /samples/concurrent-modification with 2 updates ([#208]) -* chore: resolve cves ([#193]) -* chore: Bump github/codeql-action from 2 to 3 ([#198]) -* chore: Bump actions/setup-go from 3 to 5 ([#195]) +### Security +- chore: Bump com.google.protobuf:protoc from 3.2.0 to 4.27.2 ([#215]) +- chore: Bump org.slf4j:slf4j-simple from 1.7.21 to 2.0.13 ([#214]) +- chore: Bump the minor-and-patch group in /samples/concurrent-modification with 2 updates ([#208]) +- chore: resolve cves ([#193]) +- chore: Bump github/codeql-action from 2 to 3 ([#198]) +- chore: Bump actions/setup-go from 3 to 5 ([#195]) ### Testing -* chore: added a test for best effort queries ([#182]) +- chore: added a test for best effort queries ([#182]) [#220]: https://github.com/dgraph-io/dgraph4j/pull/220 [#215]: https://github.com/dgraph-io/dgraph4j/pull/215 @@ -41,74 +53,98 @@ and this project adheres to [Calendar Versioning](https://calver.org/) starting ## [21.12.0] - 2021-12-24 -* Version bump. No changes from v21.03.2. +- Version bump. No changes from v21.03.2. ## [21.03.2] - 2021-12-24 ### Added -* feat: Add timeout parameters to transaction requests. ([#172]) -* feat: Add shutdown method to client. ([#173]) +- feat: Add timeout parameters to transaction requests. ([#172]) +- feat: Add shutdown method to client. ([#173]) [#172]: https://github.com/dgraph-io/dgraph4j/pull/172 [#173]: https://github.com/dgraph-io/dgraph4j/pull/173 ## [21.03.1] - 2021-04-22 + ### Added -* fix(deprecation): add DgraphClient.clientStubFromCloudEndpoint ([#170]) + +- fix(deprecation): add DgraphClient.clientStubFromCloudEndpoint ([#170]) [#170]: https://github.com/dgraph-io/dgraph4j/pull/170 ## [21.03.0] - 2021-04-08 + ### Added -* feat: add loginIntoNamespace API on clients (GRAPHQL-1058) ([#166]) + +- feat: add loginIntoNamespace API on clients (GRAPHQL-1058) ([#166]) + ### Deprecated -* chore: Sync dgo + deprecate Slash endpoint method (GRAPHQL-1141) ([#167]) + +- chore: Sync dgo + deprecate Slash endpoint method (GRAPHQL-1141) ([#167]) + ### Fixed -* fix(test): Don't use dgraph binary in tests (GRAPHQL-1144) ([#168]) + +- fix(test): Don't use dgraph binary in tests (GRAPHQL-1144) ([#168]) [#166]: https://github.com/dgraph-io/dgraph4j/pull/166 [#167]: https://github.com/dgraph-io/dgraph4j/pull/167 [#168]: https://github.com/dgraph-io/dgraph4j/pull/168 ## [20.11.0] - 2020-12-23 + ### Added -* feat: Add support for RDF response (DGRAPH-2659) ([#160]) + +- feat: Add support for RDF response (DGRAPH-2659) ([#160]) + ### Changed -* gRPC: bumped gRPC libs to v1.34.1 + +- gRPC: bumped gRPC libs to v1.34.1 [#160]: https://github.com/dgraph-io/dgraph4j/pull/160 ## [20.03.3] - 2020-11-25 + ### Added -* feat: add client constructor with executor (DGRAPH-2746) ([#161]) + +- feat: add client constructor with executor (DGRAPH-2746) ([#161]) [#161]: https://github.com/dgraph-io/dgraph4j/pull/161 ## [20.03.2] - 2020-10-27 + ### Added -* feat: Support for Slash GraphQL endpoint ([#158]) + +- feat: Support for Slash GraphQL endpoint ([#158]) [#158]: https://github.com/dgraph-io/dgraph4j/pull/158 ## [20.03.1] - 2020-07-10 + ### Added -* Allow creation of Transaction/AsyncTransaction from TxnContext ([#149]) -* feat: Client now has a checkVersion method ([#155]) + +- Allow creation of Transaction/AsyncTransaction from TxnContext ([#149]) +- feat: Client now has a checkVersion method ([#155]) + ### Fixed -* Delete argument from method usePlainText ([#148]) + +- Delete argument from method usePlainText ([#148]) [#149]: https://github.com/dgraph-io/dgraph4j/pull/149 [#155]: https://github.com/dgraph-io/dgraph4j/pull/155 [#148]: https://github.com/dgraph-io/dgraph4j/pull/148 ## [20.03.0] - 2020-04-01 + ### Changed -* Upgrade grpc version to 1.26.0 ([#130]) -* Add docs for background indexing, update api.proto ([1324663]) + +- Upgrade grpc version to 1.26.0 ([#130]) +- Add docs for background indexing, update api.proto ([1324663]) + ### Fixed -* Fix slf4j dependencies. ([#133]) -* Fixed running multiple upserts within one transaction ([#137]) + +- Fix slf4j dependencies. ([#133]) +- Fixed running multiple upserts within one transaction ([#137]) [#130]: https://github.com/dgraph-io/dgraph4j/pull/130 [1324663]: https://github.com/dgraph-io/dgraph4j/commit/13246633dc87ab884beadf2ac239116890055b48 @@ -116,93 +152,123 @@ and this project adheres to [Calendar Versioning](https://calver.org/) starting [#137]: https://github.com/dgraph-io/dgraph4j/pull/137 ## [2.1.0] - 2020-01-30 + ### Changed -* Sync proto files with dgo ([#121]) + +- Sync proto files with dgo ([#121]) [#121]: https://github.com/dgraph-io/dgraph4j/pull/121 ## [2.0.2] - 2019-10-13 + ### Fixed -* Fix Opencensus tracing. ([#117]) + +- Fix Opencensus tracing. ([#117]) [#117]: https://github.com/dgraph-io/dgraph4j/pull/117 ## [2.0.1] - 2019-09-05 + ### Fixed -* Throw TxnConflictException correctly ([#102]) + +- Throw TxnConflictException correctly ([#102]) [#102]: https://github.com/dgraph-io/dgraph4j/pull/102 ## [2.0.0] - 2019-09-02 + ### Changed -* Upgrade grpc to get rid of Java 11 warnings from grpc ([#94]) -* Update grpc API to support Multiple Mutations in future ([#101]) + +- Upgrade grpc to get rid of Java 11 warnings from grpc ([#94]) +- Update grpc API to support Multiple Mutations in future ([#101]) [#94]: https://github.com/dgraph-io/dgraph4j/pull/94 [#101]: https://github.com/dgraph-io/dgraph4j/pull/101 ## [1.7.5] - 2019-06-29 + ### Added -* Add support for upsert block ([#88]) + +- Add support for upsert block ([#88]) + ### Fixed -* Moving the dependency io.opencensus.* into a test dependency only, ([#89]) + +- Moving the dependency io.opencensus.\* into a test dependency only, ([#89]) [#88]: https://github.com/dgraph-io/dgraph4j/pull/88 [#89]: https://github.com/dgraph-io/dgraph4j/pull/89 ## [1.7.4] - 2019-06-19 + ### Added -* Added best effort method to the transaction class to call the AsyncTransaction class method. ([#86]) + +- Added best effort method to the transaction class to call the AsyncTransaction class method. ([#86]) + ### Fixed -* Fix broken tests ([#87]) + +- Fix broken tests ([#87]) [#86]: https://github.com/dgraph-io/dgraph4j/pull/86 [#87]: https://github.com/dgraph-io/dgraph4j/pull/87 ## [1.7.3] - 2019-03-27 + ### Added -* added logic for ACL and upgraded the code to be usable with java 11 ([#80]) -* Added best effort flag, shorten ACL test timing to match changes in dgraph ([b4bf3bf]) + +- added logic for ACL and upgraded the code to be usable with java 11 ([#80]) +- Added best effort flag, shorten ACL test timing to match changes in dgraph ([b4bf3bf]) [#80]: https://github.com/dgraph-io/dgraph4j/pull/80 [b4bf3bf]: https://github.com/dgraph-io/dgraph4j/commit/b4bf3bf49d7f89f0bffd3a4929f42efbef9a5a31 ## [1.7.1] - 2018-10-31 + ### Added -* Added the doc and sample code for setting auth token ([#70]) -* Readonly support, separating integration tests and unit tests etc ([#71]) + +- Added the doc and sample code for setting auth token ([#70]) +- Readonly support, separating integration tests and unit tests etc ([#71]) + ### Fixed -* Fix client selection behavior to match Go client. ([3bb5e23]) + +- Fix client selection behavior to match Go client. ([3bb5e23]) [#70]: https://github.com/dgraph-io/dgraph4j/pull/70 [#71]: https://github.com/dgraph-io/dgraph4j/pull/71 [3bb5e23]: https://github.com/dgraph-io/dgraph4j/commit/3bb5e23c6bcbfd7224a602aa34ef33c4c26c24f4 ## [1.7.0] - 2018-09-20 -* Upgrading grpc-java to v1.15.0 + +- Upgrading grpc-java to v1.15.0 ## [1.6.0] - 2018-09-11 -* Remove LinRead and sequencing map from client. + +- Remove LinRead and sequencing map from client. ## [1.5.0] - 2018-09-03 -* Updated api.proto. Added a new preds field to TxnContext. + +- Updated api.proto. Added a new preds field to TxnContext. ## [1.4.2] - 2018-08-21 -* Added Async client. -* Fixed maven publishing issues + +- Added Async client. +- Fixed maven publishing issues ## [1.3.0] - 2018-04-04 -* Added option to choose Client/Serve Side sequential mode. + +- Added option to choose Client/Serve Side sequential mode. ## [1.2.0] - 2018-02-06 -* Added possibility to create a DgraphClient with a specified request + +- Added possibility to create a DgraphClient with a specified request deadline (#48). ## [1.1.0] - 2018-01-17 -* Incorporated proto file changes in Dgraph 1.2.0 release + +- Incorporated proto file changes in Dgraph 1.2.0 release ## [1.0.0] - 2017-12-18 -* Fully compatible with Dgraph v1.0 + +- Fully compatible with Dgraph v1.0 [Unreleased]: https://github.com/dgraph-io/dgraph4j/compare/v21.12.0...HEAD [21.12.0]: https://github.com/dgraph-io/dgraph4j/compare/v21.03.2...v21.12.0 diff --git a/PUBLISHING.md b/PUBLISHING.md index ca71823b..ef27b296 100644 --- a/PUBLISHING.md +++ b/PUBLISHING.md @@ -7,13 +7,14 @@ This document contains instructions to publish dgraph4j build artefacts to Maven ### Before Deploying -* Get access to credentials for `dgraph` JIRA account on Maven Central. -* Generate GPG credentials. Make sure you set a passphrase. You can use this -[guide](https://help.github.com/en/articles/generating-a-new-gpg-key). -* Note down the short version of the Key ID: `gpg --list-keys --keyid-format short`. -* Generate a secret key ring file if not present: `gpg --export-secret-keys -o /path/to/.gnupg/secring.gpg`. -* Publish the keys to the MIT server: `gpg --send-keys ` (Maven Central will check for keys here). -* Create `~/.gradle/gradle.properties` and populate it with all the credentials: +- Get access to credentials for `dgraph` JIRA account on Maven Central. +- Generate GPG credentials. Make sure you set a passphrase. You can use this + [guide](https://help.github.com/en/articles/generating-a-new-gpg-key). +- Note down the short version of the Key ID: `gpg --list-keys --keyid-format short`. +- Generate a secret key ring file if not present: `gpg --export-secret-keys -o /path/to/.gnupg/secring.gpg`. +- Publish the keys to the MIT server: `gpg --send-keys ` (Maven Central will check for keys here). +- Create `~/.gradle/gradle.properties` and populate it with all the credentials: + ``` signing.keyId=<…keyId…> signing.password=<…password…> @@ -24,19 +25,21 @@ ossrhPassword=<…password…> ``` ### Deploying -* Build and test the code that needs to be published. -* Bump version by modifying the `version` variable in `build.gradle` file. -* Update download version in README for both Maven and Gradle. -* Update `Supported Versions` table in README. -* Update `dgraph4j version` in `grpc-netty` table in README. -* Update CHANGELOG. -* Raise a PR for the above changes. Put the changelog in PR description and merge it. -* Run `./gradlew uploadArchives`. -* Release the deployment by following the steps on the page _Releasing the Deployment_ (link in references below). -* Also cut a release tag on GitHub with the new version. + +- Build and test the code that needs to be published. +- Bump version by modifying the `version` variable in `build.gradle` file. +- Update download version in README for both Maven and Gradle. +- Update `Supported Versions` table in README. +- Update `dgraph4j version` in `grpc-netty` table in README. +- Update CHANGELOG. +- Raise a PR for the above changes. Put the changelog in PR description and merge it. +- Run `./gradlew uploadArchives`. +- Release the deployment by following the steps on the page _Releasing the Deployment_ (link in references below). +- Also cut a release tag on GitHub with the new version. ### References -* [Publishing a project on Maven Central](https://medium.com/@nmauti/publishing-a-project-on-maven-central-8106393db2c3) -* [Deploying to OSSRH with Gradle - Introduction](http://central.sonatype.org/pages/gradle.html) -* [StackOverflow thread on issues during signing artefacts](https://stackoverflow.com/questions/27936119/gradle-uploadarchives-task-unable-to-read-secret-key) -* [Releasing the Deployment](http://central.sonatype.org/pages/releasing-the-deployment.html) + +- [Publishing a project on Maven Central](https://medium.com/@nmauti/publishing-a-project-on-maven-central-8106393db2c3) +- [Deploying to OSSRH with Gradle - Introduction](http://central.sonatype.org/pages/gradle.html) +- [StackOverflow thread on issues during signing artefacts](https://stackoverflow.com/questions/27936119/gradle-uploadarchives-task-unable-to-read-secret-key) +- [Releasing the Deployment](http://central.sonatype.org/pages/releasing-the-deployment.html) diff --git a/README.md b/README.md index 3adf8a80..2c832f12 100644 --- a/README.md +++ b/README.md @@ -58,12 +58,12 @@ grab via Maven: io.dgraph dgraph4j - 24.0.0 + 24.1.0 ``` or Gradle: ```groovy -compile 'io.dgraph:dgraph4j:24.0.0' +compile 'io.dgraph:dgraph4j:24.1.0' ``` ## Supported Versions @@ -120,6 +120,7 @@ The following is only applicable to dgraph4j versions < v24.X.X. | 20.03.0-20.03.3 | 1.26.0 | 2.0.26.Final | | >= 20.11.0 | 1.34.1 | 2.0.31.Final | | >= 24.0.0 | 1.65.1 | 4.1.100.Final | + | >= 24.1.0 | 1.68.2 | 4.1.110.Final | For example, when using `dgraph4j v24.0.0`, the version of the `netty-tcnative-boringssl-static` dependency to be used is `4.1.100.Final`, as suggested by gRPC docs for `grpc-netty v1.65.1`. diff --git a/build.gradle b/build.gradle index f8a66cd2..5f8bd34a 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'signing' group = 'io.dgraph' -version = '24.0.0' +version = '24.1.0' base { archivesName = 'dgraph4j' diff --git a/samples/DgraphJavaSampleDeadlineInterceptors/build.gradle b/samples/DgraphJavaSampleDeadlineInterceptors/build.gradle index 46f3cca3..713ca3ff 100644 --- a/samples/DgraphJavaSampleDeadlineInterceptors/build.gradle +++ b/samples/DgraphJavaSampleDeadlineInterceptors/build.gradle @@ -17,7 +17,7 @@ repositories { dependencies { // Use Dgraph Java client - implementation 'io.dgraph:dgraph4j:24.0.0' + implementation 'io.dgraph:dgraph4j:24.1.0' // Use JUnit test framework testImplementation 'junit:junit:4.13.2' diff --git a/samples/DgraphJavaSampleWithDeadlineAfter/build.gradle b/samples/DgraphJavaSampleWithDeadlineAfter/build.gradle index 9b9e1c80..cd4c1f4e 100644 --- a/samples/DgraphJavaSampleWithDeadlineAfter/build.gradle +++ b/samples/DgraphJavaSampleWithDeadlineAfter/build.gradle @@ -17,7 +17,7 @@ repositories { dependencies { // Use Dgraph Java client - implementation 'io.dgraph:dgraph4j:24.0.0' + implementation 'io.dgraph:dgraph4j:24.1.0' // Use JUnit test framework testImplementation 'junit:junit:4.13.2' @@ -29,4 +29,3 @@ dependencies { // Define the main class for the application mainClassName = 'App' - diff --git a/src/main/java/io/dgraph/DgraphAsyncClient.java b/src/main/java/io/dgraph/DgraphAsyncClient.java index 13dbb1a9..a820cc65 100644 --- a/src/main/java/io/dgraph/DgraphAsyncClient.java +++ b/src/main/java/io/dgraph/DgraphAsyncClient.java @@ -340,10 +340,10 @@ public AsyncTransaction newTransaction() { * *

- Various AsyncTransaction#query() and AsyncTransaction#mutate() calls made. * - *

- Commit using AsyncTransacation#commit() or Discard using AsyncTransaction#discard(). If - * any mutations have been made, It's important that at least one of these methods is called to - * clean up resources. Discard is a no-op if Commit has already been called, so it's safe to call - * it after Commit. + *

- Commit using AsyncTransaction#commit() or Discard using AsyncTransaction#discard(). If any + * mutations have been made, It's important that at least one of these methods is called to clean + * up resources. Discard is a no-op if Commit has already been called, so it's safe to call it + * after Commit. * * @return a new AsyncTransaction object. */