Skip to content

Commit 1a1b1f6

Browse files
committed
Main to 3.0; SF to 6.0; JDK 17
Initial Commit for Spring Framework 6.0/JDK 17 * Fix add-opens for java.util.zip; add distributionSha256Sum to gradle.properties. Fix remaining errors of migration to SF-6.0 * Remove `lineSeparator` property for `NewlineAtEndOfFile` Checkstyle rule: Windows checkouts files with a `crlf` line feed * Add `-Dfile.encoding=UTF-8` jmvarg for Gradle: some source files use non-UTF symbols * Upgrade to Kotlin `1.5.31`, JSON Path `2.6.0`, Junit `5.8.1` * Use correct links for external JavaDocs * Add `Xdoclint:syntax` to JavaDoc Gradle task to suppress JavaDoc warnings for classes * Use `DuplicatesStrategy.EXCLUDE` for `prepareAsciidocBuild` task * Align `api` task with SF style Add `Xdoclint:syntax` to `api` Gradle task Turns out `api` task generates fresh common JavaDocs, so it emits the same warnings for missed docs in classes Remove files restored by rebase Fix test Java version Fix build.gradle
1 parent b6466e2 commit 1a1b1f6

29 files changed

+309
-1290
lines changed

.github/workflows/pr-build-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v2
2121

22-
- name: Set up JDK 11
22+
- name: Set up JDK 17
2323
uses: actions/setup-java@v1
2424
with:
25-
java-version: 11
25+
java-version: 17
2626

2727
- name: Run Gradle
2828
uses: burrunan/gradle-cache-action@v1

build.gradle

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext.kotlinVersion = '1.5.31'
33
repositories {
44
mavenCentral()
5-
maven { url 'https://plugins.gradle.org/m2' }
5+
gradlePluginPortal()
66
maven { url 'https://repo.spring.io/plugins-release' }
77
}
88
dependencies {
@@ -49,7 +49,7 @@ ext {
4949
hamcrestVersion = '2.2'
5050
hibernateValidationVersion = '6.2.0.Final'
5151
jacksonBomVersion = '2.13.1'
52-
jaywayJsonPathVersion = '2.4.0'
52+
jaywayJsonPathVersion = '2.6.0'
5353
junit4Version = '4.13.2'
5454
junitJupiterVersion = '5.8.2'
5555
log4jVersion = '2.17.1'
@@ -63,7 +63,7 @@ ext {
6363
reactorVersion = '2020.0.14'
6464
snappyVersion = '1.1.8.4'
6565
springDataCommonsVersion = '2.6.0'
66-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.14'
66+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
6767
springRetryVersion = '1.3.1'
6868
zstdJniVersion = '1.5.0-2'
6969
}
@@ -110,9 +110,9 @@ allprojects {
110110
ext {
111111
expandPlaceholders = '**/quick-tour.xml'
112112
javadocLinks = [
113-
'https://docs.oracle.com/javase/8/docs/api/',
114-
'https://docs.oracle.com/javaee/7/api/',
115-
'https://docs.spring.io/spring/docs/current/javadoc-api/'
113+
'https://docs.oracle.com/en/java/javase/17/docs/api/',
114+
'https://jakarta.ee/specifications/platform/9/apidocs/',
115+
'https://docs.spring.io/spring-framework/docs/current/javadoc-api/'
116116
] as String[]
117117
}
118118

@@ -140,13 +140,13 @@ subprojects { subproject ->
140140
}
141141

142142
compileJava {
143-
sourceCompatibility = 1.8
144-
targetCompatibility = 1.8
143+
sourceCompatibility = 17
144+
targetCompatibility = 17
145145
}
146146

147147
compileTestJava {
148-
sourceCompatibility = 11
149-
targetCompatibility = 11
148+
sourceCompatibility = 17
149+
targetCompatibility = 17
150150
options.encoding = 'UTF-8'
151151
}
152152

@@ -157,7 +157,7 @@ subprojects { subproject ->
157157
}
158158

159159
jacoco {
160-
toolVersion = '0.8.5'
160+
toolVersion = '0.8.7'
161161
}
162162

163163
// dependencies that are common across all java projects
@@ -245,7 +245,16 @@ subprojects { subproject ->
245245
}
246246
}
247247

248-
compileKotlin.dependsOn updateCopyrights
248+
compileKotlin.dependsOn updateCopyrights
249+
250+
tasks.withType(JavaForkOptions) {
251+
jvmArgs '--add-opens', 'java.base/java.util.zip=ALL-UNNAMED'
252+
}
253+
254+
tasks.withType(Javadoc) {
255+
options.addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
256+
options.addBooleanOption('Werror', true) // fail build on Javadoc warnings
257+
}
249258

250259
test {
251260
maxHeapSize = '2g'
@@ -394,7 +403,7 @@ project('spring-rabbit') {
394403

395404
compileTestKotlin {
396405
kotlinOptions {
397-
jvmTarget = '11'
406+
jvmTarget = '16'
398407
}
399408
}
400409

@@ -553,12 +562,17 @@ task api(type: Javadoc) {
553562
group = 'Documentation'
554563
description = 'Generates aggregated Javadoc API documentation.'
555564
title = "${rootProject.description} ${version} API"
556-
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
557-
options.author = true
558-
options.header = rootProject.description
559-
options.overview = 'src/api/overview.html'
560-
options.stylesheetFile = file('src/api/stylesheet.css')
561-
options.links(rootProject.ext.javadocLinks)
565+
options {
566+
encoding = 'UTF-8'
567+
memberLevel = JavadocMemberLevel.PROTECTED
568+
author = true
569+
header = rootProject.description
570+
use = true
571+
overview = 'src/api/overview.html'
572+
splitIndex = true
573+
links(project.ext.javadocLinks)
574+
addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
575+
}
562576

563577
source subprojects.collect { project ->
564578
project.sourceSets.main.allJava

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
version=2.4.2-SNAPSHOT
1+
version=3.0.0-SNAPSHOT
2+
org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8
23
org.gradlee.caching=true
34
org.gradle.jvmargs=-Xms512m -Xmx4g
45
org.gradle.daemon=true

spring-amqp/src/main/java/org/springframework/amqp/remoting/client/AmqpClientInterceptor.java

Lines changed: 0 additions & 129 deletions
This file was deleted.

spring-amqp/src/main/java/org/springframework/amqp/remoting/client/AmqpProxyFactoryBean.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

spring-amqp/src/main/java/org/springframework/amqp/remoting/client/package-info.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)