Skip to content

Commit fe1cd90

Browse files
philliprossphillipross
committed
Build updates
- CI os updated from ubuntu-22.04 to ubuntu-24.04 - CI java updated from zulu 8.0.392/11.0.21/17.0.9/21.0.1 to 8.0.422/11.0.24/17.0.12/21.0.4 - CI maven updated from v3.9.6 to v3.9.8 - build-helper-maven-plugin updated from v3.5.0 to v3.6.0 - download-maven-plugin updated from v1.7.1 to v1.9.0 - exec-maven-plugin updated from v3.1.1 to v3.3.0 - jacoco-maven-plugin updated from v0.8.11 to v0.8.12 - maven-assembly-plugin updated from v3.6.0 to v3.7.1 - maven-checkstyle-plugin updated from v3.3.1 to v3.4.0 - maven-clean-plugin updated from v3.3.2 to v3.4.0 - maven-compiler-plugin updated from v3.11.0 to v3.13.0 - maven-dependency-plugin updated from v3.6.1 to v3.7.1 - maven-deploy-plugin updated from v3.1.1 to v3.1.2 - maven-enforcer-plugin updated from v3.4.1 to v3.5.0 - maven-failsafe-plugin updated from v3.2.2 to v3.3.1 - maven-gpg-plugin updated from v3.1.0 to v3.2.4 - maven-install-plugin updated from v3.1.0 to v3.1.2 - maven-jar-plugin updated from v3.3.0 to v3.4.2 - maven-javadoc-plugin updated from v3.6.3 to v3.8.0 - maven-jxr-plugin updated from v3.3.1 to v3.4.0 - maven-pmd-plugin updated from v3.21.2 to v3.24.0 - maven-project-info-reports-plugin updated from v3.5.0 to v3.6.2 - maven-release-plugin updated from v3.0.1 to v3.1.1 - maven-shade-plugin updated from v3.5.1 to v3.6.0 - maven-source-plugin updated from v3.3.0 to v3.3.1 - maven-surefire-plugin updated from v3.2.2 to v3.3.1 - maven-surefire-report-plugin updated from v3.2.2 to v3.3.1 - spotbugs-maven-plugin updated from v4.8.2.0 to v4.8.6.2 - versions-maven-plugin updated from v2.16.2 to v2.17.1 - pmd updated from v6.55.0 to v7.4.0 - slf4j updated from v2.0.9 to v2.0.13 - spotbugs updated from v4.8.2 to v4.8.6 Signed-off-by: Phillip Ross <[email protected]>
1 parent 6e87082 commit fe1cd90

File tree

4 files changed

+44
-50
lines changed

4 files changed

+44
-50
lines changed

‎.github/workflows/main.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ jobs:
1010
build-codebase:
1111
strategy:
1212
matrix:
13-
os: [ubuntu-22.04]
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]
13+
os: [ubuntu-24.04]
14+
jdk_version: [8.0.422-zulu, 11.0.24-zulu, 17.0.12-zulu, 21.0.4-zulu]
15+
maven_version: [3.9.8]
1616
include:
17-
- os: ubuntu-22.04
18-
jdk_version: 8.0.392-zulu
19-
zulu_version: 8.74.0.17
20-
maven_version: 3.9.6
17+
- os: ubuntu-24.04
18+
jdk_version: 8.0.422-zulu
19+
zulu_version: 8.80.0.17
20+
maven_version: 3.9.8
2121
maven_deploy: true
2222
docker_build: true
2323
maven_docker_container_image_repo: luminositylabs
2424
maven_docker_container_image_name: maven
25-
maven_docker_container_image_tag: 3.9.6_openjdk-8u392_zulu-8.74.0.17
25+
maven_docker_container_image_tag: 3.9.8_openjdk-8u422_zulu-alpine-8.80.0.17
2626
name: Build on OS ${{ matrix.os }} with Maven ${{ matrix.maven_version }} using JDK ${{ matrix.jdk_version }}
2727
runs-on: ${{ matrix.os }}
2828
env:
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: Checkout Source
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: Install GPG and generate test key
3838
run: .github/install-gpg.sh
@@ -53,7 +53,7 @@ jobs:
5353
echo "${MAVEN_HOME}/bin" >> $GITHUB_PATH
5454
5555
- name: Setup Maven repository cache
56-
uses: actions/cache@v3
56+
uses: actions/cache@v4
5757
env:
5858
cache-name: m2repo
5959
with:

‎maven-version-rules.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Pin logback version to v1.3.x (v1.4.0+ requires Java11) -->
1313
<rule groupId="ch.qos.logback" comparisonMethod="maven">
1414
<ignoreVersions>
15-
<ignoreVersion type="regex">1\.4\..*</ignoreVersion>
15+
<ignoreVersion type="regex">1\.[4-9]\..*</ignoreVersion>
1616
</ignoreVersions>
1717
</rule>
1818
<!-- Pin checkstyle version to pre-v10 (v10 is requires Java11) -->
@@ -25,6 +25,7 @@
2525
<rule groupId="org.testng" artifactId="testng" comparisonMethod="maven">
2626
<ignoreVersions>
2727
<ignoreVersion type="regex">7\.[6-9].*</ignoreVersion>
28+
<ignoreVersion type="regex">7\.10\..*</ignoreVersion>
2829
</ignoreVersions>
2930
</rule>
3031
<!-- Pin git-commit-id-plugin version to final 4.x release version (v5+ requires Java11 -->

‎pmd.xml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@
1111
</description>
1212
<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
1313
<rule ref="category/java/bestpractices.xml/CheckResultSet"/>
14+
<rule ref="category/java/bestpractices.xml/PrimitiveWrapperInstantiation"/>
1415
<rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
1516
<rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
1617
<rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
1718
<rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
19+
<rule ref="category/java/codestyle.xml/EmptyControlStatement"/>
1820
<rule ref="category/java/codestyle.xml/ExtendsObject"/>
1921
<rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop"/>
2022
<rule ref="category/java/codestyle.xml/TooManyStaticImports"/>
2123
<rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
2224
<rule ref="category/java/codestyle.xml/UnnecessaryImport"/>
2325
<rule ref="category/java/codestyle.xml/UnnecessaryModifier"/>
2426
<rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
27+
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
2528
<rule ref="category/java/codestyle.xml/UselessParentheses"/>
2629
<rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
2730
<rule ref="category/java/design.xml/CollapsibleIfStatements"/>
@@ -36,15 +39,6 @@
3639
<rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray"/>
3740
<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
3841
<rule ref="category/java/errorprone.xml/EmptyCatchBlock"/>
39-
<rule ref="category/java/errorprone.xml/EmptyFinallyBlock"/>
40-
<rule ref="category/java/errorprone.xml/EmptyIfStmt"/>
41-
<rule ref="category/java/errorprone.xml/EmptyInitializer"/>
42-
<rule ref="category/java/errorprone.xml/EmptyStatementBlock"/>
43-
<rule ref="category/java/errorprone.xml/EmptyStatementNotInLoop"/>
44-
<rule ref="category/java/errorprone.xml/EmptySwitchStatements"/>
45-
<rule ref="category/java/errorprone.xml/EmptySynchronizedBlock"/>
46-
<rule ref="category/java/errorprone.xml/EmptyTryBlock"/>
47-
<rule ref="category/java/errorprone.xml/EmptyWhileStmt"/>
4842
<rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
4943
<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
5044
<rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode"/>
@@ -57,5 +51,4 @@
5751
<rule ref="category/java/multithreading.xml/DontCallThreadRun"/>
5852
<rule ref="category/java/multithreading.xml/DoubleCheckedLocking"/>
5953
<rule ref="category/java/performance.xml/BigIntegerInstantiation"/>
60-
<rule ref="category/java/performance.xml/BooleanInstantiation"/>
6154
</ruleset>

‎pom.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -114,51 +114,51 @@
114114
<test.db.name>postgis1</test.db.name>
115115
<test.db.port>5432</test.db.port>
116116
<!-- Plugin versioning -->
117-
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
117+
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
118118
<directory-maven-plugin.version>1.0</directory-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>
119+
<download-maven-plugin.version>1.9.0</download-maven-plugin.version>
120+
<exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
121121
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
122-
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
122+
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
123123
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
124124
<maven-archetype-plugin.version>3.2.1</maven-archetype-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>
125+
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
126+
<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
127+
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
128+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
129+
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
130+
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
131131
<maven-ear-plugin.version>3.3.0</maven-ear-plugin.version>
132132
<maven-ejb-plugin.version>3.0.1</maven-ejb-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>
137-
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
133+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
134+
<maven-failsafe-plugin.version>3.3.1</maven-failsafe-plugin.version>
135+
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
136+
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
137+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
138138
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-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>
139+
<maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
140+
<maven-jxr-plugin.version>3.4.0</maven-jxr-plugin.version>
141+
<maven-pmd-plugin.version>3.24.0</maven-pmd-plugin.version>
142+
<maven-project-info-reports-plugin.version>3.6.2</maven-project-info-reports-plugin.version>
143+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
144144
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
145-
<maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
145+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
146146
<maven-site-plugin.version>3.12.1</maven-site-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>
147+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
148+
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
149+
<maven-surefire-report-plugin.version>3.3.1</maven-surefire-report-plugin.version>
150150
<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>
151+
<spotbugs-maven-plugin.version>4.8.6.2</spotbugs-maven-plugin.version>
152+
<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
153153
<!-- Dependency versions -->
154154
<dependency.checkstyle.version>9.3</dependency.checkstyle.version>
155155
<dependency.jts-version.version>1.19.0</dependency.jts-version.version>
156156
<dependency.logback.version>1.3.14</dependency.logback.version>
157-
<dependency.pmd.version>6.55.0</dependency.pmd.version>
157+
<dependency.pmd.version>7.4.0</dependency.pmd.version>
158158
<dependency.postgresql-jdbc.version>42.7.1</dependency.postgresql-jdbc.version>
159-
<dependency.slf4j.version>2.0.9</dependency.slf4j.version>
159+
<dependency.slf4j.version>2.0.13</dependency.slf4j.version>
160160
<dependency.spatial4j.version>0.8</dependency.spatial4j.version>
161-
<dependency.spotbugs.version>4.8.2</dependency.spotbugs.version>
161+
<dependency.spotbugs.version>4.8.6</dependency.spotbugs.version>
162162
<dependency.testcontainers.version>1.19.3</dependency.testcontainers.version>
163163
<dependency.testng.version>7.5.1</dependency.testng.version>
164164
</properties>

0 commit comments

Comments
 (0)