From 43d80732569a1e49628e87aa78796eff95a0405b Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Mon, 10 Apr 2017 17:02:03 -0500 Subject: [PATCH] Upgrade dependencies to Spring 5 compatible versions. Require Java 8. --- build.gradle | 79 ++++----------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- .../build.gradle | 42 ++++---- spring-cloud-heroku-connector/build.gradle | 2 +- .../build.gradle | 4 +- .../build.gradle | 92 +++++++++++------- .../MongoDbFactoryCloudConfigTestHelper.java | 2 +- .../MongoServiceConnectorCreatorTest.java | 22 +++-- 10 files changed, 117 insertions(+), 132 deletions(-) diff --git a/build.gradle b/build.gradle index 979d677..3ea4bb8 100644 --- a/build.gradle +++ b/build.gradle @@ -4,50 +4,23 @@ description = "Spring Cloud" buildscript { repositories { + mavenCentral() jcenter() maven { url 'https://repo.spring.io/plugins-release' } } dependencies { - classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' - classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE' + classpath 'io.spring.gradle:propdeps-plugin:0.0.8' + classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE' classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3' } } ext { - springVersion = "3.1.4.RELEASE" - tomcatVersion = "7.0.53" - - springAmqpVersion = "1.1.1.RELEASE" - - springDataMongoVersion = "1.4.3.RELEASE" - mongoDriverVersion = "2.11.4" - - springDataRedisVersion = "1.1.1.RELEASE" - jedisVersion = "2.1.0" - lettuceVersion = "3.4.3.Final" - - commonDbcpVersion = "1.4" - commonDbcp2Version = "2.0" - - mysqlDriverVersion = "5.1.29" - mariadbDriverVersion = "1.1.3" - postgresDriverVersion = "9.0-801.jdbc4" - - javaxMailVersion = "1.4.7" - - cglibVersion = "3.1" - - jacksonVersion = "2.3.3" - - junitVersion = "4.11" - mockitoVersion = "1.9.5" - eurekaClientVersion = "1.1.135" - hadoopCommonVersion = "2.2.0" + junitVersion = "4.12" + mockitoVersion = "2.7.22" javadocLinks = [ - 'http://docs.oracle.com/javase/7/docs/api/', - 'http://docs.oracle.com/javaee/6/api/', + 'http://docs.oracle.com/javase/8/docs/api/', 'http://docs.spring.io/spring/docs/current/javadoc-api/', 'http://docs.spring.io/spring-amqp/docs/latest-ga/api/', 'http://docs.spring.io/spring-data/data-mongo/docs/current/api/', @@ -96,8 +69,8 @@ subprojects { } } - sourceCompatibility = 1.6 - targetCompatibility = 1.6 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 javadoc { options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED @@ -126,7 +99,9 @@ subprojects { } repositories { + mavenCentral() maven { url "https://repo.spring.io/libs-milestone" } + maven { url "https://repo.spring.io/libs-snapshot" } } } @@ -197,33 +172,13 @@ configure(rootProject) { ext { matrix = [ - "driver211-mongo14": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.4.3.RELEASE"], - "driver211-mongo15": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.5.5.RELEASE"], - "driver211-mongo16": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.6.3.RELEASE"], - "driver213-mongo17": [mongoDriverVersion: "2.13.0", springDataMongoVersion: "1.7.2.RELEASE"], - "driver214-mongo18": [mongoDriverVersion: "2.13.0", springDataMongoVersion: "1.8.4.RELEASE"], - "driver214-mongo19": [mongoDriverVersion: "2.14.0", springDataMongoVersion: "1.9.2.RELEASE"], - "driver32-mongo19" : [mongoDriverVersion: "3.2.2", springDataMongoVersion: "1.9.2.RELEASE"], - "jedis25-redis14" : [jedisVersion: "2.5.2", springDataRedisVersion: "1.4.4.RELEASE"], - "jedis26-redis15" : [jedisVersion: "2.6.3", springDataRedisVersion: "1.5.2.RELEASE"], - "jedis27-redis16" : [jedisVersion: "2.7.3", springDataRedisVersion: "1.6.4.RELEASE"], - "jedis28-redis17" : [jedisVersion: "2.8.1", springDataRedisVersion: "1.7.2.RELEASE"], -// "lettuce34-redis15": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.5.2.RELEASE"], -// "lettuce34-redis16": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.6.4.RELEASE"], -// "lettuce34-redis17": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.7.2.RELEASE"], - "amqp11" : [springAmqpVersion: "1.1.4.RELEASE"], - "amqp12" : [springAmqpVersion: "1.2.2.RELEASE"], - "amqp13" : [springAmqpVersion: "1.3.9.RELEASE"], - "amqp14" : [springAmqpVersion: "1.4.6.RELEASE"], - "amqp15" : [springAmqpVersion: "1.5.6.RELEASE"], - "amqp16" : [springAmqpVersion: "1.6.0.RELEASE"], - "spring32" : [springVersion: "3.2.17.RELEASE"], - "spring40" : [springVersion: "4.0.9.RELEASE"], - "spring41" : [springVersion: "4.1.9.RELEASE"], - "spring42" : [springVersion: "4.2.6.RELEASE"], - "spring43" : [springVersion: "4.3.0.RELEASE"], - "tomcat7" : [tomcatVersion: "7.0.53"], - "tomcat8" : [tomcatVersion: "8.0.24"], + "driver34-mongo20" : [mongoDriverVersion: "3.4.2", springDataMongoVersion: "2.0.0.M1"], + "jedis29-redis20" : [jedisVersion: "2.9.0", springDataRedisVersion: "2.0.0.M5"], + "lettuce43-redis20" : [lettuceVersion: "4.3.1.Final", springDataRedisVersion: "2.0.0.M5"], + "amqp20" : [springAmqpVersion: "2.0.0.M3"], + "spring50" : [springVersion: "5.0.0.RELEASE"], + "tomcat80" : [tomcatVersion: "8.0.43"], + "tomcat85" : [tomcatVersion: "8.5.13"], ] } diff --git a/gradle.properties b/gradle.properties index c8184a5..8a1238c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=1.2.4.BUILD-SNAPSHOT +version=2.0.0.BUILD-SNAPSHOT group=org.springframework.cloud diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 941144813d241db74e1bf25b6804c679fbe7f0a3..13372aef5e24af05341d49695ee84e5f9b594659 100644 GIT binary patch delta 1239 zcmZo!%-ph=nK!_jnT3mifrEoVYtz(;ylT8a%KiG(8A0|83=E+Y9fCz9nZAB1Vq`!l z6ay+;uE-3cPHTXvZw4T0vL@q05WSg~sh9~Y(9H52ERf5(1T3&wghQAOETYAC6C%PU zXut{yi zcUjN>JuPF&vh)zstp(jXSw5}N&DU7wQkEuonMJRjE$UOWu9)qmIg;~kmtXJ_YDML!#U zLG*uXy2=g~IoEZOQ4plfC?|ZI7ZU>m3s9@urNtTE2}1EY-b+8RC|S>pwuGS~kT(?0d4=5u!$8#|4PU@0}q`V2jtvpbqMPUKacAZLxh?ZvEyLuu`|X7>Q;gAM`vcm{TEI}tJz#>G zM<%a3UX2h$P<&A@cvK|3%#>7XB&eta+=Ootxw1=C9pMS$o@hvUH9#KU0j zh{Odr3HhKM`Ui~ay#mjB}b delta 1239 zcmZ9LYfO_@7{^chQmNFU2sj~{)(I-iX>DPd65F~OP%bS^Zz_UdOJN&KK`x1Acq7gm zVdZ#cC*@~N20ouzMaJ5=`egiapDHFYDaSDG+o+SI zm?U<)RN|1P7_q!iD%{Ov6&~yj2AHkJ<8KSaM>X5Nafz37PhLze{m5(<-Fa@jbvquzvuKelC$nkkT{{cdM-3hckthBr4aHiL?{g!H$LFu zMMJUl58W9QpIw`0tu6t-`Bf49;fv{#recNj6N>p8xZIiY|388|oT=fAd6feakncEbi6wgSmM?Ke{p947xt1oORo;} zyX0 addresses = extractServerAddresses(mongo); + List addresses = extractServerAddresses(mongoClient); assertEquals(1, addresses.size()); ServerAddress address = addresses.get(0); @@ -74,16 +72,14 @@ public class MongoServiceConnectorCreatorTest { MongoServiceInfo serviceInfo = new MongoServiceInfo("id", uri); MongoDbFactory mongoDbFactory = testCreator.create(serviceInfo, null); - assertNotNull(mongoDbFactory); - MongoClient mongo = (MongoClient) ReflectionTestUtils.getField(mongoDbFactory, "mongo"); - assertNotNull(mongo); + MongoClient mongoClient = getMongoClientField(mongoDbFactory); - List addresses = extractServerAddresses(mongo); + List addresses = extractServerAddresses(mongoClient); assertEquals(3, addresses.size()); - MongoCredential credentials = mongo.getCredentialsList().get(0); + MongoCredential credentials = mongoClient.getCredentialsList().get(0); assertEquals(TEST_USERNAME, credentials.getUserName()); assertNotNull(credentials.getPassword()); @@ -117,4 +113,10 @@ public class MongoServiceConnectorCreatorTest { return client.getAllAddress(); } + private MongoClient getMongoClientField(MongoDbFactory mongoDbFactory) { + MongoClient mongo = (MongoClient) ReflectionTestUtils.getField(mongoDbFactory, "mongoClient"); + assertNotNull(mongo); + return mongo; + } + }