From b3e25a58cae0db6f223dd8e9ef2583b188b2cfbb Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Tue, 2 Jan 2024 11:24:32 +0530 Subject: [PATCH 01/32] 4.2.0 release --- nitrite-bom/pom.xml | 2 +- nitrite-jackson-mapper/pom.xml | 2 +- nitrite-mvstore-adapter/pom.xml | 2 +- nitrite-rocksdb-adapter/pom.xml | 2 +- nitrite-spatial/pom.xml | 2 +- nitrite-support/pom.xml | 2 +- nitrite/pom.xml | 2 +- pom.xml | 2 +- potassium-nitrite/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index fd0988bd..003cbc03 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-bom diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml index 3dfacb1a..066a2011 100644 --- a/nitrite-jackson-mapper/pom.xml +++ b/nitrite-jackson-mapper/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-jackson-mapper diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml index 95c76663..7aa1a568 100644 --- a/nitrite-mvstore-adapter/pom.xml +++ b/nitrite-mvstore-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-mvstore-adapter diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml index 44bf38bd..f2ccca1c 100644 --- a/nitrite-rocksdb-adapter/pom.xml +++ b/nitrite-rocksdb-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-rocksdb-adapter diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml index f5407dbf..a0dea926 100644 --- a/nitrite-spatial/pom.xml +++ b/nitrite-spatial/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-spatial diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml index b5f50e5c..bfb0540c 100644 --- a/nitrite-support/pom.xml +++ b/nitrite-support/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-support diff --git a/nitrite/pom.xml b/nitrite/pom.xml index 5250adb5..83d30507 100644 --- a/nitrite/pom.xml +++ b/nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite diff --git a/pom.xml b/pom.xml index 6b45bcff..14eab5f1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 pom Nitrite Database diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml index e567f74e..af58a6c9 100644 --- a/potassium-nitrite/pom.xml +++ b/potassium-nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 potassium-nitrite From a996a812c1fd43d1a884510c4b5a3d286e39043b Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Tue, 2 Jan 2024 12:18:00 +0530 Subject: [PATCH 02/32] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 19611768..cae3050f 100644 --- a/.gitignore +++ b/.gitignore @@ -452,4 +452,4 @@ test.log /build !no2-old.db .diffblue -infer-out \ No newline at end of file +infer-out From 17def9ce5fee6f8c4b117ec2a01d5abb415811b6 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Tue, 2 Jan 2024 17:16:31 +0530 Subject: [PATCH 03/32] changelog added --- CHANGELOG.md | 207 ++++++++++++++++++++++++++++++++ nitrite-bom/pom.xml | 2 +- nitrite-jackson-mapper/pom.xml | 2 +- nitrite-mvstore-adapter/pom.xml | 2 +- nitrite-rocksdb-adapter/pom.xml | 2 +- nitrite-spatial/pom.xml | 2 +- nitrite-support/pom.xml | 2 +- nitrite/pom.xml | 2 +- pom.xml | 2 +- potassium-nitrite/pom.xml | 2 +- 10 files changed, 216 insertions(+), 9 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..f2fdfdfe --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,207 @@ +## Release 4.2.0 - Jan 2, 2024 + +### New Changes + +- Nitrite API has been re-written from ground up. It is now more stable and performant. But there are breaking changes. Please read the [guide](https://nitrite.dizitart.com/) for more details. +- Nitrite now requires Java 11 or above. +- Nitrite is now modular. It has been now divided into several modules. You can use only the modules you need. +- Modular storage adapters are now available. You can use only the storage adapter you need. +- MVStore version upgraded to 2.2.224 +- RocksDB has been introduced as a new storage adapter. +- Nitrite now supports transaction. +- Nitrite now supports schema migration. +- Nitrite now supports spatial indexing and search +- Nitrite now support import/export of data in JSON format. +- Build system has been migrated to Maven. +- Nitrite DataGate has been deprecated. +- Nitrite Explorer has been deprecated. + +## Release 3.4.4 - Mar 23, 2022 + +### Issue Fixes + +- Emergency fix for #697 + +## Release 3.4.3 - Dec 12, 2020 + +### Issue Fixes + +- Random crashes with exception "Fatal Exception: java.lang.IllegalStateException: Chunk 55267 not found" #386 +- Null pointer on updating full text index #366 +- Breton list is actually Brazilian Portuguese #251 + +## Release 3.4.2 - Jun 2, 2020 + +### Issue Fixes + +- Fix for NoClassDefFoundError in isObjectStore #220 +- Fix for Full text index is not updated field update #222 + +## Release 3.4.1 - Mar 25, 2020 + +### Issue Fixes + +- Fix for Deadlock in latest 3.4.0 #212 + +## Release 3.4.0 - Mar 24, 2020 + +### Issue Fixes + +- Fix for UniqueConstraintException when upserting #193 +- Fix for several NPEs under certain edge case conditions #203 +- Fix for Off-Heap store memory utilization issues #211 + +## Release 3.3.0 - Oct 19, 2019 + +### New Changes + +- Upgrade MVStore version to 1.4.200 +- Add Support for Off-Heap Memory #160 +- Offer close und update methods for TextIndexingService #176 +- Allow to access collection of IDs from find result #165 +- Sorting with accents #144 + +### Issue Fixes + +- Null pointer exception when querying data #185 +- Documentation : support for querying embedded objects #157 +- Documentation: minSdkVersion should be 19 #167 +- Index not removed for fulltext-indexed field when using a third-party TextIndexingService #174 +- Performance enhancements for InFilter() #173 +- Filtering on indexed fields with multiple Number only retrieves same type as given Comparable #178 +- Unique constraints apparently not checked when updating document #151 + +## Release 3.2.0 - Mar 16, 2019 + +### New Changes + +- Upgrade MVStore version to 1.4.198 #134 +- Improve `Mappable` performance using constructor cache #133 +- Make `ObjectRepository` and `NitriteCollection` implements `Closeable` #108 + +### Issue Fixes + +- Database file remains locked after failed connection #116 +- Exception when removing a document on a text indexed collection #114 +- NitriteBuilder openOrCreate returns silently null #112 + +## Release 3.1.0 - Sep 1, 2018 + +### New Changes + +- Keyed `ObjectRepository` support #78 +- Podam version upgraded to resolve missing JAX-WS dependency in Java 9 #90 +- MVStore upgraded to latest release #69 +- Introduced a utility method to register jackson modules in `NitriteBuilder` #94 +- Null order support during sort #98 +- `@InheritIndices` now works for fields with any modifier #101 + +### Issue Fixes + +- Fixed documentation for MapperFacade #100 +- Added documentation for @NitriteId annotation #102 +- Changes to text index not saved correctly #105 +- Closing the database recreates dropped collections #106 + +## Release 3.0.2 - Aug 2, 2018 + +### Issue Fixes + +- Recover should return success/failure #89 +- Reopening issue #72, with variation of failing scenario still broken in 3.0.1 #93 + +## Release 3.0.1 - Jul 21, 2018 + +### New Changes + +- Jackson modules are auto discoverable #68 +- Refactoring of NitriteMapper #74 +- Make runtime shutdown hook optional #84 + +### Issue Fixes + +- Fix for order by using a nullable columns #72 +- Fix for DataGate server for Windows #71 +- Intermittent NPE in remove #76 +- Fix for NPE in indexing #77 +- Documentation for POJO annotation #81 + +## Release 3.0.0 - Apr 8, 2018 + +### New Changes + +- `KNO2JacksonMapper` is now extendable +- Support for `NitriteId` as id field of an object +- Object's property can be updated with null +- Support for `java.time` & it's backport +- Change in update operation behavior (breaking changes) + +### Issue Fixes + +- ConcurrentModificationException in `NitriteEventBus` - #52 +- Duplicate `@Id` in concurrent modification - #55 +- Fixed a race condition while updating the index entries - #58 +- Fix for sort operation - #62 +- Version upgraded for several dependencies - #64 + +## Release 2.1.1 - Feb 4, 2018 + +### New Changes + +- Kotlin version upgrade to 1.2.20 +- Data import export extension added in potassium-nitrite + +### Issue Fixes + +- Fixes concurrency problem while compacting database - #41 +- Lucene example fixed for update and lucene version upgraded - #44 +- Fixed collection registry and repository registry - #42 +- Readme updated with potassium-nitrite - #49 + +## Release 2.1.0 - Dec 7, 2017 + +### New Changes + +- Introduced potassium-nitrite - kotlin extension library for nitrite +- Multi-language text tokenizer support - #36 +- Cursor join - #33 +- Inherit `@Id`, `@Index` annotations from super class - #37 +- Default executor behaves like `CachedThreadPool` executor - #32 + +### Issue Fixes + +- Put a check on object if it is serializable - #31 + +## Release 2.0.1 - Oct 24, 2017 + +### Issue Fixes + +- Fix for SOE - #29 +- Fix for sync issue - #25 +- Detailed log added in `JacksonMapper` + +## Release 2.0.0 - Aug 13, 2017 + +### New Changes + +- Introduced `Mappable` interface to speed up pojo to document conversion in Android - #18 + +### Breaking Changes + +- `NitriteMapper` and `JacksonMapper` moved from package `org.dizitart.no2.internals` to `org.dizitart.no2.mapper` + +### Issue Fixes + +- Fix for `ObjectFilters.ALL` - #14 +- Fix for `dropIndex()` - #22 +- Documentation added - #12, #20 + +## Release 1.0.1 - Jun 1, 2017 + +- Minor bug fixes for DataGate server - #6 , #7 , #8 +- File parameter added while opening a database - #5 +- Documentation updated - #3 , #8 + +## First Release - Apr 25, 2017 + +- Initial release \ No newline at end of file diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index 003cbc03..fd0988bd 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite-bom diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml index 066a2011..3dfacb1a 100644 --- a/nitrite-jackson-mapper/pom.xml +++ b/nitrite-jackson-mapper/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite-jackson-mapper diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml index 7aa1a568..95c76663 100644 --- a/nitrite-mvstore-adapter/pom.xml +++ b/nitrite-mvstore-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite-mvstore-adapter diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml index f2ccca1c..44bf38bd 100644 --- a/nitrite-rocksdb-adapter/pom.xml +++ b/nitrite-rocksdb-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite-rocksdb-adapter diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml index a0dea926..f5407dbf 100644 --- a/nitrite-spatial/pom.xml +++ b/nitrite-spatial/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite-spatial diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml index bfb0540c..b5f50e5c 100644 --- a/nitrite-support/pom.xml +++ b/nitrite-support/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite-support diff --git a/nitrite/pom.xml b/nitrite/pom.xml index 83d30507..5250adb5 100644 --- a/nitrite/pom.xml +++ b/nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT nitrite diff --git a/pom.xml b/pom.xml index 14eab5f1..6b45bcff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT pom Nitrite Database diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml index af58a6c9..e567f74e 100644 --- a/potassium-nitrite/pom.xml +++ b/potassium-nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.0-SNAPSHOT potassium-nitrite From c66652d2d5ece030361295efa7825d2516932625 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Tue, 2 Jan 2024 21:52:43 +0530 Subject: [PATCH 04/32] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cae3050f..6c74eda3 100644 --- a/.gitignore +++ b/.gitignore @@ -453,3 +453,4 @@ test.log !no2-old.db .diffblue infer-out +secring.gpg \ No newline at end of file From a15c0ffeb276ed75fb673dabdde00fc32b263362 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Tue, 2 Jan 2024 21:55:36 +0530 Subject: [PATCH 05/32] Update pom.xml --- nitrite-bom/pom.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index fd0988bd..bd45aa4b 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -15,7 +15,6 @@ UTF-8 - ${project.version} @@ -24,37 +23,37 @@ org.dizitart nitrite - ${nitrite.version} + ${project.version} org.dizitart nitrite-jackson-mapper - ${nitrite.version} + ${project.version} org.dizitart nitrite-mvstore-adapter - ${nitrite.version} + ${project.version} org.dizitart nitrite-rocksdb-adapter - ${nitrite.version} + ${project.version} org.dizitart nitrite-spatial - ${nitrite.version} + ${project.version} org.dizitart nitrite-support - ${nitrite.version} + ${project.version} org.dizitart potassium-nitrite - ${nitrite.version} + ${project.version} From 6847d13577cc9059a6c73581348a58db0a4999b6 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Wed, 3 Jan 2024 07:11:05 +0530 Subject: [PATCH 06/32] maven release action added --- .github/workflows/build.yml | 11 +++++++++-- CHANGELOG.md | 3 ++- pom.xml | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c38682e..2ed87999 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,13 +63,20 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: github.ref == 'refs/heads/release' && matrix.java == '11' - run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests + if: github.ref == 'refs/heads/release' && matrix.java == '11' && "!contains(github.event.head_commit.message, '[ci skip]')" + uses: qcastel/github-actions-maven-release@master + with: + git-release-bot-name: "nitrite-bot" + git-release-bot-email: "bot@dizitart.com" + maven-args: "-DskipTests -DskipITs -Ddockerfile.skip -DdockerCompose.skip -Dmaven.deploy.skip=true" + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + release-branch-name: "release" env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + JAVA_HOME: /usr/lib/jvm/java-11-openjdk/ - name: Publish Code Coverage if: github.ref == 'refs/heads/main' && matrix.java == '11' diff --git a/CHANGELOG.md b/CHANGELOG.md index f2fdfdfe..dafcbf96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Release 4.2.0 - Jan 2, 2024 +## Release 4.2.0 - Jan 3, 2024 ### New Changes @@ -11,6 +11,7 @@ - Nitrite now supports transaction. - Nitrite now supports schema migration. - Nitrite now supports spatial indexing and search +- Nitrite now supports compound indexes. - Nitrite now support import/export of data in JSON format. - Build system has been migrated to Maven. - Nitrite DataGate has been deprecated. diff --git a/pom.xml b/pom.xml index 6b45bcff..970152db 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,8 @@ scm:git:git@github.com:nitrite/nitrite-java.git scm:git:git@github.com:nitrite/nitrite-java.git - https://github.com/nitrite/nitrite-java + git@github.com:nitrite/nitrite-java.git + HEAD @@ -498,6 +499,7 @@ ${maven-release-plugin.version} v@{project.version} + [ci skip] true release From 6eb34f3ddd15e13c8be60c85eedb26838cae92a8 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Wed, 3 Jan 2024 07:14:32 +0530 Subject: [PATCH 07/32] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ed87999..669d01c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: github.ref == 'refs/heads/release' && matrix.java == '11' && "!contains(github.event.head_commit.message, '[ci skip]')" + if: github.ref == 'refs/heads/release' && matrix.java == '11' && !contains(github.event.head_commit.message, '[ci skip]') uses: qcastel/github-actions-maven-release@master with: git-release-bot-name: "nitrite-bot" From 50b349cd04d962a08bb2bc38f8ffb85612a43c2b Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Wed, 3 Jan 2024 11:35:45 +0530 Subject: [PATCH 08/32] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dafcbf96..9daa6a9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -205,4 +205,4 @@ ## First Release - Apr 25, 2017 -- Initial release \ No newline at end of file +- Initial release From a6705233539d4421797b503bb7a7848924f92a73 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Wed, 3 Jan 2024 12:35:44 +0530 Subject: [PATCH 09/32] Update build.yml --- .github/workflows/build.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 669d01c0..b568e72d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,7 @@ jobs: name: Build with Java ${{ matrix.java }} in Ubuntu steps: - uses: actions/checkout@v4 + - uses: fregante/setup-git-user@v2 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: @@ -64,19 +65,12 @@ jobs: - name: Deploy Release if: github.ref == 'refs/heads/release' && matrix.java == '11' && !contains(github.event.head_commit.message, '[ci skip]') - uses: qcastel/github-actions-maven-release@master - with: - git-release-bot-name: "nitrite-bot" - git-release-bot-email: "bot@dizitart.com" - maven-args: "-DskipTests -DskipITs -Ddockerfile.skip -DdockerCompose.skip -Dmaven.deploy.skip=true" - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - release-branch-name: "release" + run: mvn -B -ff -ntp deploy -DskipTests -DskipITs env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - JAVA_HOME: /usr/lib/jvm/java-11-openjdk/ - name: Publish Code Coverage if: github.ref == 'refs/heads/main' && matrix.java == '11' From 8718f9b3bf6dae5a67c5440fbb5673bf48cc9d58 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee <696662+anidotnet@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:09:19 +0530 Subject: [PATCH 10/32] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b568e72d..8780a999 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: - name: Deploy Release if: github.ref == 'refs/heads/release' && matrix.java == '11' && !contains(github.event.head_commit.message, '[ci skip]') - run: mvn -B -ff -ntp deploy -DskipTests -DskipITs + run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DskipITs env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -124,4 +124,4 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install \ No newline at end of file + run: mvn -B -ff -ntp clean install From 21a76c0974fe7c6c696152de99bfbc27395b86bd Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Thu, 4 Jan 2024 12:27:08 +0530 Subject: [PATCH 11/32] testing ci release --- .github/workflows/build.yml | 164 ++++++++++++++++++--------------- .github/workflows/release.yml | 52 +++++++++++ .github/workflows/snapshot.yml | 52 +++++++++++ CHANGELOG.md | 2 +- pom.xml | 8 +- 5 files changed, 199 insertions(+), 79 deletions(-) create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/snapshot.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8780a999..383c1080 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,11 +17,9 @@ on: - "README.md" jobs: - build_linux: + release: + name: Release runs-on: ubuntu-latest - strategy: - matrix: - java: ['11', '17'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} @@ -29,14 +27,13 @@ jobs: PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Build with Java ${{ matrix.java }} in Ubuntu steps: - uses: actions/checkout@v4 - uses: fregante/setup-git-user@v2 - - name: Set up JDK ${{ matrix.java }} + - name: Set up JDK 11 uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java }} + java-version: 11 distribution: 'zulu' java-package: jdk architecture: x64 @@ -51,77 +48,94 @@ jobs: env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - - name: Build with Maven - run: mvn -B -ff -ntp clean install - - - name: Deploy Snapshot - if: github.ref == 'refs/heads/develop' && matrix.java == '11' - run: mvn -B -ff -ntp deploy -DskipTests - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} - PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - - name: Deploy Release - if: github.ref == 'refs/heads/release' && matrix.java == '11' && !contains(github.event.head_commit.message, '[ci skip]') - run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DskipITs + if: github.ref == 'refs/heads/release' + run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DdryRun=true -Darguments=-DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - - - name: Publish Code Coverage - if: github.ref == 'refs/heads/main' && matrix.java == '11' - uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} - flags: unittests - name: codecov-umbrella - - build_macos: - runs-on: macos-latest - strategy: - matrix: - java: [ '11', '17' ] - env: - JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" - - name: Build with Java ${{ matrix.java }} in MacOS - steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - java-version: ${{ matrix.java }} - distribution: 'zulu' - java-package: jdk - architecture: x64 - cache: 'maven' - - - name: Build with Maven - run: mvn -B -ff -ntp clean install - - build_windows: - runs-on: windows-latest - strategy: - matrix: - java: [ '11', '17' ] - env: - JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" - - name: Build with Java ${{ matrix.java }} in Windows - steps: - - uses: actions/checkout@v4 - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 - with: - java-version: ${{ matrix.java }} - distribution: 'zulu' - java-package: jdk - architecture: x64 - cache: 'maven' - - - name: Build with Maven - run: mvn -B -ff -ntp clean install +# build_linux: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# java: ['11', '17'] +# env: +# JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" +# MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} +# MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} +# PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} +# PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} +# +# name: Build with Java ${{ matrix.java }} in Ubuntu +# steps: +# - uses: actions/checkout@v4 +# - name: Set up JDK ${{ matrix.java }} +# uses: actions/setup-java@v4 +# with: +# java-version: ${{ matrix.java }} +# distribution: 'zulu' +# java-package: jdk +# architecture: x64 +# cache: 'maven' +# server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml +# server-username: MAVEN_USERNAME +# server-password: MAVEN_PASSWORD +# +# - name: Build with Maven +# run: mvn -B -ff -ntp clean install +# +# - name: Publish Code Coverage +# if: github.ref == 'refs/heads/main' && matrix.java == '11' +# uses: codecov/codecov-action@v3 +# with: +# token: ${{ secrets.CODECOV_TOKEN }} +# flags: unittests +# name: codecov-umbrella +# +# build_macos: +# runs-on: macos-latest +# strategy: +# matrix: +# java: [ '11', '17' ] +# env: +# JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" +# +# name: Build with Java ${{ matrix.java }} in MacOS +# steps: +# - uses: actions/checkout@v4 +# - name: Set up JDK ${{ matrix.java }} +# uses: actions/setup-java@v4 +# with: +# java-version: ${{ matrix.java }} +# distribution: 'zulu' +# java-package: jdk +# architecture: x64 +# cache: 'maven' +# +# - name: Build with Maven +# run: mvn -B -ff -ntp clean install +# +# build_windows: +# runs-on: windows-latest +# strategy: +# matrix: +# java: [ '11', '17' ] +# env: +# JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" +# +# name: Build with Java ${{ matrix.java }} in Windows +# steps: +# - uses: actions/checkout@v4 +# - name: Set up JDK ${{ matrix.java }} +# uses: actions/setup-java@v4 +# with: +# java-version: ${{ matrix.java }} +# distribution: 'zulu' +# java-package: jdk +# architecture: x64 +# cache: 'maven' +# +# - name: Build with Maven +# run: mvn -B -ff -ntp clean install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..e1213766 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,52 @@ +name: Release + +on: + workflow_run: + workflows: + - Build + branches: + - release + types: + - completed + +jobs: + release: + if: ${{ github.event.workflow_run.conclusion == 'success' }} + name: Release + runs-on: ubuntu-latest + env: + JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" + MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} + PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + + steps: + - uses: actions/checkout@v4 + - uses: fregante/setup-git-user@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: 11 + distribution: 'zulu' + java-package: jdk + architecture: x64 + cache: 'maven' + server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + + - name: Prepare PGP Keys + if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release' + run: openssl aes-256-cbc -pass pass:$PGP_KEY_PASSWORD -in ./.ci/secring.gpg.enc -out $GITHUB_WORKSPACE/secring.gpg -d -md md5 + env: + PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + + - name: Deploy Release + if: github.ref == 'refs/heads/release' + run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DdryRun=true + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} + PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 00000000..5488fe8f --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,52 @@ +name: Snapshot + +on: + workflow_run: + workflows: + - Build + branches: + - develop + types: + - completed + +jobs: + snapshot: + if: ${{ github.event.workflow_run.conclusion == 'success' }} + name: Snapshot + runs-on: ubuntu-latest + env: + JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" + MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} + PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + + steps: + - uses: actions/checkout@v4 + - uses: fregante/setup-git-user@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: 11 + distribution: 'zulu' + java-package: jdk + architecture: x64 + cache: 'maven' + server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + + - name: Prepare PGP Keys + if: github.ref == 'refs/heads/develop' + run: openssl aes-256-cbc -pass pass:$PGP_KEY_PASSWORD -in ./.ci/secring.gpg.enc -out $GITHUB_WORKSPACE/secring.gpg -d -md md5 + env: + PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + + - name: Deploy Snapshot + if: github.ref == 'refs/heads/develop' + run: mvn -B -ff -ntp deploy -DskipTests + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} + PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9daa6a9b..86c0b1d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Release 4.2.0 - Jan 3, 2024 +## Release 4.2.0 - Jan 4, 2024 ### New Changes diff --git a/pom.xml b/pom.xml index 970152db..24c34b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,9 @@ - scm:git:git@github.com:nitrite/nitrite-java.git - scm:git:git@github.com:nitrite/nitrite-java.git - git@github.com:nitrite/nitrite-java.git + scm:git:https://github.com/nitrite/nitrite-java.git + scm:git:https://github.com/nitrite/nitrite-java.git + https://github.com/nitrite/nitrite-java.git HEAD @@ -502,6 +502,8 @@ [ci skip] true release + false + ${project.version} From cd71362adab8f4493929ae320101c41c7e5c38b7 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Thu, 4 Jan 2024 12:28:14 +0530 Subject: [PATCH 12/32] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 383c1080..aee8d4ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,13 +43,13 @@ jobs: server-password: MAVEN_PASSWORD - name: Prepare PGP Keys - if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release' +# if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release' run: openssl aes-256-cbc -pass pass:$PGP_KEY_PASSWORD -in ./.ci/secring.gpg.enc -out $GITHUB_WORKSPACE/secring.gpg -d -md md5 env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: github.ref == 'refs/heads/release' +# if: github.ref == 'refs/heads/release' run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DdryRun=true -Darguments=-DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} From 3d8d59ba76ca4a514cfd135dc4572353bfb42893 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Thu, 4 Jan 2024 21:09:34 +0530 Subject: [PATCH 13/32] prepare deployment --- .ci/prepare-keys.sh | 5 + .github/workflows/build.yml | 163 ++++++++++++-------------------- .github/workflows/release.yml | 9 +- .github/workflows/snapshot.yml | 5 +- nitrite-bom/pom.xml | 4 + nitrite-jackson-mapper/pom.xml | 4 + nitrite-mvstore-adapter/pom.xml | 4 + nitrite-rocksdb-adapter/pom.xml | 4 + nitrite-spatial/pom.xml | 4 + nitrite-support/pom.xml | 4 + nitrite/pom.xml | 4 + pom.xml | 3 +- potassium-nitrite/pom.xml | 4 + 13 files changed, 111 insertions(+), 106 deletions(-) create mode 100644 .ci/prepare-keys.sh diff --git a/.ci/prepare-keys.sh b/.ci/prepare-keys.sh new file mode 100644 index 00000000..e1290324 --- /dev/null +++ b/.ci/prepare-keys.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5 +mkdir -p ~/.gnupg +cp "$GITHUB_WORKSPACE"/secring.gpg ~/.gnupg/secring.gpg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aee8d4ae..7ccabbff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,9 +17,11 @@ on: - "README.md" jobs: - release: - name: Release + build_linux: runs-on: ubuntu-latest + strategy: + matrix: + java: ['11', '17'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} @@ -27,13 +29,13 @@ jobs: PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + name: Build with Java ${{ matrix.java }} in Ubuntu steps: - uses: actions/checkout@v4 - - uses: fregante/setup-git-user@v2 - - name: Set up JDK 11 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - java-version: 11 + java-version: ${{ matrix.java }} distribution: 'zulu' java-package: jdk architecture: x64 @@ -42,100 +44,59 @@ jobs: server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - - name: Prepare PGP Keys -# if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release' - run: openssl aes-256-cbc -pass pass:$PGP_KEY_PASSWORD -in ./.ci/secring.gpg.enc -out $GITHUB_WORKSPACE/secring.gpg -d -md md5 - env: - PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} + - name: Build with Maven + run: mvn -B -ff -ntp clean install - - name: Deploy Release -# if: github.ref == 'refs/heads/release' - run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DdryRun=true -Darguments=-DskipTests - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} - PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} -# build_linux: -# runs-on: ubuntu-latest -# strategy: -# matrix: -# java: ['11', '17'] -# env: -# JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" -# MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} -# MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} -# PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} -# PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} -# -# name: Build with Java ${{ matrix.java }} in Ubuntu -# steps: -# - uses: actions/checkout@v4 -# - name: Set up JDK ${{ matrix.java }} -# uses: actions/setup-java@v4 -# with: -# java-version: ${{ matrix.java }} -# distribution: 'zulu' -# java-package: jdk -# architecture: x64 -# cache: 'maven' -# server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml -# server-username: MAVEN_USERNAME -# server-password: MAVEN_PASSWORD -# -# - name: Build with Maven -# run: mvn -B -ff -ntp clean install -# -# - name: Publish Code Coverage -# if: github.ref == 'refs/heads/main' && matrix.java == '11' -# uses: codecov/codecov-action@v3 -# with: -# token: ${{ secrets.CODECOV_TOKEN }} -# flags: unittests -# name: codecov-umbrella -# -# build_macos: -# runs-on: macos-latest -# strategy: -# matrix: -# java: [ '11', '17' ] -# env: -# JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" -# -# name: Build with Java ${{ matrix.java }} in MacOS -# steps: -# - uses: actions/checkout@v4 -# - name: Set up JDK ${{ matrix.java }} -# uses: actions/setup-java@v4 -# with: -# java-version: ${{ matrix.java }} -# distribution: 'zulu' -# java-package: jdk -# architecture: x64 -# cache: 'maven' -# -# - name: Build with Maven -# run: mvn -B -ff -ntp clean install -# -# build_windows: -# runs-on: windows-latest -# strategy: -# matrix: -# java: [ '11', '17' ] -# env: -# JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" -# -# name: Build with Java ${{ matrix.java }} in Windows -# steps: -# - uses: actions/checkout@v4 -# - name: Set up JDK ${{ matrix.java }} -# uses: actions/setup-java@v4 -# with: -# java-version: ${{ matrix.java }} -# distribution: 'zulu' -# java-package: jdk -# architecture: x64 -# cache: 'maven' -# -# - name: Build with Maven -# run: mvn -B -ff -ntp clean install + - name: Publish Code Coverage + if: github.ref == 'refs/heads/main' && matrix.java == '11' + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + flags: unittests + name: codecov-umbrella + + build_macos: + runs-on: macos-latest + strategy: + matrix: + java: [ '11', '17' ] + env: + JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" + + name: Build with Java ${{ matrix.java }} in MacOS + steps: + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'zulu' + java-package: jdk + architecture: x64 + cache: 'maven' + + - name: Build with Maven + run: mvn -B -ff -ntp clean install + + build_windows: + runs-on: windows-latest + strategy: + matrix: + java: [ '11', '17' ] + env: + JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" + + name: Build with Java ${{ matrix.java }} in Windows + steps: + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'zulu' + java-package: jdk + architecture: x64 + cache: 'maven' + + - name: Build with Maven + run: mvn -B -ff -ntp clean install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1213766..52bd2ef2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,13 +38,16 @@ jobs: - name: Prepare PGP Keys if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release' - run: openssl aes-256-cbc -pass pass:$PGP_KEY_PASSWORD -in ./.ci/secring.gpg.enc -out $GITHUB_WORKSPACE/secring.gpg -d -md md5 + run: | + chmod +x ./.ci/prepare-keys.sh + ./.ci/prepare-keys.sh + shell: bash env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: github.ref == 'refs/heads/release' - run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests -DdryRun=true + if: github.ref == 'refs/heads/release' && !contains(github.event.head_commit.message, '[ci release]') + run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 5488fe8f..80a6eb2b 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -38,7 +38,10 @@ jobs: - name: Prepare PGP Keys if: github.ref == 'refs/heads/develop' - run: openssl aes-256-cbc -pass pass:$PGP_KEY_PASSWORD -in ./.ci/secring.gpg.enc -out $GITHUB_WORKSPACE/secring.gpg -d -md md5 + run: | + chmod +x ./.ci/prepare-keys.sh + ./.ci/prepare-keys.sh + shell: bash env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index bd45aa4b..6c4fdd95 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -74,6 +74,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml index 3dfacb1a..601edc7c 100644 --- a/nitrite-jackson-mapper/pom.xml +++ b/nitrite-jackson-mapper/pom.xml @@ -135,6 +135,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml index 95c76663..e84dffa3 100644 --- a/nitrite-mvstore-adapter/pom.xml +++ b/nitrite-mvstore-adapter/pom.xml @@ -173,6 +173,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml index 44bf38bd..a28f222a 100644 --- a/nitrite-rocksdb-adapter/pom.xml +++ b/nitrite-rocksdb-adapter/pom.xml @@ -171,6 +171,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml index f5407dbf..b658bd42 100644 --- a/nitrite-spatial/pom.xml +++ b/nitrite-spatial/pom.xml @@ -106,6 +106,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml index b5f50e5c..1daa4646 100644 --- a/nitrite-support/pom.xml +++ b/nitrite-support/pom.xml @@ -114,6 +114,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/nitrite/pom.xml b/nitrite/pom.xml index 5250adb5..6f5490de 100644 --- a/nitrite/pom.xml +++ b/nitrite/pom.xml @@ -209,6 +209,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/pom.xml b/pom.xml index 24c34b1e..8bc4f6eb 100644 --- a/pom.xml +++ b/pom.xml @@ -499,11 +499,12 @@ ${maven-release-plugin.version} v@{project.version} - [ci skip] + [ci release] true release false ${project.version} + deploy diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml index e567f74e..4cece6d7 100644 --- a/potassium-nitrite/pom.xml +++ b/potassium-nitrite/pom.xml @@ -147,6 +147,10 @@ org.apache.maven.plugins maven-release-plugin + + org.sonatype.plugins + nexus-staging-maven-plugin + From d6db08238496a7af19a5b6c2ca729612ed18e667 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Thu, 4 Jan 2024 22:07:53 +0530 Subject: [PATCH 14/32] update workflow file --- .github/workflows/release.yml | 3 +-- .github/workflows/snapshot.yml | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52bd2ef2..a1a607f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,6 @@ jobs: server-password: MAVEN_PASSWORD - name: Prepare PGP Keys - if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release' run: | chmod +x ./.ci/prepare-keys.sh ./.ci/prepare-keys.sh @@ -46,7 +45,7 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: github.ref == 'refs/heads/release' && !contains(github.event.head_commit.message, '[ci release]') + if: !contains(github.event.head_commit.message, '[ci release]') run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 80a6eb2b..d2f30946 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -37,7 +37,6 @@ jobs: server-password: MAVEN_PASSWORD - name: Prepare PGP Keys - if: github.ref == 'refs/heads/develop' run: | chmod +x ./.ci/prepare-keys.sh ./.ci/prepare-keys.sh @@ -46,7 +45,6 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Snapshot - if: github.ref == 'refs/heads/develop' run: mvn -B -ff -ntp deploy -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} From 1cfd6667cf37fed88e78bfbbe9916caeeca89e3d Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Thu, 4 Jan 2024 22:11:08 +0530 Subject: [PATCH 15/32] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1a607f9..f04b842a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: !contains(github.event.head_commit.message, '[ci release]') + if: "!contains(github.event.head_commit.message, '[ci release]')" run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} From 1f004b5725c54fa0bf4f0bf165cc34965d7f0aae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:12:47 +0530 Subject: [PATCH 16/32] Bump com.google.errorprone:error_prone_core from 2.24.0 to 2.24.1 (#888) Bumps [com.google.errorprone:error_prone_core](https://github.com/google/error-prone) from 2.24.0 to 2.24.1. - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.24.0...v2.24.1) --- updated-dependencies: - dependency-name: com.google.errorprone:error_prone_core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8bc4f6eb..7b26e261 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 33.0.0-jre 1.6.8 - 2.24.0 + 2.24.1 0.8.11 3.2.3 3.12.1 From 5acb37ef5fb5c29e6af3e86f30ff29d95b8b3181 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Thu, 4 Jan 2024 23:22:12 +0530 Subject: [PATCH 17/32] prepare key command changed --- .ci/prepare-keys.sh | 5 ----- .github/workflows/release.yml | 5 +++-- .github/workflows/snapshot.yml | 5 +++-- 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 .ci/prepare-keys.sh diff --git a/.ci/prepare-keys.sh b/.ci/prepare-keys.sh deleted file mode 100644 index e1290324..00000000 --- a/.ci/prepare-keys.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5 -mkdir -p ~/.gnupg -cp "$GITHUB_WORKSPACE"/secring.gpg ~/.gnupg/secring.gpg diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f04b842a..bedf5649 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,9 @@ jobs: - name: Prepare PGP Keys run: | - chmod +x ./.ci/prepare-keys.sh - ./.ci/prepare-keys.sh + openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5 + mkdir -p "$HOME"/.gnupg + cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg shell: bash env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index d2f30946..db34764e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -38,8 +38,9 @@ jobs: - name: Prepare PGP Keys run: | - chmod +x ./.ci/prepare-keys.sh - ./.ci/prepare-keys.sh + openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5 + mkdir -p "$HOME"/.gnupg + cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg shell: bash env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} From 47a9fd987905a0fad5448faba71ee400d4a4f455 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 10:29:25 +0530 Subject: [PATCH 18/32] Update release.yml --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bedf5649..56f7e874 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,8 +46,7 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - if: "!contains(github.event.head_commit.message, '[ci release]')" - run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests + run: mvn -B -ff -ntp deploy -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} From 93b5dd8f65c4940199c7d031efcd4522fe87b109 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 10:31:21 +0530 Subject: [PATCH 19/32] 4.2.0 release --- CHANGELOG.md | 2 +- nitrite-bom/pom.xml | 2 +- nitrite-jackson-mapper/pom.xml | 2 +- nitrite-mvstore-adapter/pom.xml | 2 +- nitrite-rocksdb-adapter/pom.xml | 2 +- nitrite-spatial/pom.xml | 2 +- nitrite-support/pom.xml | 2 +- nitrite/pom.xml | 2 +- pom.xml | 2 +- potassium-nitrite/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86c0b1d5..24d1e532 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Release 4.2.0 - Jan 4, 2024 +## Release 4.2.0 - Jan 5, 2024 ### New Changes diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index 6c4fdd95..b3e66764 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-bom diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml index 601edc7c..7258bfd1 100644 --- a/nitrite-jackson-mapper/pom.xml +++ b/nitrite-jackson-mapper/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-jackson-mapper diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml index e84dffa3..ad98b52d 100644 --- a/nitrite-mvstore-adapter/pom.xml +++ b/nitrite-mvstore-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-mvstore-adapter diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml index a28f222a..aaca4d01 100644 --- a/nitrite-rocksdb-adapter/pom.xml +++ b/nitrite-rocksdb-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-rocksdb-adapter diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml index b658bd42..42ebbfa3 100644 --- a/nitrite-spatial/pom.xml +++ b/nitrite-spatial/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-spatial diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml index 1daa4646..aa0b63e4 100644 --- a/nitrite-support/pom.xml +++ b/nitrite-support/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite-support diff --git a/nitrite/pom.xml b/nitrite/pom.xml index 6f5490de..618dc782 100644 --- a/nitrite/pom.xml +++ b/nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 nitrite diff --git a/pom.xml b/pom.xml index 7b26e261..e874402a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 pom Nitrite Database diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml index 4cece6d7..6e7e876b 100644 --- a/potassium-nitrite/pom.xml +++ b/potassium-nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0-SNAPSHOT + 4.2.0 potassium-nitrite From 0e5a0cbc4e10464c6225e275bbb0182171186477 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 10:47:42 +0530 Subject: [PATCH 20/32] removed release plugin --- nitrite-bom/pom.xml | 2 +- nitrite-jackson-mapper/pom.xml | 8 ++++---- nitrite-mvstore-adapter/pom.xml | 2 +- nitrite-rocksdb-adapter/pom.xml | 2 +- nitrite-spatial/pom.xml | 2 +- nitrite-support/pom.xml | 2 +- nitrite/pom.xml | 8 ++++---- pom.xml | 21 +++------------------ potassium-nitrite/pom.xml | 2 +- 9 files changed, 17 insertions(+), 32 deletions(-) diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index b3e66764..a983d559 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -72,7 +72,7 @@ org.apache.maven.plugins - maven-release-plugin + maven-gpg-plugin org.sonatype.plugins diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml index 7258bfd1..c59369cb 100644 --- a/nitrite-jackson-mapper/pom.xml +++ b/nitrite-jackson-mapper/pom.xml @@ -128,12 +128,12 @@ maven-source-plugin - org.codehaus.mojo - animal-sniffer-maven-plugin + org.apache.maven.plugins + maven-gpg-plugin - org.apache.maven.plugins - maven-release-plugin + org.codehaus.mojo + animal-sniffer-maven-plugin org.sonatype.plugins diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml index ad98b52d..dddb2557 100644 --- a/nitrite-mvstore-adapter/pom.xml +++ b/nitrite-mvstore-adapter/pom.xml @@ -171,7 +171,7 @@ org.apache.maven.plugins - maven-release-plugin + maven-gpg-plugin org.sonatype.plugins diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml index aaca4d01..e57c2019 100644 --- a/nitrite-rocksdb-adapter/pom.xml +++ b/nitrite-rocksdb-adapter/pom.xml @@ -169,7 +169,7 @@ org.apache.maven.plugins - maven-release-plugin + maven-gpg-plugin org.sonatype.plugins diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml index 42ebbfa3..543e8762 100644 --- a/nitrite-spatial/pom.xml +++ b/nitrite-spatial/pom.xml @@ -104,7 +104,7 @@ org.apache.maven.plugins - maven-release-plugin + maven-gpg-plugin org.sonatype.plugins diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml index aa0b63e4..e0afdd7f 100644 --- a/nitrite-support/pom.xml +++ b/nitrite-support/pom.xml @@ -112,7 +112,7 @@ org.apache.maven.plugins - maven-release-plugin + maven-gpg-plugin org.sonatype.plugins diff --git a/nitrite/pom.xml b/nitrite/pom.xml index 618dc782..d7c6f765 100644 --- a/nitrite/pom.xml +++ b/nitrite/pom.xml @@ -202,12 +202,12 @@ maven-source-plugin - org.codehaus.mojo - animal-sniffer-maven-plugin + org.apache.maven.plugins + maven-gpg-plugin - org.apache.maven.plugins - maven-release-plugin + org.codehaus.mojo + animal-sniffer-maven-plugin org.sonatype.plugins diff --git a/pom.xml b/pom.xml index e874402a..13d66101 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,6 @@ 1.9.10 1.23 7.0_r2 - 3.0.1 1.6.13 3.1.0 @@ -493,20 +492,6 @@ - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - v@{project.version} - [ci release] - true - release - false - ${project.version} - deploy - - org.sonatype.plugins nexus-staging-maven-plugin @@ -514,7 +499,7 @@ true ossrh - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ true @@ -526,13 +511,13 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots ossrh Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml index 6e7e876b..ef3587f9 100644 --- a/potassium-nitrite/pom.xml +++ b/potassium-nitrite/pom.xml @@ -145,7 +145,7 @@ org.apache.maven.plugins - maven-release-plugin + maven-gpg-plugin org.sonatype.plugins From ffcf79fc53011637195fab3397a0960fe6828d7c Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 11:01:06 +0530 Subject: [PATCH 21/32] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ccabbff..d46c09ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: server-password: MAVEN_PASSWORD - name: Build with Maven - run: mvn -B -ff -ntp clean install + run: mvn -B -ff -ntp clean install -Dgpg.skip=true - name: Publish Code Coverage if: github.ref == 'refs/heads/main' && matrix.java == '11' @@ -76,7 +76,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install + run: mvn -B -ff -ntp clean install -Dgpg.skip=true build_windows: runs-on: windows-latest @@ -99,4 +99,4 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install + run: mvn -B -ff -ntp clean install -Dgpg.skip=true From 53b256dc5a350e65b48da84f691b8a26f1d43052 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 11:55:40 +0530 Subject: [PATCH 22/32] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d46c09ce..c7178e57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,4 +99,4 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install -Dgpg.skip=true + run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true From ce445627751c90f421a5810ad3d77978061678ed Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 13:25:16 +0530 Subject: [PATCH 23/32] Update pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 13d66101..79751e8b 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ true ossrh - https://s01.oss.sonatype.org/ + https://oss.sonatype.org/ true @@ -511,13 +511,13 @@ ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + https://oss.sonatype.org/content/repositories/snapshots ossrh Nexus Release Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + https://oss.sonatype.org/service/local/staging/deploy/maven2/ From 77cfe1b1977581fa94d9230637f42c7e620d624f Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 21:27:18 +0530 Subject: [PATCH 24/32] testing gpg sign --- .github/workflows/build.yml | 6 +-- .../no2/collection/DocumentCursor.java | 1 + .../no2/collection/events/EventAware.java | 2 +- .../dizitart/no2/common/meta/Attributes.java | 2 +- pom.xml | 45 +------------------ 5 files changed, 8 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7178e57..30db4772 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: server-password: MAVEN_PASSWORD - name: Build with Maven - run: mvn -B -ff -ntp clean install -Dgpg.skip=true + run: mvn -B -ff -ntp clean install -Dgpg.skip=true -DskipTests - name: Publish Code Coverage if: github.ref == 'refs/heads/main' && matrix.java == '11' @@ -76,7 +76,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install -Dgpg.skip=true + run: mvn -B -ff -ntp clean install -Dgpg.skip=true -DskipTests build_windows: runs-on: windows-latest @@ -99,4 +99,4 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true + run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true -DskipTests diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/DocumentCursor.java b/nitrite/src/main/java/org/dizitart/no2/collection/DocumentCursor.java index b2bfc01e..b8db51cc 100644 --- a/nitrite/src/main/java/org/dizitart/no2/collection/DocumentCursor.java +++ b/nitrite/src/main/java/org/dizitart/no2/collection/DocumentCursor.java @@ -30,6 +30,7 @@ * for (Document doc : result) { * // use your logic with the retrieved doc here * } + * } * * * @author Anindya Chatterjee diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/events/EventAware.java b/nitrite/src/main/java/org/dizitart/no2/collection/events/EventAware.java index 038358db..cf693486 100644 --- a/nitrite/src/main/java/org/dizitart/no2/collection/events/EventAware.java +++ b/nitrite/src/main/java/org/dizitart/no2/collection/events/EventAware.java @@ -17,7 +17,7 @@ package org.dizitart.no2.collection.events; /** - * An interface to make a {@link NitriteCollection} or {@link ObjectRepository} + * An interface to make a {@link org.dizitart.no2.collection.NitriteCollection} or {@link org.dizitart.no2.repository.ObjectRepository} * event aware. * * @since 4.0 diff --git a/nitrite/src/main/java/org/dizitart/no2/common/meta/Attributes.java b/nitrite/src/main/java/org/dizitart/no2/common/meta/Attributes.java index a00d8df5..fe3d14be 100644 --- a/nitrite/src/main/java/org/dizitart/no2/common/meta/Attributes.java +++ b/nitrite/src/main/java/org/dizitart/no2/common/meta/Attributes.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; /** - * Represents metadata attributes of a {@link NitriteMap}. + * Represents metadata attributes of a {@link org.dizitart.no2.store.NitriteMap}. * * @author Anindya Chatterjee * @since 1.0 diff --git a/pom.xml b/pom.xml index 79751e8b..b8095cd1 100644 --- a/pom.xml +++ b/pom.xml @@ -483,8 +483,10 @@ sign + true + --batch --pinentry-mode loopback @@ -531,47 +533,4 @@ - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://oss.sonatype.org/ - true - true - - - - - - - From 7d3ccf7d6fe823e458d352d3b10679a4ee6ceb3c Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 21:54:35 +0530 Subject: [PATCH 25/32] update gpg plugin --- pom.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index b8095cd1..89a4452a 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 1.23 7.0_r2 1.6.13 - 3.1.0 + 1.6 @@ -482,15 +482,6 @@ sign - - true - - - --batch - --pinentry-mode - loopback - - From 1bd1074b4a6776298c284ebaf7d89b31aa5d96e2 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 22:05:26 +0530 Subject: [PATCH 26/32] gpg fix --- .github/dependabot.yml | 2 ++ .github/workflows/release.yml | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7239c0b1..8e4dc933 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,8 @@ updates: schedule: interval: daily target-branch: main + ignore: + - dependency-name: "org.apache.maven.plugins:maven-gpg-plugin" - package-ecosystem: "github-actions" directory: "/" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56f7e874..ee72b557 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,10 @@ jobs: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - run: mvn -B -ff -ntp deploy -DskipTests + run: | + export GPG_TTY=$(tty) + mvn -B -ff -ntp deploy -DskipTests + shell: bash env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} From 40dfd18f32133c93795ebe4266efbca27a1f1e59 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 22:33:29 +0530 Subject: [PATCH 27/32] added gpg config --- .github/workflows/release.yml | 2 +- pom.xml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee72b557..96e63d9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: - name: Deploy Release run: | - export GPG_TTY=$(tty) + export GPG_TTY=`tty` mvn -B -ff -ntp deploy -DskipTests shell: bash env: diff --git a/pom.xml b/pom.xml index 89a4452a..f1b205be 100644 --- a/pom.xml +++ b/pom.xml @@ -482,6 +482,13 @@ sign + + + --batch + --pinentry-mode + loopback + + From 52381dfaa91e5f8ab54055b1c4f42f58f29bf11d Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 5 Jan 2024 22:40:55 +0530 Subject: [PATCH 28/32] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1b205be..a8199ae4 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,6 @@ - --batch --pinentry-mode loopback From 00c8448a22d953839df7c67552b09fc7bcbf9820 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Sat, 6 Jan 2024 15:59:54 +0530 Subject: [PATCH 29/32] fixing gpg signing issue --- .github/dependabot.yml | 2 -- .github/workflows/release.yml | 8 ++++---- .github/workflows/snapshot.yml | 7 +++++-- CHANGELOG.md | 2 +- pom.xml | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e4dc933..7239c0b1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,8 +5,6 @@ updates: schedule: interval: daily target-branch: main - ignore: - - dependency-name: "org.apache.maven.plugins:maven-gpg-plugin" - package-ecosystem: "github-actions" directory: "/" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96e63d9c..272ebba5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,17 +41,17 @@ jobs: openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5 mkdir -p "$HOME"/.gnupg cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg + echo "allow-loopback-pinentry" >> "$HOME"/.gnupg/gpg-agent.conf + echo "pinentry-mode loopback" >> "$HOME"/.gnupg/gpg.conf + gpgconf --reload gpg-agent shell: bash env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Release - run: | - export GPG_TTY=`tty` - mvn -B -ff -ntp deploy -DskipTests + run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD" shell: bash env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index db34764e..2299bf00 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -41,14 +41,17 @@ jobs: openssl aes-256-cbc -pass pass:"$PGP_KEY_PASSWORD" -in "$GITHUB_WORKSPACE"/.ci/secring.gpg.enc -out "$GITHUB_WORKSPACE"/secring.gpg -d -md md5 mkdir -p "$HOME"/.gnupg cp "$GITHUB_WORKSPACE"/secring.gpg "$HOME"/.gnupg/secring.gpg + echo "allow-loopback-pinentry" >> "$HOME"/.gnupg/gpg-agent.conf + echo "pinentry-mode loopback" >> "$HOME"/.gnupg/gpg.conf + gpgconf --reload gpg-agent shell: bash env: PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} - name: Deploy Snapshot - run: mvn -B -ff -ntp deploy -DskipTests + run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD" + shell: bash env: MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 24d1e532..2df34372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Release 4.2.0 - Jan 5, 2024 +## Release 4.2.0 - Jan 6, 2024 ### New Changes diff --git a/pom.xml b/pom.xml index a8199ae4..a8ae0844 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 1.23 7.0_r2 1.6.13 - 1.6 + 3.1.0 From 86ab638e0a6c0ec202a0915682eae3028bb57476 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Sat, 6 Jan 2024 16:40:10 +0530 Subject: [PATCH 30/32] resolving dokka issue --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8ae0844..99c56f89 100644 --- a/pom.xml +++ b/pom.xml @@ -464,9 +464,11 @@ ${dokka.version} - pre-site + prepare-package dokka + javadoc + javadocJar From 1657b1d36ae8aa907a96ba1047918ce07a234494 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Sat, 6 Jan 2024 17:26:00 +0530 Subject: [PATCH 31/32] parent pom fix --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 99c56f89..92e69eb0 100644 --- a/pom.xml +++ b/pom.xml @@ -506,6 +506,17 @@ + + + + org.apache.maven.plugins + maven-gpg-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + From 87793b1fca32c171c4a4666200bf28fbc34a5661 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Sat, 6 Jan 2024 17:39:34 +0530 Subject: [PATCH 32/32] version bumped to 4.2.1-SNAPSHOT --- .github/workflows/build.yml | 13 +++---------- nitrite-bom/pom.xml | 2 +- nitrite-jackson-mapper/pom.xml | 2 +- nitrite-mvstore-adapter/pom.xml | 2 +- nitrite-rocksdb-adapter/pom.xml | 2 +- nitrite-spatial/pom.xml | 2 +- nitrite-support/pom.xml | 2 +- nitrite/pom.xml | 2 +- pom.xml | 2 +- potassium-nitrite/pom.xml | 2 +- 10 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30db4772..01c6fc29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,6 @@ jobs: java: ['11', '17'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" - MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_KEY_ID: ${{ secrets.PGP_KEY_ID }} - PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }} name: Build with Java ${{ matrix.java }} in Ubuntu steps: @@ -40,12 +36,9 @@ jobs: java-package: jdk architecture: x64 cache: 'maven' - server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - name: Build with Maven - run: mvn -B -ff -ntp clean install -Dgpg.skip=true -DskipTests + run: mvn -B -ff -ntp clean install -Dgpg.skip=true - name: Publish Code Coverage if: github.ref == 'refs/heads/main' && matrix.java == '11' @@ -76,7 +69,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install -Dgpg.skip=true -DskipTests + run: mvn -B -ff -ntp clean install -Dgpg.skip=true build_windows: runs-on: windows-latest @@ -99,4 +92,4 @@ jobs: cache: 'maven' - name: Build with Maven - run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true -DskipTests + run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml index a983d559..99255161 100644 --- a/nitrite-bom/pom.xml +++ b/nitrite-bom/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite-bom diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml index c59369cb..19eac32a 100644 --- a/nitrite-jackson-mapper/pom.xml +++ b/nitrite-jackson-mapper/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite-jackson-mapper diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml index dddb2557..7dd883ce 100644 --- a/nitrite-mvstore-adapter/pom.xml +++ b/nitrite-mvstore-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite-mvstore-adapter diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml index e57c2019..97bf2ff2 100644 --- a/nitrite-rocksdb-adapter/pom.xml +++ b/nitrite-rocksdb-adapter/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite-rocksdb-adapter diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml index 543e8762..eabd9e15 100644 --- a/nitrite-spatial/pom.xml +++ b/nitrite-spatial/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite-spatial diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml index e0afdd7f..62105d19 100644 --- a/nitrite-support/pom.xml +++ b/nitrite-support/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite-support diff --git a/nitrite/pom.xml b/nitrite/pom.xml index d7c6f765..923641bf 100644 --- a/nitrite/pom.xml +++ b/nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT nitrite diff --git a/pom.xml b/pom.xml index 92e69eb0..d052dea8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT pom Nitrite Database diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml index ef3587f9..2ec6ed0a 100644 --- a/potassium-nitrite/pom.xml +++ b/potassium-nitrite/pom.xml @@ -4,7 +4,7 @@ org.dizitart nitrite-java - 4.2.0 + 4.2.1-SNAPSHOT potassium-nitrite