Skip to content

Commit

Permalink
GEODE-4030, GEODE-3495: Bump dependencies to new versions
Browse files Browse the repository at this point in the history
* Jackson     : 2.8.6 -> 2.9.3
* Jetty       : 9.3.10.v20160621 -> 9.4.8.v20171121
* Spring      :
* - Security  : 4.2.1.RELEASE -> 4.2.3.RELEASE
* - TX        : 4.3.6.RELEASE -> 4.3.13.RELEASE
* - Framework : 4.3.6.RELEASE -> 4.3.13.RELEASE
*
* Log4j / slf4j dependency bump currently blocked by LOG4J2-2152.

This closes [apache#1199]
  • Loading branch information
jdeppe-pivotal committed Dec 22, 2017
1 parent 09026a6 commit 61ba3b6
Show file tree
Hide file tree
Showing 11 changed files with 279 additions and 514 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@

package org.apache.geode.modules.session.junit;

/**
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
* <p/>
* http://www.apache.org/licenses/LICENSE-2.0
* <p/>
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/

import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
Expand Down Expand Up @@ -91,7 +76,7 @@ protected Object createTest() throws Exception {
private void loadClassesWithCustomClassLoader() throws ClassNotFoundException {
String classPath = System.getProperty("java.class.path");
StringTokenizer st = new StringTokenizer(classPath, ":");
List<URL> urls = new ArrayList<URL>();
List<URL> urls = new ArrayList<>();
while (st.hasMoreTokens()) {
String u = st.nextToken();
try {
Expand Down Expand Up @@ -122,7 +107,7 @@ private void loadClassesWithCustomClassLoader() throws ClassNotFoundException {

@Override
protected Statement methodBlock(FrameworkMethod method) {
FrameworkMethod newMethod = null;
FrameworkMethod newMethod;
try {
// Need the class from the custom loader now, so lets load the class.
loadClassesWithCustomClassLoader();
Expand All @@ -132,13 +117,9 @@ protected Statement methodBlock(FrameworkMethod method) {
Method methodFromNewlyLoadedClass =
testClassFromClassLoader.getJavaClass().getMethod(method.getName());
newMethod = new FrameworkMethod(methodFromNewlyLoadedClass);
} catch (ClassNotFoundException e) {
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
// Show any problem nicely as a JUnit Test failure.
return new Fail(e);
} catch (SecurityException e) {
return new Fail(e);
} catch (NoSuchMethodException e) {
return new Fail(e);
}

// We can carry out the normal JUnit functionality with our newly discovered method now.
Expand Down
2 changes: 1 addition & 1 deletion extensions/geode-modules/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
}

disableMavenPublishing()
disableMavenPublishing()
4 changes: 2 additions & 2 deletions geode-assembly/src/main/dist/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@

* Brian Langel

Jackson Core 2.8.6
Jackson Core 2.9.3

# Jackson JSON processor

Expand Down Expand Up @@ -119,7 +119,7 @@ Apache Lucene
Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
source code for this can be found at http://www.eclipse.org/jetty/downloads.php

Spring Framework 4.3.6.RELEASE
Spring Framework 4.3.13.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,45 @@
*/
package org.apache.geode.rest.internal.web.controllers;

import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_TYPE;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_CIPHERS;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_ENABLED;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_KEYSTORE_TYPE;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_PROTOCOLS;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_DEFAULT_ALIAS;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_ALIAS;
import static org.apache.geode.distributed.ConfigurationProperties.SSL_WEB_SERVICE_REQUIRE_AUTHENTICATION;
import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

import java.io.BufferedReader;
import java.io.File;
Expand Down Expand Up @@ -45,6 +82,7 @@
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.SSLContexts;
import org.json.JSONObject;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -585,6 +623,7 @@ public void testSSLWithTLSProtocol() throws Exception {
validateConnection(restEndpoint, "TLS", props);
}

@Ignore("GEODE-3814, GEODE-3891")
@Test
public void testSSLWithTLSv11Protocol() throws Exception {
Properties props = new Properties();
Expand All @@ -594,6 +633,7 @@ public void testSSLWithTLSv11Protocol() throws Exception {
props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
props.setProperty(SSL_KEYSTORE_TYPE, "JKS");
props.setProperty(SSL_PROTOCOLS, "TLSv1.1");
// props.setProperty(SSL_CIPHERS, "TLS_RSA_WITH_AES_256_CBC_SHA");
props.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.WEB.getConstant());

String restEndpoint = startInfraWithSSL(props, false);
Expand Down Expand Up @@ -744,6 +784,7 @@ public void testSSLWithTLSProtocolLegacy() throws Exception {
validateConnection(restEndpoint, "TLS", props);
}

@Ignore("GEODE-3814, GEODE-3891")
@Test
public void testSSLWithTLSv11ProtocolLegacy() throws Exception {
Properties props = new Properties();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
private static final String JETTY_VERSION = "9.4.8.v20171121";

/**
* Get the version number, download URL, and container name of a generic app server using
Expand All @@ -40,9 +41,8 @@ public class GenericAppServerInstall extends ContainerInstall {
* Currently the only supported keyword instance is JETTY9.
*/
public enum GenericAppServerVersion {
JETTY9(9,
"http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.5.v20170502/jetty-distribution-9.4.5.v20170502.zip",
"jetty");
JETTY9(9, "http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/"
+ JETTY_VERSION + "/jetty-distribution-" + JETTY_VERSION + ".zip", "jetty");

private final int version;
private final String downloadURL;
Expand Down
3 changes: 3 additions & 0 deletions geode-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ dependencies {
runtime ('org.fusesource.jansi:jansi:' + project.'jansi.version') {
ext.optional = true
}
runtime 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'

runtime ('org.apache.logging.log4j:log4j-slf4j-impl:' + project.'log4j.version') {
exclude module: 'slf4j-api'
ext.optional = true
}
runtime ('org.apache.logging.log4j:log4j-jcl:' + project.'log4j.version') {
Expand Down
4 changes: 2 additions & 2 deletions geode-pulse/src/main/webapp/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Copyright 2016 AddThis
This product includes software developed by the MX4J
project (http://mx4j.sourceforge.net).

Jackson Core 2.8.6
Jackson Core 2.9.3

# Jackson JSON processor

Expand All @@ -43,7 +43,7 @@ Jackson Core 2.8.6
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.

Spring Framework 4.3.6.RELEASE
Spring Framework 4.3.13.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand Down
4 changes: 2 additions & 2 deletions geode-web-api/src/main/webapp/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@

* Brian Langel

Jackson Core 2.8.6
Jackson Core 2.9.3

# Jackson JSON processor

Expand All @@ -49,7 +49,7 @@ Jackson Core 2.8.6
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.

Spring Framework 4.3.6.RELEASE
Spring Framework 4.3.13.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand Down
2 changes: 1 addition & 1 deletion geode-web/src/main/webapp/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Copyright 2016 AddThis
This product includes software developed by the MX4J
project (http://mx4j.sourceforge.net).

Spring Framework 4.3.6.RELEASE
Spring Framework 4.3.13.RELEASE
Copyright (c) 2002-2017 Pivotal, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand Down
10 changes: 5 additions & 5 deletions gradle/dependency-versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ hamcrest-all.version = 1.3
httpclient.version = 4.5.3
httpcore.version = 4.4.6
httpunit.version = 1.7.2
jackson.version = 2.8.6
jackson.version = 2.9.2
jackson-module-scala_2.10.version = 2.8.6
jansi.version = 1.14
javassist.version = 3.21.0-GA
Expand All @@ -54,7 +54,7 @@ javax.resource-api.version = 1.7
javax.servlet-api.version = 3.1.0
javax.transaction-api.version = 1.2
jedis.version = 2.9.0
jetty.version = 9.3.10.v20160621
jetty.version = 9.4.8.v20171121
jgroups.version = 3.6.10.Final
jmock.version = 2.8.2
jna.version = 4.0.0
Expand Down Expand Up @@ -86,10 +86,10 @@ slf4j-api.version = 1.7.24
snappy-java.version=0.4
spring-hateoas.version = 0.23.0.RELEASE
spring-ldap-core.version = 2.3.1.RELEASE
spring-security.version = 4.2.1.RELEASE
spring-security.version = 4.2.3.RELEASE
spring-shell.version = 1.2.0.RELEASE
spring-tx.version = 4.3.6.RELEASE
springframework.version = 4.3.6.RELEASE
spring-tx.version = 4.3.13.RELEASE
springframework.version = 4.3.13.RELEASE
spymemcached.version = 2.12.2
springfox.version=2.6.1
stephenc-findbugs.version = 1.3.9-1
Expand Down

0 comments on commit 61ba3b6

Please sign in to comment.