From 2be304128c3a1b69dea71d10f06fb5568c302065 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:48:35 -0400 Subject: [PATCH 1/7] - Disable Travis-CI --- .travis.yml => .travis.yml.disabled | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .travis.yml => .travis.yml.disabled (100%) diff --git a/.travis.yml b/.travis.yml.disabled similarity index 100% rename from .travis.yml rename to .travis.yml.disabled From 1b15a34cfa718c32980427a4e4538a4bb9e41448 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:14:59 -0400 Subject: [PATCH 2/7] - Update testcontainers from v1.13.0 to v1.15.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae293bf..faea2a5 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 42.2.11 1.7.30 0.7 - 1.13.0 + 1.15.3 6.14.3 From 67559cef1cf99db5ef897d365431edce48e4b749 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:47:10 -0400 Subject: [PATCH 3/7] - Update checkstyle from v8.31 to v8.42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index faea2a5..42b9e27 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 3.2.3 2.7 - 8.31 + 8.42 1.18.1 1.2.3 42.2.11 From 08b8f86347349195ec00712237853ea7538bf6e8 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:18:25 -0400 Subject: [PATCH 4/7] - Update postgis/postgis test container from v12-3.0-alpine to v13-3.1-alpine --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42b9e27..b3d54b5 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false 1 true - postgis/postgis:12-3.0-alpine + postgis/postgis:13-3.1-alpine postgis1 postgis1 postgis1 From be2c4c04db380534ae9235e563dea34041fe9348 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:54:17 -0400 Subject: [PATCH 5/7] - Added windows-javadoc maven profile --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index b3d54b5..5c9cb72 100644 --- a/pom.xml +++ b/pom.xml @@ -472,6 +472,18 @@ + + + windows-javadoc + + + windows + + + + ${java.home}/bin/javadoc.exe + + check-versions From 102681f9dcaf523e0526c02624361df1336e34b2 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:58:27 -0400 Subject: [PATCH 6/7] - Move sonatype distro management bock to dedicated profile and replace with local staging distro spec --- pom.xml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 5c9cb72..e903409 100644 --- a/pom.xml +++ b/pom.xml @@ -86,14 +86,10 @@ https://github.com/postgis/postgis-java/issues - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + + local-staging-site + http://local-staging/ + @@ -581,7 +577,20 @@ - + + sonatype-deployment + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + SkipUnitTests From 212cd11e24f813386475c8922a0be7ba86d96955 Mon Sep 17 00:00:00 2001 From: Phillip Ross Date: Wed, 26 May 2021 11:47:43 -0400 Subject: [PATCH 7/7] - Initial Github Actions setup --- .github/install-gpg.sh | 38 ++++++++++++++++++++++++ .github/install-maven.sh | 20 +++++++++++++ .github/install-zulu11.sh | 23 ++++++++++++++ .github/install-zulu8.sh | 23 ++++++++++++++ .github/settings.xml | 59 ++++++++++++++++++++++++++++++++++++ .github/workflows/main.yml | 61 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 224 insertions(+) create mode 100755 .github/install-gpg.sh create mode 100755 .github/install-maven.sh create mode 100755 .github/install-zulu11.sh create mode 100755 .github/install-zulu8.sh create mode 100644 .github/settings.xml create mode 100644 .github/workflows/main.yml diff --git a/.github/install-gpg.sh b/.github/install-gpg.sh new file mode 100755 index 0000000..b08a3d9 --- /dev/null +++ b/.github/install-gpg.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +set -euf + +sudo apt-get update +sudo apt-get install -y gnupg haveged + +rm -rf ~/.gnupg +gpg --list-keys + +cat >key-info < + + + ossrh + ${env.OSSRHU} + ${env.OSSRHT} + + + + + gpg + + test-key@postgis.net + + + + sonatype-snapshots + + + sonatype-snapshots + + true + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + + + sonatype-staging + + + sonatype-staging + + true + + sonatype-staging + https://oss.sonatype.org/content/groups/staging/ + + + + + sonatype-releases + + + sonatype-releases + + true + + sonatype-releases + https://oss.sonatype.org/content/groups/public/ + + + + + + diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..98de2c1 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,61 @@ +name: PostGIS Java CI + +on: [push, pull_request] + +defaults: + run: + shell: bash + +jobs: + build-codebase: + strategy: + matrix: + os: [ubuntu-20.04] + java_version: [8] + maven_version: [3.8.1] + name: Build on OS ${{ matrix.os }} with Maven ${{ matrix.maven_version }} using Zulu ${{ matrix.java_version }} + runs-on: ${{ matrix.os }} + env: + JAVA_HOME: /usr/lib/jvm/zulu${{ matrix.java_version }}-ca-amd64 + MAVEN_HOME: /usr/share/maven + MAVEN_PROPS: -Djavadoc.path=`which javadoc` + PROFILES: gpg,release-sign-artifacts,sonatype-deployment,sonatype-snapshots,sonatype-staging,sonatype-releases + SETTINGS: .github/settings.xml + + steps: + - name: Checkout Source + uses: actions/checkout@v2 + + - name: Install GPG and generate test key + run: .github/install-gpg.sh + + - name: Install Zulu OpenJDK + run: .github/install-zulu${{ matrix.java_version }}.sh + + - name: Install Maven + run: .github/install-maven.sh + + - name: Setup Maven repository cache + uses: actions/cache@v2 + env: + cache-name: m2repo + with: + path: ~/.m2/repository + key: ${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ env.cache-name }}- + + - name: Log github.ref + run: echo "${{ github.ref }}" + + - name: Show Maven dependency tree + run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} dependency:tree + + - name: Show Maven active profiles + run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} help:active-profiles + + - name: Show Maven effective POM + run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} help:effective-pom + + - name: Maven build/test + run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} clean install