From 9ad213bd74e9cfc2973eeaf7c0a0e378062a9def Mon Sep 17 00:00:00 2001
From: Leo Gertsenshteyn <146586+leoger@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:27:12 -0800
Subject: [PATCH 1/4] POM changes to simplify build for contributors.

---
 nitrite-bom/pom.xml             | 13 -------------
 nitrite-jackson-mapper/pom.xml  |  8 --------
 nitrite-mvstore-adapter/pom.xml |  8 --------
 nitrite-rocksdb-adapter/pom.xml |  8 --------
 nitrite-spatial/pom.xml         |  4 ----
 nitrite-support/pom.xml         |  8 --------
 nitrite/pom.xml                 |  8 --------
 pom.xml                         | 34 ++++++++++++++++++++++-----------
 potassium-nitrite/pom.xml       |  8 --------
 9 files changed, 23 insertions(+), 76 deletions(-)

diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml
index c2cdf4bf1..2c9db54b0 100644
--- a/nitrite-bom/pom.xml
+++ b/nitrite-bom/pom.xml
@@ -67,17 +67,4 @@
             <snapshots><enabled>true</enabled></snapshots>
         </repository>
     </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml
index 8b2d741e2..7c6f7a3d4 100644
--- a/nitrite-jackson-mapper/pom.xml
+++ b/nitrite-jackson-mapper/pom.xml
@@ -132,18 +132,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml
index 6fce262f2..eceb5d4a6 100644
--- a/nitrite-mvstore-adapter/pom.xml
+++ b/nitrite-mvstore-adapter/pom.xml
@@ -174,14 +174,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml
index b011bc0f8..edd368ff8 100644
--- a/nitrite-rocksdb-adapter/pom.xml
+++ b/nitrite-rocksdb-adapter/pom.xml
@@ -172,14 +172,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml
index 2f5e77258..ef4c1b87a 100644
--- a/nitrite-spatial/pom.xml
+++ b/nitrite-spatial/pom.xml
@@ -117,10 +117,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml
index 4d3c3ace4..0c0229022 100644
--- a/nitrite-support/pom.xml
+++ b/nitrite-support/pom.xml
@@ -125,14 +125,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite/pom.xml b/nitrite/pom.xml
index aa5159c51..d8cdee59c 100644
--- a/nitrite/pom.xml
+++ b/nitrite/pom.xml
@@ -206,18 +206,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 088c2e3dd..35007ab1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -522,19 +522,31 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+            <activation>
+                <!-- "true" to maintain existing behavior until CI jobs, etc. add "-P release" to the mvn args -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+
+    </profiles>
+
     <distributionManagement>
         <!-- Repository for snapshots -->
         <snapshotRepository>
diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml
index 3432c9408..2e596b546 100644
--- a/potassium-nitrite/pom.xml
+++ b/potassium-nitrite/pom.xml
@@ -162,14 +162,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

From 81aae5ba1f95c0a26bfbf2d2a6b937aafe4c888b Mon Sep 17 00:00:00 2001
From: Leo Gertsenshteyn <146586+leoger@users.noreply.github.com>
Date: Fri, 6 Dec 2024 23:14:13 -0800
Subject: [PATCH 2/4] Fix error-prone plugin to maintain JDK 11 buildability

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 35007ab1b..6e5fee8dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,9 @@
         <guava.version>33.3.1-jre</guava.version>
         <threetenbp.version>1.7.0</threetenbp.version>
 
-        <error-prone.version>2.36.0</error-prone.version>
+        <!-- Error Prone version > 2.31.0 can't run on JDK 11. see https://errorprone.info/docs/installation -->
+        <error-prone.version>2.31.0</error-prone.version>
+
         <jacoco.version>0.8.12</jacoco.version>
         <surefire.version>3.5.2</surefire.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>

From eab17b59a5e039e5023b1edda8196b25be72888a Mon Sep 17 00:00:00 2001
From: Leo Gertsenshteyn <146586+leoger@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:05:18 -0800
Subject: [PATCH 3/4] use the 'deploy' profile in Github Workflows

---
 .github/workflows/build.yml    | 8 ++++----
 .github/workflows/release.yml  | 2 +-
 .github/workflows/snapshot.yml | 2 +-
 pom.xml                        | 6 +-----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 45fe502e1..3dfd8f6f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,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
 
       - name: Publish Code Coverage
         if: github.ref == 'refs/heads/main' && matrix.java == '11'
@@ -70,7 +70,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
 
   build_windows:
     runs-on: windows-latest
@@ -93,7 +93,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 --%
 
   verify-native:
     name: Verify GraalVM ${{ matrix.java }} compatibility on ${{ matrix.os }}
@@ -111,7 +111,7 @@ jobs:
           distribution: 'graalvm-community'
 
       - name: Install nitrite
-        run: mvn -B -ff -ntp clean install "-Dgpg.skip=true" -DskipTests
+        run: mvn -B -ff -ntp clean install -DskipTests
 
       - name: Run native tests
         working-directory: ./nitrite-native-tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index edb94a0e1..be006b808 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Release
-        run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
+        run: mvn -P deploy -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
         shell: bash
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 2e4bab890..ddcdc1b87 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -51,7 +51,7 @@ jobs:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Snapshot
-        run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
+        run: mvn -P deploy -B -ff -ntp  deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
         shell: bash
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
diff --git a/pom.xml b/pom.xml
index 6e5fee8dd..197e4cacc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,7 +528,7 @@
 
     <profiles>
         <profile>
-            <id>release</id>
+            <id>deploy</id>
             <build>
                 <plugins>
                     <plugin>
@@ -541,10 +541,6 @@
                     </plugin>
                 </plugins>
             </build>
-            <activation>
-                <!-- "true" to maintain existing behavior until CI jobs, etc. add "-P release" to the mvn args -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
 
     </profiles>

From 578979b5b48f235942c1d6e17c8c886ad2e4d58a Mon Sep 17 00:00:00 2001
From: Leo Gertsenshteyn <146586+leoger@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:36:22 -0800
Subject: [PATCH 4/4] Update .github/workflows/build.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .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 3dfd8f6f9..f33f83acc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -B -ff -ntp clean install --%
+        run: mvn -B -ff -ntp clean install
 
   verify-native:
     name: Verify GraalVM ${{ matrix.java }} compatibility on ${{ matrix.os }}