Skip to content

Commit 4a46a51

Browse files
elahrvivazelahrvivaz
committed
Bump Zookeeper to 3.9.5
* Remove GeoServer-specific versioning in gs-plugins
1 parent 50622b7 commit 4a46a51

File tree

4 files changed

+19
-42
lines changed

4 files changed

+19
-42
lines changed

‎build/dependencies.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ org.apache.thrift:libthrift:0.17.0:compile
169169
org.apache.xml:xml-commons-resolver:1.2:compile
170170
org.apache.yetus:audience-annotations:0.12.0:compile
171171
org.apache.yetus:audience-annotations:0.13.0:compile
172-
org.apache.zookeeper:zookeeper-jute:3.9.4:compile
173-
org.apache.zookeeper:zookeeper:3.9.4:compile
172+
org.apache.zookeeper:zookeeper-jute:3.9.5:compile
173+
org.apache.zookeeper:zookeeper:3.9.5:compile
174174
org.apiguardian:apiguardian-api:1.1.2:compile
175175
org.calrissian.mango:mango-core:3.0.0:compile
176176
org.checkerframework:checker-qual:2.5.2:compile
@@ -305,7 +305,6 @@ com.github.pjfanning:jersey-json:1.22.0:provided
305305
com.github.stephenc.jcip:jcip-annotations:1.0-1:provided
306306
com.google.code.findbugs:jsr305:3.0.2:provided
307307
com.google.crypto.tink:tink:1.9.0:provided
308-
com.google.errorprone:error_prone_annotations:2.36.0:provided
309308
com.google.inject.extensions:guice-servlet:4.2.3:provided
310309
com.google.inject:guice:4.2.3:provided
311310
com.jcraft:jsch:0.1.55:provided
@@ -372,7 +371,6 @@ org.antlr:antlr4-runtime:4.7.1:provided
372371
org.apache.accumulo:accumulo-start:2.1.4:provided
373372
org.apache.avro:avro-ipc:1.11.4:provided
374373
org.apache.avro:avro-mapred:1.11.4:provided
375-
org.apache.commons:commons-lang3:3.18.0:provided
376374
org.apache.commons:commons-math3:3.6.1:provided
377375
org.apache.commons:commons-vfs2:2.9.0:provided
378376
org.apache.datasketches:datasketches-java:3.3.0:provided
@@ -449,7 +447,6 @@ org.apache.tomcat:tomcat-util-scan:9.0.104:provided
449447
org.apache.tomcat:tomcat-util:9.0.104:provided
450448
org.apache.xbean:xbean-asm9-shaded:4.23:provided
451449
org.bouncycastle:bcprov-jdk18on:1.78.1:provided
452-
org.checkerframework:checker-qual:3.49.5:provided
453450
org.codehaus.janino:commons-compiler:3.1.9:provided
454451
org.codehaus.janino:janino:3.1.9:provided
455452
org.codehaus.jettison:jettison:1.5.4:provided

‎docs/user/upgrade/6.0.0.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following dependencies have been upgraded:
4444
* scala 2.13 ``2.13.12`` -> ``2.13.16``
4545
* sedona ``1.8.0`` -> ``1.8.1``
4646
* spark ``3.5.5`` -> ``3.5.7``
47-
* zookeeper ``3.9.3`` -> ``3.9.4``
47+
* zookeeper ``3.9.3`` -> ``3.9.5``
4848

4949
StrategyDecider API Update
5050
--------------------------

‎geomesa-archetypes/geomesa-archetypes-gs-plugin/pom.xml‎

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,98 +13,78 @@
1313
<packaging>pom</packaging>
1414

1515
<properties>
16-
<gs.antlr.version>4.7.1</gs.antlr.version>
17-
<gs.checker.qual.version>3.49.5</gs.checker.qual.version>
18-
<gs.commons.codec.version>1.18.0</gs.commons.codec.version>
19-
<gs.commons.io.version>2.19.0</gs.commons.io.version>
20-
<gs.commons.lang3.version>3.18.0</gs.commons.lang3.version>
21-
<gs.commons.logging.version>1.3.5</gs.commons.logging.version>
22-
<gs.commons.pool.version>1.5.4</gs.commons.pool.version>
23-
<gs.commons.text.version>1.13.0</gs.commons.text.version>
24-
<gs.error.prone.version>2.36.0</gs.error.prone.version>
25-
<gs.jackson.version>2.19.0</gs.jackson.version>
26-
<gs.jackson.databind.version>2.19.0</gs.jackson.databind.version>
16+
<antlr.version>4.7.1</antlr.version>
17+
<commons.pool.version>1.5.4</commons.pool.version>
2718
</properties>
2819

2920
<dependencyManagement>
3021
<dependencies>
3122
<!-- dependencies already in geoserver -->
23+
<!-- note: these versions don't align with the actual versions in the geoserver war -->
3224
<dependency>
3325
<groupId>commons-codec</groupId>
3426
<artifactId>commons-codec</artifactId>
35-
<version>${gs.commons.codec.version}</version>
27+
<version>${commons.codec.version}</version>
3628
<scope>provided</scope>
3729
</dependency>
3830
<dependency>
3931
<groupId>commons-io</groupId>
4032
<artifactId>commons-io</artifactId>
41-
<version>${gs.commons.io.version}</version>
33+
<version>${commons.io.version}</version>
4234
<scope>provided</scope>
4335
</dependency>
4436
<dependency>
4537
<groupId>org.apache.commons</groupId>
4638
<artifactId>commons-lang3</artifactId>
47-
<version>${gs.commons.lang3.version}</version>
39+
<version>${commons.lang3.version}</version>
4840
<scope>provided</scope>
4941
</dependency>
5042
<dependency>
5143
<groupId>commons-logging</groupId>
5244
<artifactId>commons-logging</artifactId>
53-
<version>${gs.commons.logging.version}</version>
45+
<version>${commons.logging.version}</version>
5446
<scope>provided</scope>
5547
</dependency>
5648
<dependency>
5749
<groupId>commons-pool</groupId>
5850
<artifactId>commons-pool</artifactId>
59-
<version>${gs.commons.pool.version}</version>
51+
<version>${commons.pool.version}</version>
6052
<scope>provided</scope>
6153
</dependency>
6254
<dependency>
6355
<groupId>org.apache.commons</groupId>
6456
<artifactId>commons-text</artifactId>
65-
<version>${gs.commons.text.version}</version>
57+
<version>${commons.text.version}</version>
6658
<scope>provided</scope>
6759
</dependency>
6860
<dependency>
6961
<groupId>com.fasterxml.jackson.core</groupId>
7062
<artifactId>jackson-annotations</artifactId>
71-
<version>${gs.jackson.version}</version>
63+
<version>${fasterxml.jackson.version}</version>
7264
<scope>provided</scope>
7365
</dependency>
7466
<dependency>
7567
<groupId>com.fasterxml.jackson.core</groupId>
7668
<artifactId>jackson-core</artifactId>
77-
<version>${gs.jackson.version}</version>
69+
<version>${fasterxml.jackson.version}</version>
7870
<scope>provided</scope>
7971
</dependency>
8072
<dependency>
8173
<groupId>com.fasterxml.jackson.core</groupId>
8274
<artifactId>jackson-databind</artifactId>
83-
<version>${gs.jackson.databind.version}</version>
75+
<version>${fasterxml.jackson.version}</version>
8476
<scope>provided</scope>
8577
</dependency>
8678
<dependency>
8779
<groupId>com.fasterxml.jackson.dataformat</groupId>
8880
<artifactId>jackson-dataformat-xml</artifactId>
89-
<version>${gs.jackson.version}</version>
81+
<version>${fasterxml.jackson.version}</version>
9082
<scope>provided</scope>
9183
</dependency>
9284
<dependency>
9385
<groupId>com.fasterxml.jackson.datatype</groupId>
9486
<artifactId>jackson-datatype-jsr310</artifactId>
95-
<version>${gs.jackson.version}</version>
96-
<scope>provided</scope>
97-
</dependency>
98-
<dependency>
99-
<groupId>com.google.errorprone</groupId>
100-
<artifactId>error_prone_annotations</artifactId>
101-
<version>${gs.error.prone.version}</version>
102-
<scope>provided</scope>
103-
</dependency>
104-
<dependency>
105-
<groupId>org.checkerframework</groupId>
106-
<artifactId>checker-qual</artifactId>
107-
<version>${gs.checker.qual.version}</version>
87+
<version>${fasterxml.jackson.version}</version>
10888
<scope>provided</scope>
10989
</dependency>
11090
<dependency>
@@ -224,7 +204,7 @@
224204
<dependency>
225205
<groupId>org.antlr</groupId>
226206
<artifactId>antlr4-runtime</artifactId>
227-
<version>${gs.antlr.version}</version>
207+
<version>${antlr.version}</version>
228208
<scope>provided</scope>
229209
</dependency>
230210
<dependency>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<!-- provided artifacts, not bundled to support multiple environments -->
130130
<accumulo.version>2.1.4</accumulo.version>
131131
<accumulo-20.version>2.0.1</accumulo-20.version>
132-
<zookeeper.version>3.9.4</zookeeper.version>
132+
<zookeeper.version>3.9.5</zookeeper.version>
133133
<thrift.version>0.17.0</thrift.version>
134134
<thrift-accumulo-20.version>0.12.0</thrift-accumulo-20.version>
135135
<thrift-cassandra.version>0.12.0</thrift-cassandra.version>

0 commit comments

Comments
 (0)