Skip to content

Commit f6ac473

Browse files
philliprossphillipross
authored
Updates (#128)
- remove reporting output encoding properties from pom.xml file - update minimum maven requirement from v3.6 to v3.8 - update test container image from postgis v15-3.3-alpine to v16-3.4-alpine - build-helper-maven-plugin updated from v3.3.0 to v3.5.0 - download-maven-plugin updated from v1.6.8 to v1.7.1 - exec-maven-plugin updated from v3.1.0 to v3.1.1 - jacoco-maven-plugin updated from v0.8.8 to v0.8.11 - maven-assembly-plugin updated from v3.4.2 to v3.6.0 - maven-checkstyle-plugin updated from v3.2.0 to v3.3.1 - maven-clean-plugin updated from v3.2.0 to v3.3.2 - maven-compiler-plugin updated from v3.10.1 to v3.11.0 - maven-dependency-plugin updated from v3.4.0 to v3.6.1 - maven-deploy-plugin updated from v3.0.0 to v3.1.1 - maven-enforcer-plugin updated from v3.1.0 to v3.4.1 - maven-failsafe-plugin updated from v2.22.2 to v3.2.2 - maven-gpg-plugin updated from v3.0.1 to v3.1.0 - maven-install-plugin updated from v3.1.0 to v3.1.1 - maven-javadoc-plugin updated from v3.4.1 to v3.6.3 - maven-jxr-plugin updated from v3.3.0 to v3.3.1 - maven-pmd-plugin updated from v3.19.0 to v3.21.2 - maven-project-info-reports-plugin updated from v3.4.1 to v3.5.0 - maven-release-plugin updated from v2.5.3 to v3.0.1 - maven-resources-plugin updated from v3.3.0 to v3.3.1 - maven-shade-plugin updated from v3.4.1 to v3.5.1 - maven-source-plugin updated from v3.2.1 to v3.3.0 - maven-surefire-plugin updated from v2.22.2 to v3.2.2 - maven-surefire-report-plugin updated from v2.22.2 to v3.2.2 - maven-war-plugin updated from v3.3.2 to v3.4.0 - spotbugs-maven-plugin updated from v4.7.3.0 to v4.8.2.0 - versions-maven-plugin updated from v2.14.1 to v2.16.2 - logback updated from v1.3.5 to v1.3.14 - pmd updated from v6.52.0 to v6.55.0 - postgresql-jdbc updated from v42.5.1 to v42.7.0 - slf4j updated from v2.0.6 to v2.0.9 - spotbugs updated from v4.7.3 to v4.8.2 - testcontainers updated from v1.17.6 to v1.19.3 - testng updated from v7.5 to v7.5.1 - CI maven updated from v3.8.6 to v3.9.6 - CI zulu updated from v8.0.352/v11.0.17/v17.0.5/v19.0.1 to v8.0.392, v11.0.21, v17.0.9, v21.0.1 Signed-off-by: Phillip Ross <[email protected]>
1 parent e3259ad commit f6ac473

File tree

5 files changed

+45
-111
lines changed

5 files changed

+45
-111
lines changed

‎.github/install-maven.sh‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/install-zulu11.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.github/install-zulu8.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-22.04]
14-
jdk_version: [8.0.352-zulu, 11.0.17-zulu, 17.0.5-zulu, 19.0.1-zulu]
15-
maven_version: [3.8.6]
14+
jdk_version: [8.0.392-zulu, 11.0.21-zulu, 17.0.9-zulu, 21.0.1-zulu]
15+
maven_version: [3.9.6]
1616
include:
1717
- os: ubuntu-22.04
18-
jdk_version: 8.0.352-zulu
19-
maven_version: 3.8.6
18+
jdk_version: 8.0.392-zulu
19+
zulu_version: 8.74.0.17
20+
maven_version: 3.9.6
2021
maven_deploy: true
2122
docker_build: true
23+
maven_docker_container_image_repo: luminositylabs
24+
maven_docker_container_image_name: maven
25+
maven_docker_container_image_tag: 3.9.6_openjdk-8u392_zulu-8.74.0.17
2226
name: Build on OS ${{ matrix.os }} with Maven ${{ matrix.maven_version }} using JDK ${{ matrix.jdk_version }}
2327
runs-on: ${{ matrix.os }}
2428
env:
@@ -89,9 +93,6 @@ jobs:
8993
- name: Docker maven build
9094
if: ${{ matrix.docker_build }}
9195
env:
92-
maven_docker_container_image_repo: luminositylabs
93-
maven_docker_container_image_name: maven
94-
maven_docker_container_image_tag: 3.8.6_openjdk-8u352_zulu-alpine-8.66.0.15
9596
CBD: /usr/src/build
9697
P: luminositylabs-oss
97-
run: docker container run --rm -i -v "$(pwd)":"${CBD}" -v ${HOME}/.gnupg:/root/.gnupg -v ${P}-${{ env.maven_docker_container_image_tag }}-mvn-repo:/root/.m2 -w "${CBD}" ${{ env.maven_docker_container_image_repo }}/${{ env.maven_docker_container_image_name }}:${{ env.maven_docker_container_image_tag }} mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} -Djavadoc.path=/usr/bin/javadoc -Dmaven.integration.test.skip=true dependency:list-repositories dependency:tree help:active-profiles clean install site site:stage
98+
run: docker container run --rm -i -v "$(pwd)":"${CBD}" -v ${HOME}/.gnupg:/root/.gnupg -v ${P}-${{ matrix.maven_docker_container_image_tag }}-mvn-repo:/root/.m2 -w "${CBD}" ${{ matrix.maven_docker_container_image_repo }}/${{ matrix.maven_docker_container_image_name }}:${{ matrix.maven_docker_container_image_tag }} mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} -Djavadoc.path=/usr/bin/javadoc -Dmaven.integration.test.skip=true dependency:list-repositories dependency:tree help:active-profiles clean install site site:stage

‎pom.xml‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@
9494

9595
<properties>
9696
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
97-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9897
<java.min.version>8</java.min.version>
99-
<maven.min.version>3.6</maven.min.version>
98+
<maven.min.version>3.8</maven.min.version>
10099
<maven.test.skip>false</maven.test.skip>
101100
<maven.integration.test.skip>false</maven.integration.test.skip>
102101
<failsafe.forkCount>1</failsafe.forkCount>
@@ -109,59 +108,59 @@
109108
<jxr.skip>false</jxr.skip>
110109
<pmd.skip>true</pmd.skip>
111110
<spotbugs.skip>true</spotbugs.skip>
112-
<test.container.image>postgis/postgis:15-3.3-alpine</test.container.image>
111+
<test.container.image>postgis/postgis:16-3.4-alpine</test.container.image>
113112
<test.db.username>postgis1</test.db.username>
114113
<test.db.password>postgis1</test.db.password>
115114
<test.db.name>postgis1</test.db.name>
116115
<test.db.port>5432</test.db.port>
117116
<!-- Plugin versioning -->
118-
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
117+
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
119118
<directory-maven-plugin.version>1.0</directory-maven-plugin.version>
120-
<download-maven-plugin.version>1.6.8</download-maven-plugin.version>
121-
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
119+
<download-maven-plugin.version>1.7.1</download-maven-plugin.version>
120+
<exec-maven-plugin.version>3.1.1</exec-maven-plugin.version>
122121
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
123-
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
122+
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
124123
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
125124
<maven-archetype-plugin.version>3.2.1</maven-archetype-plugin.version>
126-
<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
127-
<maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version>
128-
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
129-
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
130-
<maven-dependency-plugin.version>3.4.0</maven-dependency-plugin.version>
131-
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
125+
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
126+
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
127+
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
128+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
129+
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
130+
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
132131
<maven-ear-plugin.version>3.3.0</maven-ear-plugin.version>
133132
<maven-ejb-plugin.version>3.0.1</maven-ejb-plugin.version>
134-
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
135-
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
136-
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
137-
<maven-install-plugin.version>3.1.0</maven-install-plugin.version>
133+
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
134+
<maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
135+
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
136+
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
138137
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
139138
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
140-
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
141-
<maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
142-
<maven-pmd-plugin.version>3.19.0</maven-pmd-plugin.version>
143-
<maven-project-info-reports-plugin.version>3.4.1</maven-project-info-reports-plugin.version>
144-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
145-
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
146-
<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
139+
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
140+
<maven-jxr-plugin.version>3.3.1</maven-jxr-plugin.version>
141+
<maven-pmd-plugin.version>3.21.2</maven-pmd-plugin.version>
142+
<maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
143+
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
144+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
145+
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
147146
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
148-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
149-
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
150-
<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
151-
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
152-
<spotbugs-maven-plugin.version>4.7.3.0</spotbugs-maven-plugin.version>
153-
<versions-maven-plugin.version>2.14.1</versions-maven-plugin.version>
147+
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
148+
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
149+
<maven-surefire-report-plugin.version>3.2.2</maven-surefire-report-plugin.version>
150+
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
151+
<spotbugs-maven-plugin.version>4.8.2.0</spotbugs-maven-plugin.version>
152+
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
154153
<!-- Dependency versions -->
155154
<dependency.checkstyle.version>9.3</dependency.checkstyle.version>
156155
<dependency.jts-version.version>1.19.0</dependency.jts-version.version>
157-
<dependency.logback.version>1.3.5</dependency.logback.version>
158-
<dependency.pmd.version>6.52.0</dependency.pmd.version>
159-
<dependency.postgresql-jdbc.version>42.5.1</dependency.postgresql-jdbc.version>
160-
<dependency.slf4j.version>2.0.6</dependency.slf4j.version>
156+
<dependency.logback.version>1.3.14</dependency.logback.version>
157+
<dependency.pmd.version>6.55.0</dependency.pmd.version>
158+
<dependency.postgresql-jdbc.version>42.7.0</dependency.postgresql-jdbc.version>
159+
<dependency.slf4j.version>2.0.9</dependency.slf4j.version>
161160
<dependency.spatial4j.version>0.8</dependency.spatial4j.version>
162-
<dependency.spotbugs.version>4.7.3</dependency.spotbugs.version>
163-
<dependency.testcontainers.version>1.17.6</dependency.testcontainers.version>
164-
<dependency.testng.version>7.5</dependency.testng.version>
161+
<dependency.spotbugs.version>4.8.2</dependency.spotbugs.version>
162+
<dependency.testcontainers.version>1.19.3</dependency.testcontainers.version>
163+
<dependency.testng.version>7.5.1</dependency.testng.version>
165164
</properties>
166165

167166
<dependencyManagement>

0 commit comments

Comments
 (0)