Skip to content

Commit 2a89149

Browse files
committed
Version plugin + latest dependencies
1 parent cfa343a commit 2a89149

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

annotations/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ signing {
7070
}
7171

7272
javadoc {
73-
if(JavaVersion.current().isJava9Compatible()) {
74-
options.addBooleanOption('html5', true)
75-
}
7673
options.links = [
7774
"https://docs.spring.io/spring/docs/5.0.0.RELEASE/javadoc-api/"
7875
]

build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*/
88

99
plugins {
10-
// Apply the java-library plugin to add support for Java Library
1110
id 'java-library'
1211
id 'jacoco'
1312
id 'maven-publish'
1413
id 'signing'
14+
id "com.github.ben-manes.versions" version "0.36.0"
1515
}
1616

1717
allprojects {
@@ -33,9 +33,10 @@ subprojects {
3333
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
3434
}
3535

36-
compileJava {
37-
sourceCompatibility '1.8'
38-
targetCompatibility '1.8'
36+
java {
37+
toolchain {
38+
languageVersion.set(JavaLanguageVersion.of(8))
39+
}
3940
}
4041

4142
test {
@@ -58,6 +59,6 @@ subprojects {
5859
}
5960

6061
wrapper {
61-
gradleVersion = '6.8.2'
62+
gradleVersion = '6.8.3'
6263
}
6364

docs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'org.asciidoctor.jvm.convert' version '3.2.0'
2+
id 'org.asciidoctor.jvm.convert' version '3.3.2'
33
}
44

55
asciidoctor {

extensions/build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
testImplementation 'org.assertj:assertj-core:3.19.0'
1111
testImplementation 'commons-io:commons-io:2.8.0'
1212
testImplementation 'com.google.guava:guava:30.1-jre'
13-
testImplementation 'org.mockito:mockito-junit-jupiter:3.7.7'
13+
testImplementation 'org.mockito:mockito-junit-jupiter:3.8.0'
1414
testImplementation 'org.springframework:spring-core:5.0.0.RELEASE'
1515
}
1616

@@ -74,10 +74,4 @@ publishing {
7474
signing {
7575
useGpgCmd()
7676
sign publishing.publications.mavenJava
77-
}
78-
79-
javadoc {
80-
if(JavaVersion.current().isJava9Compatible()) {
81-
options.addBooleanOption('html5', true)
82-
}
8377
}
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.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)