Skip to content
This repository was archived by the owner on Jan 27, 2021. It is now read-only.

Commit 54527eb

Browse files
onichols-pivotalonichols-pivotal
authored
GEODE-8496: top off dependency updates for 1.14 (apache#5652)
* Bump spring-security from 5.4.0 to 5.4.1 * Bump jackson and jackson-databind from 2.11.2 to 2.11.3 * Bump netty-all from 4.1.52.Final to 4.1.53.Final * Bump mysql-connector-java from 8.0.21 to 8.0.22 * Bump httpclient from 4.5.12 to 4.5.13 * Bump tomcat9 from 9.0.38 to 9.0.39 * Bump tomcat8 from 8.5.58 to 8.5.59 * Bump cargo from 1.8.1 to 1.8.2 * Bump jetty from 9.4.31.v20200723 to 9.4.32.v20200930 * Bump jmh from 1.25.2 to 1.26 * Bump guava from 29.0-jre to 30.0-jre * Bump mockrunner-servlet from 2.0.4 to 2.0.6 * Bump pmd from 6.27.0 to 6.28.0 * Bump junit from 4.13 to 4.13.1 * Bump junit-quickcheck from 0.9.4 to 0.9.5 * Bump mockito-core from 3.5.11 to 3.5.15 * Bump compiler from 2.3.6 to 2.4.0
1 parent 08e4e9a commit 54527eb

File tree

12 files changed

+84
-84
lines changed

12 files changed

+84
-84
lines changed

‎boms/geode-all-bom/src/test/resources/expected-pom.xml

+28-28
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
<dependency>
7171
<groupId>com.fasterxml.jackson.datatype</groupId>
7272
<artifactId>jackson-datatype-jsr310</artifactId>
73-
<version>2.11.2</version>
73+
<version>2.11.3</version>
7474
<scope>compile</scope>
7575
</dependency>
7676
<dependency>
7777
<groupId>com.fasterxml.jackson.module</groupId>
7878
<artifactId>jackson-module-scala_2.10</artifactId>
79-
<version>2.11.2</version>
79+
<version>2.11.3</version>
8080
<scope>compile</scope>
8181
</dependency>
8282
<dependency>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>com.google.guava</groupId>
108108
<artifactId>guava</artifactId>
109-
<version>29.0-jre</version>
109+
<version>30.0-jre</version>
110110
<scope>compile</scope>
111111
</dependency>
112112
<dependency>
@@ -130,7 +130,7 @@
130130
<dependency>
131131
<groupId>com.mockrunner</groupId>
132132
<artifactId>mockrunner-servlet</artifactId>
133-
<version>2.0.4</version>
133+
<version>2.0.6</version>
134134
<scope>compile</scope>
135135
</dependency>
136136
<dependency>
@@ -250,7 +250,7 @@
250250
<dependency>
251251
<groupId>io.netty</groupId>
252252
<artifactId>netty-all</artifactId>
253-
<version>4.1.52.Final</version>
253+
<version>4.1.53.Final</version>
254254
<scope>compile</scope>
255255
</dependency>
256256
<dependency>
@@ -316,7 +316,7 @@
316316
<dependency>
317317
<groupId>junit</groupId>
318318
<artifactId>junit</artifactId>
319-
<version>4.13</version>
319+
<version>4.13.1</version>
320320
<scope>compile</scope>
321321
</dependency>
322322
<dependency>
@@ -346,7 +346,7 @@
346346
<dependency>
347347
<groupId>net.openhft</groupId>
348348
<artifactId>compiler</artifactId>
349-
<version>2.3.6</version>
349+
<version>2.4.0</version>
350350
<scope>compile</scope>
351351
</dependency>
352352
<dependency>
@@ -358,13 +358,13 @@
358358
<dependency>
359359
<groupId>net.sourceforge.pmd</groupId>
360360
<artifactId>pmd-java</artifactId>
361-
<version>6.27.0</version>
361+
<version>6.28.0</version>
362362
<scope>compile</scope>
363363
</dependency>
364364
<dependency>
365365
<groupId>net.sourceforge.pmd</groupId>
366366
<artifactId>pmd-test</artifactId>
367-
<version>6.27.0</version>
367+
<version>6.28.0</version>
368368
<scope>compile</scope>
369369
</dependency>
370370
<dependency>
@@ -400,7 +400,7 @@
400400
<dependency>
401401
<groupId>org.apache.httpcomponents</groupId>
402402
<artifactId>httpclient</artifactId>
403-
<version>4.5.12</version>
403+
<version>4.5.13</version>
404404
<scope>compile</scope>
405405
</dependency>
406406
<dependency>
@@ -436,19 +436,19 @@
436436
<dependency>
437437
<groupId>org.codehaus.cargo</groupId>
438438
<artifactId>cargo-core-uberjar</artifactId>
439-
<version>1.8.1</version>
439+
<version>1.8.2</version>
440440
<scope>compile</scope>
441441
</dependency>
442442
<dependency>
443443
<groupId>org.eclipse.jetty</groupId>
444444
<artifactId>jetty-server</artifactId>
445-
<version>9.4.31.v20200723</version>
445+
<version>9.4.32.v20200930</version>
446446
<scope>compile</scope>
447447
</dependency>
448448
<dependency>
449449
<groupId>org.eclipse.jetty</groupId>
450450
<artifactId>jetty-webapp</artifactId>
451-
<version>9.4.31.v20200723</version>
451+
<version>9.4.32.v20200930</version>
452452
<scope>compile</scope>
453453
</dependency>
454454
<dependency>
@@ -478,7 +478,7 @@
478478
<dependency>
479479
<groupId>org.mockito</groupId>
480480
<artifactId>mockito-core</artifactId>
481-
<version>3.5.11</version>
481+
<version>3.5.15</version>
482482
<scope>compile</scope>
483483
</dependency>
484484
<dependency>
@@ -490,7 +490,7 @@
490490
<dependency>
491491
<groupId>org.openjdk.jmh</groupId>
492492
<artifactId>jmh-core</artifactId>
493-
<version>1.25.2</version>
493+
<version>1.26</version>
494494
<scope>compile</scope>
495495
</dependency>
496496
<dependency>
@@ -562,19 +562,19 @@
562562
<dependency>
563563
<groupId>com.fasterxml.jackson.core</groupId>
564564
<artifactId>jackson-annotations</artifactId>
565-
<version>2.11.2</version>
565+
<version>2.11.3</version>
566566
<scope>compile</scope>
567567
</dependency>
568568
<dependency>
569569
<groupId>com.fasterxml.jackson.core</groupId>
570570
<artifactId>jackson-core</artifactId>
571-
<version>2.11.2</version>
571+
<version>2.11.3</version>
572572
<scope>compile</scope>
573573
</dependency>
574574
<dependency>
575575
<groupId>com.fasterxml.jackson.core</groupId>
576576
<artifactId>jackson-databind</artifactId>
577-
<version>2.11.2</version>
577+
<version>2.11.3</version>
578578
<scope>compile</scope>
579579
</dependency>
580580
<dependency>
@@ -604,13 +604,13 @@
604604
<dependency>
605605
<groupId>com.pholser</groupId>
606606
<artifactId>junit-quickcheck-core</artifactId>
607-
<version>0.9.4</version>
607+
<version>0.9.5</version>
608608
<scope>compile</scope>
609609
</dependency>
610610
<dependency>
611611
<groupId>com.pholser</groupId>
612612
<artifactId>junit-quickcheck-generators</artifactId>
613-
<version>0.9.4</version>
613+
<version>0.9.5</version>
614614
<scope>compile</scope>
615615
</dependency>
616616
<dependency>
@@ -748,49 +748,49 @@
748748
<dependency>
749749
<groupId>org.springframework.security</groupId>
750750
<artifactId>spring-security-config</artifactId>
751-
<version>5.4.0</version>
751+
<version>5.4.1</version>
752752
<scope>compile</scope>
753753
</dependency>
754754
<dependency>
755755
<groupId>org.springframework.security</groupId>
756756
<artifactId>spring-security-core</artifactId>
757-
<version>5.4.0</version>
757+
<version>5.4.1</version>
758758
<scope>compile</scope>
759759
</dependency>
760760
<dependency>
761761
<groupId>org.springframework.security</groupId>
762762
<artifactId>spring-security-ldap</artifactId>
763-
<version>5.4.0</version>
763+
<version>5.4.1</version>
764764
<scope>compile</scope>
765765
</dependency>
766766
<dependency>
767767
<groupId>org.springframework.security</groupId>
768768
<artifactId>spring-security-test</artifactId>
769-
<version>5.4.0</version>
769+
<version>5.4.1</version>
770770
<scope>compile</scope>
771771
</dependency>
772772
<dependency>
773773
<groupId>org.springframework.security</groupId>
774774
<artifactId>spring-security-web</artifactId>
775-
<version>5.4.0</version>
775+
<version>5.4.1</version>
776776
<scope>compile</scope>
777777
</dependency>
778778
<dependency>
779779
<groupId>org.springframework.security</groupId>
780780
<artifactId>spring-security-oauth2-core</artifactId>
781-
<version>5.4.0</version>
781+
<version>5.4.1</version>
782782
<scope>compile</scope>
783783
</dependency>
784784
<dependency>
785785
<groupId>org.springframework.security</groupId>
786786
<artifactId>spring-security-oauth2-client</artifactId>
787-
<version>5.4.0</version>
787+
<version>5.4.1</version>
788788
<scope>compile</scope>
789789
</dependency>
790790
<dependency>
791791
<groupId>org.springframework.security</groupId>
792792
<artifactId>spring-security-oauth2-jose</artifactId>
793-
<version>5.4.0</version>
793+
<version>5.4.1</version>
794794
<scope>compile</scope>
795795
</dependency>
796796
<dependency>

‎buildSrc/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ dependencies {
3434
implementation(gradleApi())
3535
implementation('org.apache.commons:commons-lang3:3.3.2')
3636
implementation('org.apache.maven:maven-artifact:3.3.3')
37-
implementation('com.google.guava:guava:29.0-jre')
37+
implementation('com.google.guava:guava:30.0-jre')
3838
implementation('com.github.docker-java:docker-java:3.0.14')
3939
implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9')
4040

41-
implementation('junit:junit:4.13')
41+
implementation('junit:junit:4.13.1')
4242

4343
testAnnotationProcessor(this.project)
4444
}

‎buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

+19-19
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ class DependencyConstraints implements Plugin<Project> {
5252
// This would possibly be corrected if they were proper source sets.
5353
deps.put("tomcat6.version", "6.0.37")
5454
deps.put("tomcat7.version", "7.0.106")
55-
deps.put("tomcat8.version", "8.5.58")
56-
deps.put("tomcat9.version", "9.0.38")
55+
deps.put("tomcat8.version", "8.5.59")
56+
deps.put("tomcat9.version", "9.0.39")
5757

5858
// The jetty version is also hard-coded in geode-assembly:test
5959
// at o.a.g.sessions.tests.GenericAppServerInstall.java
60-
deps.put("jetty.version", "9.4.31.v20200723")
60+
deps.put("jetty.version", "9.4.32.v20200930")
6161

6262
// These version numbers are consumed by protobuf configurations that are plugin-specific and not
6363
// part of the typical Gradle dependency configurations.
@@ -66,7 +66,7 @@ class DependencyConstraints implements Plugin<Project> {
6666
deps.put("protobuf-java.version", "3.11.4")
6767

6868
// These versions are referenced in test.gradle, which is aggressively injected into all projects.
69-
deps.put("junit.version", "4.13")
69+
deps.put("junit.version", "4.13.1")
7070
deps.put("cglib.version", "3.3.0")
7171
return deps
7272
}
@@ -88,17 +88,17 @@ class DependencyConstraints implements Plugin<Project> {
8888
api(group: 'com.arakelian', name: 'java-jq', version: '1.1.0')
8989
api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.8')
9090
api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.9.8')
91-
api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.2')
92-
api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.11.2')
91+
api(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.11.3')
92+
api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.11.3')
9393
api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.7')
9494
api(group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0')
9595
api(group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1')
9696
api(group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2')
97-
api(group: 'com.google.guava', name: 'guava', version: '29.0-jre')
97+
api(group: 'com.google.guava', name: 'guava', version: '30.0-jre')
9898
api(group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: get('protobuf-gradle-plugin.version'))
9999
api(group: 'com.google.protobuf', name: 'protobuf-java', version: get('protobuf-java.version'))
100100
api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
101-
api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.4')
101+
api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.6')
102102
api(group: 'com.nimbusds', name:'nimbus-jose-jwt', version:'8.11')
103103
// Pinning transitive dependency from spring-security-oauth2 to clean up our licenses.
104104
api(group: 'com.nimbusds', name: 'oauth2-oidc-sdk', version: '8.9')
@@ -120,7 +120,7 @@ class DependencyConstraints implements Plugin<Project> {
120120
// Careful when upgrading this dependency: see GEODE-7370 and GEODE-8150.
121121
api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.52')
122122
api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
123-
api(group: 'io.netty', name: 'netty-all', version: '4.1.52.Final')
123+
api(group: 'io.netty', name: 'netty-all', version: '4.1.53.Final')
124124
api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
125125
api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version'))
126126
api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2')
@@ -136,31 +136,31 @@ class DependencyConstraints implements Plugin<Project> {
136136
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
137137
api(group: 'net.java.dev.jna', name: 'jna', version: '5.6.0')
138138
api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.6.0')
139-
api(group: 'net.openhft', name: 'compiler', version: '2.3.6')
139+
api(group: 'net.openhft', name: 'compiler', version: '2.4.0')
140140
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
141-
api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.27.0')
142-
api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.27.0')
141+
api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.28.0')
142+
api(group: 'net.sourceforge.pmd', name: 'pmd-test', version: '6.28.0')
143143
api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
144144
api(group: 'org.apache.bcel', name: 'bcel', version: '6.5.0')
145145
api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))
146146
api(group: 'org.apache.commons', name: 'commons-text', version: 1.9)
147147
api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
148-
api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12')
148+
api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13')
149149
api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13')
150150
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
151151
api(group: 'org.assertj', name: 'assertj-core', version: '3.17.2')
152152
api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
153153
api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66')
154-
api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.1')
154+
api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.8.2')
155155
api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
156156
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
157157
api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
158158
api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
159159
api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
160160
api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))
161-
api(group: 'org.mockito', name: 'mockito-core', version: '3.5.11')
161+
api(group: 'org.mockito', name: 'mockito-core', version: '3.5.15')
162162
api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
163-
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.25.2')
163+
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.26')
164164
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
165165
api(group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0')
166166
api(group: 'org.slf4j', name: 'slf4j-api', version: get('slf4j-api.version'))
@@ -175,7 +175,7 @@ class DependencyConstraints implements Plugin<Project> {
175175
}
176176
}
177177

178-
dependencySet(group: 'com.fasterxml.jackson.core', version: '2.11.2') {
178+
dependencySet(group: 'com.fasterxml.jackson.core', version: '2.11.3') {
179179
entry('jackson-annotations')
180180
entry('jackson-core')
181181
entry('jackson-databind')
@@ -191,7 +191,7 @@ class DependencyConstraints implements Plugin<Project> {
191191
entry('docker-compose-rule-junit4')
192192
}
193193

194-
dependencySet(group: 'com.pholser', version: '0.9.4') {
194+
dependencySet(group: 'com.pholser', version: '0.9.5') {
195195
entry('junit-quickcheck-core')
196196
entry('junit-quickcheck-generators')
197197
}
@@ -239,7 +239,7 @@ class DependencyConstraints implements Plugin<Project> {
239239
entry('selenium-support')
240240
}
241241

242-
dependencySet(group: 'org.springframework.security', version: '5.4.0') {
242+
dependencySet(group: 'org.springframework.security', version: '5.4.1') {
243243
entry('spring-security-config')
244244
entry('spring-security-core')
245245
entry('spring-security-ldap')

‎geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public class TomcatInstall extends ContainerInstall {
4242
public enum TomcatVersion {
4343
TOMCAT6(6, "tomcat-6.0.37.zip"),
4444
TOMCAT7(7, "tomcat-7.0.106.zip"),
45-
TOMCAT8(8, "tomcat-8.5.58.zip"),
46-
TOMCAT9(9, "tomcat-9.0.38.zip");
45+
TOMCAT8(8, "tomcat-8.5.59.zip"),
46+
TOMCAT9(9, "tomcat-9.0.39.zip");
4747

4848
private final int version;
4949

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* specific code outside of the {@link GenericAppServerVersion}.
3434
*/
3535
public class GenericAppServerInstall extends ContainerInstall {
36-
private static final String JETTY_VERSION = "9.4.31.v20200723";
36+
private static final String JETTY_VERSION = "9.4.32.v20200930";
3737

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

0 commit comments

Comments
 (0)