Skip to content

Commit

Permalink
POM changes to fix build for contributors (#1083)
Browse files Browse the repository at this point in the history
* POM changes to simplify build for contributors.

* Fix error-prone plugin to maintain JDK 11 buildability

* use the 'deploy' profile in Github Workflows

* Update .github/workflows/build.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
  • Loading branch information
leoger and coderabbitai[bot] authored Dec 14, 2024
1 parent 82ab401 commit 1f98b39
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 83 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
13 changes: 0 additions & 13 deletions nitrite-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 0 additions & 8 deletions nitrite-jackson-mapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 0 additions & 8 deletions nitrite-mvstore-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 0 additions & 8 deletions nitrite-rocksdb-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions nitrite-spatial/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 0 additions & 8 deletions nitrite-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 0 additions & 8 deletions nitrite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
34 changes: 22 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -522,19 +524,27 @@
</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>deploy</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>
</profile>

</profiles>

<distributionManagement>
<!-- Repository for snapshots -->
<snapshotRepository>
Expand Down
8 changes: 0 additions & 8 deletions potassium-nitrite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 1f98b39

Please sign in to comment.