Skip to content

Commit 0b0c6f8

Browse files
authored
GEODE-10415: bump dependencies due to vulnerability scan (#7855)
1 parent e4d2f16 commit 0b0c6f8

5 files changed

Lines changed: 65 additions & 64 deletions

File tree

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class DependencyConstraints {
4141
deps.put("jgroups.version", "3.6.14.Final")
4242
deps.put("log4j.version", "2.17.2")
4343
deps.put("micrometer.version", "1.9.1")
44-
deps.put("shiro.version", "1.9.0")
44+
deps.put("shiro.version", "1.9.1")
4545
deps.put("slf4j-api.version", "1.7.32")
4646
deps.put("jboss-modules.version", "1.11.0.Final")
4747
deps.put("jackson.version", "2.13.3")
@@ -61,7 +61,7 @@ class DependencyConstraints {
6161

6262
// The jetty version is also hard-coded in geode-assembly:test
6363
// at o.a.g.sessions.tests.GenericAppServerInstall.java
64-
deps.put("jetty.version", "9.4.46.v20220331")
64+
deps.put("jetty.version", "9.4.47.v20220610")
6565

6666
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
6767
deps.put("junit.version", "4.13.2")

geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* specific code outside of the {@link GenericAppServerVersion}.
3535
*/
3636
public class GenericAppServerInstall extends ContainerInstall {
37-
private static final String JETTY_VERSION = "9.4.46.v20220331";
37+
private static final String JETTY_VERSION = "9.4.47.v20220610";
3838

3939
/**
4040
* Get the version number, download URL, and container name of a generic app server using

geode-assembly/src/integrationTest/resources/assembly_content.txt

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,26 +1007,29 @@ lib/istack-commons-runtime-4.0.1.jar
10071007
lib/jackson-annotations-2.13.3.jar
10081008
lib/jackson-core-2.13.3.jar
10091009
lib/jackson-databind-2.13.3.jar
1010+
lib/jackson-datatype-joda-2.13.3.jar
1011+
lib/jackson-datatype-jsr310-2.13.3.jar
10101012
lib/javax.activation-api-1.2.0.jar
10111013
lib/javax.mail-api-1.6.2.jar
10121014
lib/javax.resource-api-1.7.1.jar
10131015
lib/javax.servlet-api-3.1.0.jar
10141016
lib/javax.transaction-api-1.3.jar
10151017
lib/jaxb-api-2.3.1.jar
10161018
lib/jaxb-impl-2.3.2.jar
1017-
lib/jetty-http-9.4.46.v20220331.jar
1018-
lib/jetty-io-9.4.46.v20220331.jar
1019-
lib/jetty-security-9.4.46.v20220331.jar
1020-
lib/jetty-server-9.4.46.v20220331.jar
1021-
lib/jetty-servlet-9.4.46.v20220331.jar
1022-
lib/jetty-util-9.4.46.v20220331.jar
1023-
lib/jetty-util-ajax-9.4.46.v20220331.jar
1024-
lib/jetty-webapp-9.4.46.v20220331.jar
1025-
lib/jetty-xml-9.4.46.v20220331.jar
1019+
lib/jetty-http-9.4.47.v20220610.jar
1020+
lib/jetty-io-9.4.47.v20220610.jar
1021+
lib/jetty-security-9.4.47.v20220610.jar
1022+
lib/jetty-server-9.4.47.v20220610.jar
1023+
lib/jetty-servlet-9.4.47.v20220610.jar
1024+
lib/jetty-util-9.4.47.v20220610.jar
1025+
lib/jetty-util-ajax-9.4.47.v20220610.jar
1026+
lib/jetty-webapp-9.4.47.v20220610.jar
1027+
lib/jetty-xml-9.4.47.v20220610.jar
10261028
lib/jgroups-3.6.14.Final.jar
10271029
lib/jline-2.12.jar
10281030
lib/jna-5.11.0.jar
10291031
lib/jna-platform-5.11.0.jar
1032+
lib/joda-time-2.10.14.jar
10301033
lib/jopt-simple-5.0.4.jar
10311034
lib/log4j-api-2.17.2.jar
10321035
lib/log4j-core-2.17.2.jar
@@ -1044,16 +1047,17 @@ lib/mx4j-remote-3.0.2.jar
10441047
lib/mx4j-tools-3.0.1.jar
10451048
lib/ra.jar
10461049
lib/rmiio-2.1.2.jar
1047-
lib/shiro-cache-1.9.0.jar
1048-
lib/shiro-config-core-1.9.0.jar
1049-
lib/shiro-config-ogdl-1.9.0.jar
1050-
lib/shiro-core-1.9.0.jar
1051-
lib/shiro-crypto-cipher-1.9.0.jar
1052-
lib/shiro-crypto-core-1.9.0.jar
1053-
lib/shiro-crypto-hash-1.9.0.jar
1054-
lib/shiro-event-1.9.0.jar
1055-
lib/shiro-lang-1.9.0.jar
1050+
lib/shiro-cache-1.9.1.jar
1051+
lib/shiro-config-core-1.9.1.jar
1052+
lib/shiro-config-ogdl-1.9.1.jar
1053+
lib/shiro-core-1.9.1.jar
1054+
lib/shiro-crypto-cipher-1.9.1.jar
1055+
lib/shiro-crypto-core-1.9.1.jar
1056+
lib/shiro-crypto-hash-1.9.1.jar
1057+
lib/shiro-event-1.9.1.jar
1058+
lib/shiro-lang-1.9.1.jar
10561059
lib/slf4j-api-1.7.32.jar
1060+
lib/slf4j-api-1.7.36.jar
10571061
lib/snappy-0.4.jar
10581062
lib/spring-beans-5.3.21.jar
10591063
lib/spring-context-5.3.21.jar
@@ -1070,6 +1074,3 @@ tools/Modules/Apache_Geode_Modules-0.0.0-Tomcat.zip
10701074
tools/Modules/Apache_Geode_Modules-0.0.0-tcServer.zip
10711075
tools/Modules/Apache_Geode_Modules-0.0.0-tcServer30.zip
10721076
tools/Pulse/geode-pulse-0.0.0.war
1073-
lib/jackson-datatype-joda-2.13.3.jar
1074-
lib/jackson-datatype-jsr310-2.13.3.jar
1075-
lib/joda-time-2.10.14.jar

geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ spring-shell-1.2.0.RELEASE.jar
2121
spring-web-5.3.21.jar
2222
commons-lang3-3.12.0.jar
2323
rmiio-2.1.2.jar
24+
jackson-datatype-joda-2.13.3.jar
2425
jackson-annotations-2.13.3.jar
2526
jackson-core-2.13.3.jar
27+
jackson-datatype-jsr310-2.13.3.jar
2628
jackson-databind-2.13.3.jar
2729
swagger-annotations-2.2.1.jar
2830
jopt-simple-5.0.4.jar
@@ -45,8 +47,8 @@ antlr-2.7.7.jar
4547
istack-commons-runtime-4.0.1.jar
4648
jaxb-impl-2.3.2.jar
4749
commons-validator-1.7.jar
48-
shiro-core-1.9.0.jar
49-
shiro-config-ogdl-1.9.0.jar
50+
shiro-core-1.9.1.jar
51+
shiro-config-ogdl-1.9.1.jar
5052
commons-beanutils-1.9.4.jar
5153
commons-codec-1.15.jar
5254
commons-collections-3.2.2.jar
@@ -57,23 +59,24 @@ classgraph-4.8.147.jar
5759
micrometer-core-1.9.1.jar
5860
fastutil-8.5.8.jar
5961
javax.resource-api-1.7.1.jar
60-
jetty-webapp-9.4.46.v20220331.jar
61-
jetty-servlet-9.4.46.v20220331.jar
62-
jetty-security-9.4.46.v20220331.jar
63-
jetty-server-9.4.46.v20220331.jar
62+
jetty-webapp-9.4.47.v20220610.jar
63+
jetty-servlet-9.4.47.v20220610.jar
64+
jetty-security-9.4.47.v20220610.jar
65+
jetty-server-9.4.47.v20220610.jar
6466
javax.servlet-api-3.1.0.jar
67+
joda-time-2.10.14.jar
6568
jna-platform-5.11.0.jar
6669
jna-5.11.0.jar
6770
snappy-0.4.jar
6871
jgroups-3.6.14.Final.jar
69-
shiro-cache-1.9.0.jar
70-
shiro-crypto-hash-1.9.0.jar
71-
shiro-crypto-cipher-1.9.0.jar
72-
shiro-config-core-1.9.0.jar
73-
shiro-event-1.9.0.jar
74-
shiro-crypto-core-1.9.0.jar
75-
shiro-lang-1.9.0.jar
76-
slf4j-api-1.7.32.jar
72+
shiro-cache-1.9.1.jar
73+
shiro-crypto-hash-1.9.1.jar
74+
shiro-crypto-cipher-1.9.1.jar
75+
shiro-config-core-1.9.1.jar
76+
shiro-event-1.9.1.jar
77+
shiro-crypto-core-1.9.1.jar
78+
shiro-lang-1.9.1.jar
79+
slf4j-api-1.7.36.jar
7780
spring-beans-5.3.21.jar
7881
javax.activation-api-1.2.0.jar
7982
jline-2.12.jar
@@ -82,11 +85,8 @@ spring-jcl-5.3.21.jar
8285
HdrHistogram-2.1.12.jar
8386
LatencyUtils-2.0.3.jar
8487
javax.transaction-api-1.3.jar
85-
jetty-xml-9.4.46.v20220331.jar
86-
jetty-http-9.4.46.v20220331.jar
87-
jetty-io-9.4.46.v20220331.jar
88-
jetty-util-ajax-9.4.46.v20220331.jar
89-
jetty-util-9.4.46.v20220331.jar
90-
jackson-datatype-joda-2.13.3.jar
91-
jackson-datatype-jsr310-2.13.3.jar
92-
joda-time-2.10.14.jar
88+
jetty-xml-9.4.47.v20220610.jar
89+
jetty-http-9.4.47.v20220610.jar
90+
jetty-io-9.4.47.v20220610.jar
91+
jetty-util-ajax-9.4.47.v20220610.jar
92+
jetty-util-9.4.47.v20220610.jar
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
spring-web-5.3.21.jar
2-
shiro-event-1.9.0.jar
3-
shiro-crypto-hash-1.9.0.jar
4-
shiro-crypto-cipher-1.9.0.jar
5-
shiro-config-core-1.9.0.jar
2+
shiro-event-1.9.1.jar
3+
shiro-crypto-hash-1.9.1.jar
4+
shiro-crypto-cipher-1.9.1.jar
5+
shiro-config-core-1.9.1.jar
66
commons-digester-2.1.jar
77
commons-validator-1.7.jar
88
spring-jcl-5.3.21.jar
@@ -16,18 +16,18 @@ javax.activation-api-1.2.0.jar
1616
javax.resource-api-1.7.1.jar
1717
LatencyUtils-2.0.3.jar
1818
jline-2.12.jar
19-
jetty-servlet-9.4.46.v20220331.jar
19+
jetty-servlet-9.4.47.v20220610.jar
2020
spring-core-5.3.21.jar
21-
jetty-util-ajax-9.4.46.v20220331.jar
21+
jetty-util-ajax-9.4.47.v20220610.jar
2222
geode-cq-0.0.0.jar
2323
geode-old-client-support-0.0.0.jar
2424
javax.servlet-api-3.1.0.jar
2525
jgroups-3.6.14.Final.jar
26-
shiro-cache-1.9.0.jar
26+
shiro-cache-1.9.1.jar
2727
httpcore-4.4.15.jar
2828
spring-beans-5.3.21.jar
2929
lucene-queries-6.6.6.jar
30-
shiro-core-1.9.0.jar
30+
shiro-core-1.9.1.jar
3131
HikariCP-4.0.3.jar
3232
slf4j-api-1.7.32.jar
3333
geode-http-service-0.0.0.jar
@@ -38,18 +38,18 @@ geode-lucene-0.0.0.jar
3838
lucene-core-6.6.6.jar
3939
fastutil-8.5.8.jar
4040
geode-gfsh-0.0.0.jar
41-
jetty-http-9.4.46.v20220331.jar
41+
jetty-http-9.4.47.v20220610.jar
4242
geode-memcached-0.0.0.jar
4343
rmiio-2.1.2.jar
4444
geode-tcp-server-0.0.0.jar
4545
log4j-jcl-2.17.2.jar
4646
geode-connectors-0.0.0.jar
4747
jackson-core-2.13.3.jar
48-
jetty-util-9.4.46.v20220331.jar
48+
jetty-util-9.4.47.v20220610.jar
4949
log4j-slf4j-impl-2.17.2.jar
5050
lucene-analyzers-common-6.6.6.jar
5151
geode-membership-0.0.0.jar
52-
jetty-webapp-9.4.46.v20220331.jar
52+
jetty-webapp-9.4.47.v20220610.jar
5353
commons-lang3-3.12.0.jar
5454
jopt-simple-5.0.4.jar
5555
swagger-annotations-2.2.1.jar
@@ -59,11 +59,11 @@ log4j-api-2.17.2.jar
5959
geode-serialization-0.0.0.jar
6060
istack-commons-runtime-4.0.1.jar
6161
lucene-queryparser-6.6.6.jar
62-
jetty-io-9.4.46.v20220331.jar
62+
jetty-io-9.4.47.v20220610.jar
6363
geode-deployment-legacy-0.0.0.jar
6464
commons-beanutils-1.9.4.jar
6565
log4j-core-2.17.2.jar
66-
shiro-crypto-core-1.9.0.jar
66+
shiro-crypto-core-1.9.1.jar
6767
jaxb-api-2.3.1.jar
6868
geode-unsafe-0.0.0.jar
6969
spring-shell-1.2.0.RELEASE.jar
@@ -73,20 +73,20 @@ log4j-jul-2.17.2.jar
7373
HdrHistogram-2.1.12.jar
7474
jackson-annotations-2.13.3.jar
7575
micrometer-core-1.9.1.jar
76-
shiro-config-ogdl-1.9.0.jar
76+
shiro-config-ogdl-1.9.1.jar
7777
geode-log4j-0.0.0.jar
7878
lucene-analyzers-phonetic-6.6.6.jar
7979
spring-context-5.3.21.jar
80-
jetty-security-9.4.46.v20220331.jar
80+
jetty-security-9.4.47.v20220610.jar
8181
geode-logging-0.0.0.jar
8282
commons-io-2.11.0.jar
83-
shiro-lang-1.9.0.jar
83+
shiro-lang-1.9.1.jar
8484
javax.transaction-api-1.3.jar
8585
geode-common-0.0.0.jar
8686
antlr-2.7.7.jar
87-
jetty-xml-9.4.46.v20220331.jar
87+
jetty-xml-9.4.47.v20220610.jar
8888
geode-rebalancer-0.0.0.jar
89-
jetty-server-9.4.46.v20220331.jar
89+
jetty-server-9.4.47.v20220610.jar
9090
jackson-datatype-jsr310-2.13.3.jar
9191
jackson-datatype-joda-2.13.3.jar
9292
joda-time-2.10.14.jar

0 commit comments

Comments
 (0)