a247b83cd9
Prior to this commit, the Spring Framework projects could not be imported into Eclipse IDE when using JDK 17 to build the projects. The primary obstacle is the fact that Eclipse enforces a strict "no split packages between the unnamed module and a system module" rule when building with a "modular JDK" (such as JDK 17). Resources: - https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928 - https://bugs.openjdk.java.net/browse/JDK-8215739 - http://mail.openjdk.java.net/pipermail/jigsaw-dev/2018-December/014077.html - https://stackoverflow.com/questions/51094274/eclipse-cant-find-xml-related-classes-after-switching-build-path-to-jdk-10/53824670#53824670 Since the bug (JDK-8215739) has not been fixed in OpenJDK, the strict "no split packages" rule does not apply to the Java compiler used in Spring Framework's Gradle build or the compiler in IntelliJ IDEA. Hence, this issue only arrises when building the framework in Eclipse IDE. This commit addresses this issue in the following affected projects. - spring-oxm: removal of the dependency on XPP3 which publishes javax.xml.namespace.QName as part of the JAR. The QName type is also published by the java.xml JDK 17 system module. To make the tests pass, we have switched to using the DomDriver instead of the XppDriver in our XStream tests. - spring-test: HtmlUnit has a transitive dependency on xml-apis which publishes several packages also published by java.xml JDK 17 system module. Thus, we have explicitly excluded the transitive dependency on xml-apis for our `optional` configuration. See gh-27407
89 lines
3.1 KiB
Groovy
89 lines
3.1 KiB
Groovy
import org.gradle.plugins.ide.eclipse.model.ProjectDependency
|
|
import org.gradle.plugins.ide.eclipse.model.SourceFolder
|
|
|
|
apply plugin: 'eclipse'
|
|
|
|
eclipse.jdt {
|
|
sourceCompatibility = 17
|
|
targetCompatibility = 17
|
|
}
|
|
|
|
// Replace classpath entries with project dependencies (GRADLE-1116)
|
|
// https://issues.gradle.org/browse/GRADLE-1116
|
|
eclipse.classpath.file.whenMerged { classpath ->
|
|
def regexp = /.*?\/([^\/]+)\/build\/([^\/]+\/)+(?:main|test)/ // only match those that end in main or test (avoids removing necessary entries like build/classes/jaxb)
|
|
def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp }
|
|
projectOutputDependencies.each { entry ->
|
|
def matcher = (entry.path =~ regexp)
|
|
if (matcher) {
|
|
def projectName = matcher[0][1]
|
|
def path = "/${projectName}"
|
|
if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
|
|
def recursiveDependency = entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')
|
|
// Avoid recursive dependency on current project.
|
|
if (!recursiveDependency) {
|
|
classpath.entries.add(new ProjectDependency(path))
|
|
}
|
|
}
|
|
classpath.entries.remove(entry)
|
|
}
|
|
}
|
|
|
|
// Remove any remaining direct depencencies on JARs in the build/libs folder
|
|
// except Spring's spring-cglib-repack and spring-objenesis-repack JARs.
|
|
classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
|
|
}
|
|
|
|
// Use separate main/test outputs (prevents WTP from packaging test classes)
|
|
eclipse.classpath.defaultOutputDir = file(project.name + '/bin/eclipse')
|
|
eclipse.classpath.file.beforeMerged { classpath ->
|
|
classpath.entries.findAll{ it instanceof SourceFolder }.each {
|
|
if (it.output.startsWith('bin/')) {
|
|
it.output = null
|
|
}
|
|
}
|
|
}
|
|
eclipse.classpath.file.whenMerged {
|
|
entries.findAll{ it instanceof SourceFolder }.each {
|
|
it.output = 'bin/' + it.path.split('/')[1]
|
|
}
|
|
}
|
|
|
|
// Ensure project dependencies come after 3rd-party libs (SPR-11836)
|
|
// https://jira.spring.io/browse/SPR-11836
|
|
eclipse.classpath.file.whenMerged {
|
|
entries.findAll { it instanceof ProjectDependency }.each {
|
|
// delete from original position
|
|
entries.remove(it)
|
|
// append to end of classpath
|
|
entries.add(it)
|
|
}
|
|
}
|
|
|
|
// Ensure that JMH sources and resources are treated as test classpath entries
|
|
// so that they can see test fixtures.
|
|
// https://github.com/melix/jmh-gradle-plugin/issues/157
|
|
eclipse.classpath.file.whenMerged {
|
|
entries.findAll { it.path =~ /src\/jmh\/(java|resources)/ }.each {
|
|
it.entryAttributes['test'] = 'true'
|
|
}
|
|
}
|
|
|
|
// Include project specific settings
|
|
task eclipseSettings(type: Copy) {
|
|
from rootProject.files(
|
|
'src/eclipse/org.eclipse.jdt.core.prefs',
|
|
'src/eclipse/org.eclipse.jdt.ui.prefs')
|
|
into project.file('.settings/')
|
|
outputs.upToDateWhen { false }
|
|
}
|
|
|
|
task cleanEclipseSettings(type: Delete) {
|
|
delete project.file('.settings/org.eclipse.jdt.core.prefs')
|
|
delete project.file('.settings/org.eclipse.jdt.ui.prefs')
|
|
}
|
|
|
|
tasks['eclipse'].dependsOn(eclipseSettings)
|
|
tasks['eclipseJdt'].dependsOn(eclipseSettings)
|
|
tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
|