Skip to content

Commit 723a530

Browse files
authored
Minor pom cleanup (#3475)
* Bump spring-security version * Bump jinja version in docs * Make all CI jobs single threaded * Remove unused commons-lang references
1 parent 297c66e commit 723a530

File tree

10 files changed

+11
-23
lines changed

10 files changed

+11
-23
lines changed

.github/workflows/assembly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ permissions: # added using https://github.com/step-security/secure-repo
1515
env:
1616
JAVA_VERSION: 17
1717
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
18-
MAVEN_COMPILE_NO_OP_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4 -Dmaven.main.skip
19-
MAVEN_ASSEMBLY_ARGS: assembly:single@make-assembly -Dassembly.ignoreMissingDescriptor=true -T2
18+
MAVEN_COMPILE_NO_OP_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -Dmaven.main.skip
19+
MAVEN_ASSEMBLY_ARGS: assembly:single@make-assembly -Dassembly.ignoreMissingDescriptor=true
2020

2121
jobs:
2222
assembly:

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1515
env:
1616
JAVA_VERSION: 17
1717
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
18-
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4
18+
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes
1919
MAVEN_TEST_ARGS: test -Dmaven.main.skip
2020

2121
jobs:

.github/workflows/dash.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1212
env:
1313
JAVA_VERSION: 17
1414
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
15-
MAVEN_COMPILE_NO_OP_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4 -Dmaven.main.skip
15+
MAVEN_COMPILE_NO_OP_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -Dmaven.main.skip
1616
MAVEN_DASH_ARGS: org.eclipse.dash:license-tool-plugin:license-check -Ddash.fail=true -Ddash.projectId=locationtech.geomesa -DexcludeGroupIds=org.locationtech.geomesa
1717

1818
jobs:

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1515
env:
1616
JAVA_VERSION: 17
1717
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
18-
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4
18+
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes
1919
MAVEN_IT_COMPILE_ARGS: test -Dmaven.main.skip -DskipTests
2020
MAVEN_IT_TEST_ARGS: failsafe:integration-test failsafe:verify
2121

.github/workflows/javadocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1111
env:
1212
JAVA_VERSION: 17
1313
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
14-
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4
14+
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes
1515
MAVEN_SCALADOC_ARGS: generate-sources scala:doc-jar
1616
MAVEN_JAVADOC_ARGS: generate-sources javadoc:jar -Psite
1717

.github/workflows/spark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions: # added using https://github.com/step-security/secure-repo
1515
env:
1616
JAVA_VERSION: 17
1717
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
18-
MAVEN_COMPILE_SPARK_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -T4
18+
MAVEN_COMPILE_SPARK_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip
1919
MAVEN_TEST_SPARK_ARGS: test failsafe:integration-test failsafe:verify -Dmaven.main.skip -Dtest.fork.count=2
2020

2121
jobs:

.github/workflows/validate-ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ on:
77
permissions: # added using https://github.com/step-security/secure-repo
88
contents: read
99

10-
env:
11-
JAVA_VERSION: 17
12-
MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false --batch-mode -Dlicense.skip=true
13-
MAVEN_COMPILE_ARGS: clean install -Dmaven.test.skip -Dmaven.assembly.skip=true -Dmaven.source.skip -Pskip-spark-runtimes -T4
14-
MAVEN_TEST_ARGS: test -Dmaven.main.skip
15-
1610
jobs:
1711
validate-tests:
1812
runs-on: ubuntu-latest

build/dependencies.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ org.scala-lang.modules:scala-parser-combinators_2.12:2.3.0:provided
509509
org.scala-lang:scala-compiler:2.12.20:provided
510510
org.slf4j:jcl-over-slf4j:2.0.7:provided
511511
org.slf4j:slf4j-reload4j:1.7.36:provided
512-
org.springframework.security:spring-security-core:5.8.15:provided
513-
org.springframework.security:spring-security-crypto:5.8.15:provided
512+
org.springframework.security:spring-security-core:5.8.16:provided
513+
org.springframework.security:spring-security-crypto:5.8.16:provided
514514
org.springframework:spring-aop:5.3.39:provided
515515
org.springframework:spring-beans:5.3.39:provided
516516
org.springframework:spring-context:5.3.39:provided

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sphinx-tabs==3.3.1
33
recommonmark==0.7.1
44
sphinx-rtd-theme==1.1.1
55
docutils<0.18
6-
jinja2==3.1.5
6+
jinja2==3.1.6
77
sphinx-copybutton==0.5.2
88
# pin some older versions that are compatible with sphinx 4.5
99
sphinxcontrib-applehelp==1.0.3

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<rhino.js.version>1.8.1</rhino.js.version>
102102
<s2.geometry.version>20250620-rc1</s2.geometry.version>
103103
<sizeof.version>0.4.3</sizeof.version>
104-
<spring.security.version>5.8.15</spring.security.version> <!-- geoserver is still on 5.x -->
104+
<spring.security.version>5.8.16</spring.security.version> <!-- geoserver is still on 5.x -->
105105
<typesafe.config.version>1.4.3</typesafe.config.version>
106106

107107
<!-- standardized transitive dependencies -->
@@ -116,7 +116,6 @@
116116
<commons.cli.version>1.6.0</commons.cli.version>
117117
<commons.collections.version>3.2.2</commons.collections.version>
118118
<commons.collections4.version>4.4</commons.collections4.version>
119-
<commons.lang.version>2.6</commons.lang.version>
120119

121120
<!-- test dependencies -->
122121
<specs2.version>4.23.0</specs2.version>
@@ -1580,11 +1579,6 @@
15801579
<artifactId>commons-cli</artifactId>
15811580
<version>${commons.cli.version}</version>
15821581
</dependency>
1583-
<dependency>
1584-
<groupId>commons-lang</groupId>
1585-
<artifactId>commons-lang</artifactId>
1586-
<version>${commons.lang.version}</version>
1587-
</dependency>
15881582
<dependency>
15891583
<groupId>commons-collections</groupId>
15901584
<artifactId>commons-collections</artifactId>

0 commit comments

Comments
 (0)