Author: fanningpj
Date: Wed May 22 08:59:28 2024
New Revision: 1917883
URL: http://svn.apache.org/viewvc?rev=1917883&view=rev
Log:
remove compiled classes
Removed:
xmlbeans/trunk/src/main/java9/module-info.class
xmlbeans/trunk/src/main/java9/org/apache/xmlbeans/impl/tool/MavenPluginResolver.class
Modified:
xmlbeans/trunk/build.gradle
Modified: xmlbeans/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.gradle?rev=1917883&r1=1917882&r2=1917883&view=diff
==============================================================================
--- xmlbeans/trunk/build.gradle (original)
+++ xmlbeans/trunk/build.gradle Wed May 22 08:59:28 2024
@@ -70,6 +70,7 @@ ext {
log4jVersion = '2.23.1'
saxonVersion = '12.4'
androidSdkMinimum = '26'
+ jdkVersion = (project.properties['jdkVersion'] ?: '8') as int
}
def testSchemas = [
@@ -304,8 +305,10 @@ compileTestJava {
task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
- onlyIf { JavaVersion.current() != JavaVersion.VERSION_1_8 }
+ javaCompiler = javaToolchains.compilerFor {
+ languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
+ }
sourceCompatibility = 9
targetCompatibility = 9
destinationDirectory = file('build/classes/java9/main/META-INF/versions/9')
@@ -317,16 +320,6 @@ task compileJava9(type: JavaCompile) {
]
}
-task cacheJava9(type: Copy) {
- dependsOn 'compileJava9'
- onlyIf { JavaVersion.current() != JavaVersion.VERSION_1_8 }
-
- from(file('build/classes/java9/main/META-INF/versions/9'))
- into('src/main/java9')
-}
-
-
-
processTestResources {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
@@ -354,8 +347,7 @@ idea {
}
jar {
- dependsOn 'cacheJava9'
-
+ dependsOn compileJava9
archiveBaseName = "xmlbeans-${XMLBeansVersion}"
from(project.rootDir) {
@@ -372,13 +364,6 @@ jar {
filter { line -> line.replaceAll('@VERSION@', XMLBeansVersion) }
}
- if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
- from('src/main/java9') {
- include '**/*.class'
- into 'META-INF/versions/9'
- }
- }
-
duplicatesStrategy = DuplicatesStrategy.INCLUDE
manifest {
@@ -440,7 +425,6 @@ def buildInfoArtifact = artifacts.add('g
}
rat {
- dependsOn 'cacheJava9'
excludes = [
'tmp',
@@ -633,7 +617,6 @@ generatePomFileForPOIPublication.destina
[binDistTar, binDistZip]*.dependsOn 'jar'
[binDistTar, binDistZip]*.dependsOn 'export4anttest'
[binDistTar, binDistZip]*.dependsOn 'cyclonedxBom'
-[srcDistTar, srcDistZip]*.dependsOn 'cacheJava9'
[srcDistTar, srcDistZip]*.dependsOn 'cyclonedxBom'
[srcDistTar, srcDistZip]*.dependsOn 'javadoc'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
