Skip to content

Commit a0974c8

Browse files
authored
Merge pull request #400 from yidongnan/bump-versions
Update dependencies, plugins, gradle and move to 2.10.0-SNAPSHOT
2 parents be6a5e9 + 82c95fa commit a0974c8

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@ buildscript {
99
}
1010
}
1111
ext {
12-
projectVersion = '2.9.0.RELEASE'
12+
projectVersion = '2.10.0-SNAPSHOT'
1313

1414
// https://github.com/grpc/grpc-java/releases
15-
grpcVersion = '1.30.0'
15+
grpcVersion = '1.31.0'
1616
// https://github.com/protocolbuffers/protobuf/releases
17-
protobufVersion = '3.12.2'
18-
protobufGradlePluginVersion = '0.8.11'
17+
protobufVersion = '3.12.4'
18+
protobufGradlePluginVersion = '0.8.12'
1919

2020
// https://github.com/spring-projects/spring-boot/releases
21-
springBootVersion = '2.3.1.RELEASE'
21+
springBootVersion = '2.3.2.RELEASE'
2222
// https://github.com/spring-cloud/spring-cloud-release/releases
23-
springCloudVersion = 'Hoxton.SR5'
23+
springCloudVersion = 'Hoxton.SR7'
2424
// https://github.com/alibaba/spring-cloud-alibaba/releases
2525
springCloudAlibabaNacosVersion = '2.2.1.RELEASE'
2626
// https://github.com/spring-projects/spring-security-oauth/releases/tag/2.5.0.RELEASE
2727
springSecurityOAuthVersion = '2.5.0.RELEASE'
2828

29-
lombokPluginVersion = '3.2.0'
30-
versioningPluginVersion = '2.10.0'
31-
versionsPluginVersion = '0.27.0'
29+
lombokPluginVersion = '4.0.0'
30+
versioningPluginVersion = '2.14.0'
31+
versionsPluginVersion = '0.29.0'
3232
}
3333
}
3434

3535
plugins {
3636
id 'java'
3737
id 'java-library'
3838
// future improvement would be to use the version declared above in the ext block instead of repeating it here
39-
id 'org.springframework.boot' version '2.3.1.RELEASE' apply false
39+
id 'org.springframework.boot' version '2.3.2.RELEASE' apply false
4040
id 'io.spring.dependency-management' version '1.0.9.RELEASE'
41-
id 'net.nemerosa.versioning' version '2.13.1'
41+
id 'net.nemerosa.versioning' version '2.14.0'
4242
id 'com.google.protobuf' version '0.8.12'
4343
id 'io.franzbecker.gradle-lombok' version '4.0.0' apply false
44-
id 'com.github.ben-manes.versions' version '0.28.0' // gradle dependencyUpdates (Takes quite some time)
45-
id 'com.diffplug.gradle.spotless' version '4.3.0'
44+
id 'com.github.ben-manes.versions' version '0.29.0' // gradle dependencyUpdates (Takes quite some time)
45+
id 'com.diffplug.spotless' version '5.1.0'
4646
}
4747

4848
// If you attempt to build without the `--scan` parameter in `gradle 6.0+` it will cause a build error that it can't find
@@ -58,7 +58,7 @@ if (hasProperty('buildScan')) {
5858
wrapper {
5959
// Update using:
6060
// ./gradlew wrapper --gradle-version=6.5 --distribution-type=bin
61-
gradleVersion = '6.5'
61+
gradleVersion = '6.5.1'
6262
}
6363

6464
def buildTimeAndDate = OffsetDateTime.now()
@@ -74,7 +74,7 @@ allprojects {
7474
apply plugin: 'idea'
7575
apply plugin: 'eclipse'
7676
apply plugin: 'io.spring.dependency-management'
77-
apply plugin: 'com.diffplug.gradle.spotless'
77+
apply plugin: 'com.diffplug.spotless'
7878
apply plugin: 'io.franzbecker.gradle-lombok'
7979

8080
compileJava {
@@ -233,7 +233,7 @@ allprojects { project ->
233233
'https://static.javadoc.io/org.springframework.cloud/spring-cloud-commons/' + springCloudCommonsVersion + '/',
234234
// 'https://static.javadoc.io/io.zipkin.brave/brave/' + braveInstrumentationGrpc + '/', // Requires javadoc 11
235235
// 'https://static.javadoc.io/io.zipkin.brave/brave-instrumentation-grpc/' + braveInstrumentationGrpc + '/', // Requires javadoc 11
236-
'https://google.github.io/guava/releases/26.0-android/api/docs/'
236+
'https://google.github.io/guava/releases/29.0-android/api/docs/'
237237
]
238238
}
239239
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)