Polish .gradle file formatting to use tabs
Replace spaces with tabs for consistency with Java source code
This commit is contained in:
Phillip Webb
parent
756bff8e0a
commit
a268528726
1442
build.gradle
1442
build.gradle
File diff suppressed because it is too large
Load Diff
|
|
@ -1,26 +1,26 @@
|
|||
import org.gradle.plugins.ide.eclipse.model.ProjectDependency
|
||||
|
||||
eclipse.classpath.file.whenMerged { classpath ->
|
||||
// servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
|
||||
// exported to dependent projects in Eclipse to avoid false compilation errors due
|
||||
// to changing APIs across these versions
|
||||
classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
|
||||
// servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
|
||||
// exported to dependent projects in Eclipse to avoid false compilation errors due
|
||||
// to changing APIs across these versions
|
||||
classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
|
||||
|
||||
// GRADLE-1116
|
||||
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 dependency = new ProjectDependency(path, project(":${projectName}").path)
|
||||
dependency.exported = true
|
||||
classpath.entries.add(dependency)
|
||||
}
|
||||
classpath.entries.remove(entry)
|
||||
}
|
||||
}
|
||||
classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
|
||||
}
|
||||
// GRADLE-1116
|
||||
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 dependency = new ProjectDependency(path, project(":${projectName}").path)
|
||||
dependency.exported = true
|
||||
classpath.entries.add(dependency)
|
||||
}
|
||||
classpath.entries.remove(entry)
|
||||
}
|
||||
}
|
||||
classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,64 +11,64 @@
|
|||
* @param OLD_VERSION_ROOT required, typically pointing to a separate git clone dir
|
||||
*/
|
||||
task jdiff {
|
||||
description = 'Generates a JDiff report'
|
||||
group = 'Documentation'
|
||||
description = 'Generates a JDiff report'
|
||||
group = 'Documentation'
|
||||
|
||||
def jdiffHome = "${rootProject.rootDir}/gradle/jdiff"
|
||||
def jdiffHome = "${rootProject.rootDir}/gradle/jdiff"
|
||||
|
||||
ant.taskdef(
|
||||
name: 'jdiff',
|
||||
classname: 'jdiff.JDiffAntTask',
|
||||
classpath: "${jdiffHome}/antjdiff.jar")
|
||||
ant.taskdef(
|
||||
name: 'jdiff',
|
||||
classname: 'jdiff.JDiffAntTask',
|
||||
classpath: "${jdiffHome}/antjdiff.jar")
|
||||
|
||||
def previousVersion = rootProject.previousVersion
|
||||
def previousVersion = rootProject.previousVersion
|
||||
|
||||
def currentVersion = rootProject.version
|
||||
def currentVersionRoot = rootProject.rootDir
|
||||
def currentVersion = rootProject.version
|
||||
def currentVersionRoot = rootProject.rootDir
|
||||
|
||||
def oldVersion = System.getProperty("OLD_VERSION") ?: previousVersion
|
||||
def oldVersionRoot = System.getProperty("OLD_VERSION_ROOT")
|
||||
def oldVersion = System.getProperty("OLD_VERSION") ?: previousVersion
|
||||
def oldVersionRoot = System.getProperty("OLD_VERSION_ROOT")
|
||||
|
||||
def outputDir = "${rootProject.buildDir}/reports/jdiff/${oldVersion}_to_${currentVersion}"
|
||||
def outputDir = "${rootProject.buildDir}/reports/jdiff/${oldVersion}_to_${currentVersion}"
|
||||
|
||||
doLast {
|
||||
if (oldVersionRoot == null)
|
||||
throw new IllegalArgumentException(
|
||||
"Set OLD_VERSION_ROOT property to indicate the root directory for ${oldVersion}")
|
||||
doLast {
|
||||
if (oldVersionRoot == null)
|
||||
throw new IllegalArgumentException(
|
||||
"Set OLD_VERSION_ROOT property to indicate the root directory for ${oldVersion}")
|
||||
|
||||
oldVersionRoot = new File(oldVersionRoot)
|
||||
oldVersionRoot = new File(oldVersionRoot)
|
||||
|
||||
ant.property(name: 'JDIFF_HOME', value: jdiffHome)
|
||||
ant.mkdir(dir: outputDir)
|
||||
ant.jdiff(
|
||||
destdir: outputDir,
|
||||
verbose: 'off',
|
||||
stats: 'on',
|
||||
docchanges: 'on') {
|
||||
old(name: "Spring Framework ${oldVersion}") {
|
||||
oldVersionRoot.eachDirMatch( {
|
||||
def candidate = new File(it)
|
||||
candidate.name.matches("org.springframework.*") ||
|
||||
candidate.name.matches("spring-.*") }) { match ->
|
||||
match.eachDirRecurse { subdir ->
|
||||
if (subdir.path ==~ '.*/src/main/java$') {
|
||||
dirset(dir: subdir.path, includes: 'org/**')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'new'(name: "Spring Framework ${currentVersion}") {
|
||||
currentVersionRoot.eachDirMatch( {
|
||||
def candidate = new File(it)
|
||||
candidate.name.matches("org.springframework.*") ||
|
||||
candidate.name.matches("spring-.*") }) { match ->
|
||||
match.eachDirRecurse { subdir ->
|
||||
if (subdir.path ==~ '.*/src/main/java$') {
|
||||
dirset(dir: subdir.path, includes: 'org/**')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ant.property(name: 'JDIFF_HOME', value: jdiffHome)
|
||||
ant.mkdir(dir: outputDir)
|
||||
ant.jdiff(
|
||||
destdir: outputDir,
|
||||
verbose: 'off',
|
||||
stats: 'on',
|
||||
docchanges: 'on') {
|
||||
old(name: "Spring Framework ${oldVersion}") {
|
||||
oldVersionRoot.eachDirMatch( {
|
||||
def candidate = new File(it)
|
||||
candidate.name.matches("org.springframework.*") ||
|
||||
candidate.name.matches("spring-.*") }) { match ->
|
||||
match.eachDirRecurse { subdir ->
|
||||
if (subdir.path ==~ '.*/src/main/java$') {
|
||||
dirset(dir: subdir.path, includes: 'org/**')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'new'(name: "Spring Framework ${currentVersion}") {
|
||||
currentVersionRoot.eachDirMatch( {
|
||||
def candidate = new File(it)
|
||||
candidate.name.matches("org.springframework.*") ||
|
||||
candidate.name.matches("spring-.*") }) { match ->
|
||||
match.eachDirRecurse { subdir ->
|
||||
if (subdir.path ==~ '.*/src/main/java$') {
|
||||
dirset(dir: subdir.path, includes: 'org/**')
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,43 +22,43 @@ def mergeFromProject = project
|
|||
// invoking a task on mergeFromProject will invoke the task with the same name on mergeIntoProject
|
||||
def taskNamesToMerge = ['sourcesJar','jar','javadocJar','javadoc','install','artifactoryPublish']
|
||||
taskNamesToMerge.each { taskName ->
|
||||
def taskToRemove = mergeFromProject.tasks.findByPath(taskName)
|
||||
if(taskToRemove) {
|
||||
taskToRemove.enabled = false
|
||||
taskToRemove.dependsOn mergeIntoProject."$taskName"
|
||||
}
|
||||
def taskToRemove = mergeFromProject.tasks.findByPath(taskName)
|
||||
if(taskToRemove) {
|
||||
taskToRemove.enabled = false
|
||||
taskToRemove.dependsOn mergeIntoProject."$taskName"
|
||||
}
|
||||
}
|
||||
|
||||
// update mergeIntoProject artifacts to contain the mergeFromProject artifact contents
|
||||
mergeIntoProject."sourcesJar" {
|
||||
from mergeFromProject.sourcesJar.source
|
||||
from mergeFromProject.sourcesJar.source
|
||||
}
|
||||
mergeIntoProject."jar" {
|
||||
from mergeFromProject.jar.source
|
||||
from mergeFromProject.jar.source
|
||||
}
|
||||
mergeIntoProject."javadoc" {
|
||||
source += mergeFromProject.javadoc.source
|
||||
classpath += mergeFromProject.javadoc.classpath
|
||||
source += mergeFromProject.javadoc.source
|
||||
classpath += mergeFromProject.javadoc.classpath
|
||||
}
|
||||
|
||||
// Update mergeIntoProject to contain additional configurations that contains all the dependencies from mergeFromProject
|
||||
// so that Maven pom generation works
|
||||
gradle.taskGraph.whenReady {
|
||||
mergeFromProject.configurations.archives.artifacts.clear()
|
||||
mergeFromProject.configurations.archives.artifacts.clear()
|
||||
|
||||
mergeFromProject.configurations.each { config->
|
||||
def mapping = mergeFromProject.conf2ScopeMappings.getMapping([config])
|
||||
if(mapping.scope) {
|
||||
def newConfigName = mergeFromProject.name + "-"+ config.name
|
||||
mergeIntoProject.configurations.add(newConfigName)
|
||||
config.dependencies.each { dependency ->
|
||||
mergeIntoProject.dependencies.add(newConfigName, dependency)
|
||||
}
|
||||
configure(mergeIntoProject.install.repositories.mavenInstaller.pom.scopeMappings) {
|
||||
addMapping(mapping.priority + 100, mergeIntoProject.configurations."$newConfigName", mapping.scope)
|
||||
}
|
||||
mergeIntoProject.optionalDeps += mergeFromProject.optionalDeps
|
||||
mergeIntoProject.providedDeps += mergeFromProject.providedDeps
|
||||
}
|
||||
}
|
||||
mergeFromProject.configurations.each { config->
|
||||
def mapping = mergeFromProject.conf2ScopeMappings.getMapping([config])
|
||||
if(mapping.scope) {
|
||||
def newConfigName = mergeFromProject.name + "-"+ config.name
|
||||
mergeIntoProject.configurations.add(newConfigName)
|
||||
config.dependencies.each { dependency ->
|
||||
mergeIntoProject.dependencies.add(newConfigName, dependency)
|
||||
}
|
||||
configure(mergeIntoProject.install.repositories.mavenInstaller.pom.scopeMappings) {
|
||||
addMapping(mapping.priority + 100, mergeIntoProject.configurations."$newConfigName", mapping.scope)
|
||||
}
|
||||
mergeIntoProject.optionalDeps += mergeFromProject.optionalDeps
|
||||
mergeIntoProject.providedDeps += mergeFromProject.providedDeps
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,54 +7,54 @@ ext.optional = { optionalDeps << it }
|
|||
ext.provided = { providedDeps << it }
|
||||
|
||||
install {
|
||||
repositories.mavenInstaller {
|
||||
customizePom(pom, project)
|
||||
}
|
||||
repositories.mavenInstaller {
|
||||
customizePom(pom, project)
|
||||
}
|
||||
}
|
||||
|
||||
def customizePom(pom, gradleProject) {
|
||||
pom.whenConfigured { generatedPom ->
|
||||
// respect 'optional' and 'provided' dependencies
|
||||
gradleProject.optionalDeps.each { dep ->
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
|
||||
}
|
||||
gradleProject.providedDeps.each { dep ->
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
|
||||
}
|
||||
pom.whenConfigured { generatedPom ->
|
||||
// respect 'optional' and 'provided' dependencies
|
||||
gradleProject.optionalDeps.each { dep ->
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
|
||||
}
|
||||
gradleProject.providedDeps.each { dep ->
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
|
||||
}
|
||||
|
||||
// eliminate test-scoped dependencies (no need in maven central poms)
|
||||
generatedPom.dependencies.removeAll { dep ->
|
||||
dep.scope == 'test'
|
||||
}
|
||||
// eliminate test-scoped dependencies (no need in maven central poms)
|
||||
generatedPom.dependencies.removeAll { dep ->
|
||||
dep.scope == 'test'
|
||||
}
|
||||
|
||||
// add all items necessary for maven central publication
|
||||
generatedPom.project {
|
||||
name = gradleProject.description
|
||||
description = gradleProject.description
|
||||
url = 'https://github.com/SpringSource/spring-framework'
|
||||
organization {
|
||||
name = 'SpringSource'
|
||||
url = 'http://springsource.org/spring-framework'
|
||||
}
|
||||
licenses {
|
||||
license {
|
||||
name 'The Apache Software License, Version 2.0'
|
||||
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
distribution 'repo'
|
||||
}
|
||||
}
|
||||
scm {
|
||||
url = 'https://github.com/SpringSource/spring-framework'
|
||||
connection = 'scm:git:git://github.com/SpringSource/spring-framework'
|
||||
developerConnection = 'scm:git:git://github.com/SpringSource/spring-framework'
|
||||
}
|
||||
developers {
|
||||
developer {
|
||||
id = 'jhoeller'
|
||||
name = 'Juergen Hoeller'
|
||||
email = 'jhoeller@vmware.com'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// add all items necessary for maven central publication
|
||||
generatedPom.project {
|
||||
name = gradleProject.description
|
||||
description = gradleProject.description
|
||||
url = 'https://github.com/SpringSource/spring-framework'
|
||||
organization {
|
||||
name = 'SpringSource'
|
||||
url = 'http://springsource.org/spring-framework'
|
||||
}
|
||||
licenses {
|
||||
license {
|
||||
name 'The Apache Software License, Version 2.0'
|
||||
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
distribution 'repo'
|
||||
}
|
||||
}
|
||||
scm {
|
||||
url = 'https://github.com/SpringSource/spring-framework'
|
||||
connection = 'scm:git:git://github.com/SpringSource/spring-framework'
|
||||
developerConnection = 'scm:git:git://github.com/SpringSource/spring-framework'
|
||||
}
|
||||
developers {
|
||||
developer {
|
||||
id = 'jhoeller'
|
||||
name = 'Juergen Hoeller'
|
||||
email = 'jhoeller@vmware.com'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,65 +2,65 @@
|
|||
// compile sources with ajc instead of javac
|
||||
|
||||
configurations {
|
||||
ajc
|
||||
aspects
|
||||
ajInpath
|
||||
ajc
|
||||
aspects
|
||||
ajInpath
|
||||
}
|
||||
|
||||
task compileJava(overwrite: true) {
|
||||
dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME
|
||||
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava")
|
||||
dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME
|
||||
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava")
|
||||
|
||||
def outputDir = project.sourceSets.main.output.classesDir
|
||||
def outputDir = project.sourceSets.main.output.classesDir
|
||||
|
||||
inputs.files(project.sourceSets.main.allSource + project.sourceSets.main.compileClasspath)
|
||||
outputs.dir outputDir
|
||||
inputs.files(project.sourceSets.main.allSource + project.sourceSets.main.compileClasspath)
|
||||
outputs.dir outputDir
|
||||
|
||||
doLast{
|
||||
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
|
||||
classpath: configurations.ajc.asPath)
|
||||
doLast{
|
||||
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
|
||||
classpath: configurations.ajc.asPath)
|
||||
|
||||
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
|
||||
maxmem: "1024m", fork: "true", Xlint: "ignore",
|
||||
destDir: outputDir.absolutePath,
|
||||
aspectPath: configurations.aspects.asPath,
|
||||
inpath: configurations.ajInpath.asPath,
|
||||
sourceRootCopyFilter: "**/*.java",
|
||||
classpath: configurations.compile.asPath) {
|
||||
sourceroots {
|
||||
sourceSets.main.java.srcDirs.each {
|
||||
pathelement(location:it.absolutePath)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
|
||||
maxmem: "1024m", fork: "true", Xlint: "ignore",
|
||||
destDir: outputDir.absolutePath,
|
||||
aspectPath: configurations.aspects.asPath,
|
||||
inpath: configurations.ajInpath.asPath,
|
||||
sourceRootCopyFilter: "**/*.java",
|
||||
classpath: configurations.compile.asPath) {
|
||||
sourceroots {
|
||||
sourceSets.main.java.srcDirs.each {
|
||||
pathelement(location:it.absolutePath)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task compileTestJava(overwrite: true) {
|
||||
dependsOn JavaPlugin.PROCESS_TEST_RESOURCES_TASK_NAME
|
||||
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileTestJava")
|
||||
dependsOn jar
|
||||
dependsOn JavaPlugin.PROCESS_TEST_RESOURCES_TASK_NAME
|
||||
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileTestJava")
|
||||
dependsOn jar
|
||||
|
||||
def outputDir = project.sourceSets.test.output.classesDir
|
||||
def outputDir = project.sourceSets.test.output.classesDir
|
||||
|
||||
inputs.files(project.sourceSets.test.allSource + project.sourceSets.test.compileClasspath)
|
||||
outputs.dir outputDir
|
||||
inputs.files(project.sourceSets.test.allSource + project.sourceSets.test.compileClasspath)
|
||||
outputs.dir outputDir
|
||||
|
||||
doLast{
|
||||
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
|
||||
classpath: configurations.ajc.asPath)
|
||||
doLast{
|
||||
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
|
||||
classpath: configurations.ajc.asPath)
|
||||
|
||||
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
|
||||
maxmem: "1024m", fork: "true", Xlint: "ignore",
|
||||
destDir: outputDir.absolutePath,
|
||||
aspectPath: jar.archivePath,
|
||||
inpath: configurations.ajInpath.asPath,
|
||||
classpath: configurations.testRuntime.asPath + configurations.compile.asPath + jar.archivePath) {
|
||||
sourceroots {
|
||||
sourceSets.test.java.srcDirs.each {
|
||||
pathelement(location:it.absolutePath)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
|
||||
maxmem: "1024m", fork: "true", Xlint: "ignore",
|
||||
destDir: outputDir.absolutePath,
|
||||
aspectPath: jar.archivePath,
|
||||
inpath: configurations.ajInpath.asPath,
|
||||
classpath: configurations.testRuntime.asPath + configurations.compile.asPath + jar.archivePath) {
|
||||
sourceroots {
|
||||
sourceSets.test.java.srcDirs.each {
|
||||
pathelement(location:it.absolutePath)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,130 +1,130 @@
|
|||
configurations {
|
||||
castor
|
||||
xjc
|
||||
xmlbeans
|
||||
jibx
|
||||
castor
|
||||
xjc
|
||||
xmlbeans
|
||||
jibx
|
||||
}
|
||||
dependencies {
|
||||
castor "org.codehaus.castor:castor-anttasks:1.2"
|
||||
castor "velocity:velocity:1.5"
|
||||
xjc "com.sun.xml:com.springsource.com.sun.tools.xjc:2.1.7"
|
||||
xmlbeans "org.apache.xmlbeans:com.springsource.org.apache.xmlbeans:2.4.0"
|
||||
jibx "org.jibx:jibx-bind:1.2.3"
|
||||
jibx "bcel:bcel:5.1"
|
||||
castor "org.codehaus.castor:castor-anttasks:1.2"
|
||||
castor "velocity:velocity:1.5"
|
||||
xjc "com.sun.xml:com.springsource.com.sun.tools.xjc:2.1.7"
|
||||
xmlbeans "org.apache.xmlbeans:com.springsource.org.apache.xmlbeans:2.4.0"
|
||||
jibx "org.jibx:jibx-bind:1.2.3"
|
||||
jibx "bcel:bcel:5.1"
|
||||
}
|
||||
|
||||
ext.genSourcesDir = "${buildDir}/generated-sources"
|
||||
ext.flightSchema = "${projectDir}/src/test/resources/org/springframework/oxm/flight.xsd"
|
||||
|
||||
task genCastor {
|
||||
def orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
|
||||
def castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
|
||||
def orderSchema = "${projectDir}/src/test/resources/org/springframework/oxm/order.xsd"
|
||||
def castorBuilderProperties = "${projectDir}/src/test/castor/castorbuilder.properties"
|
||||
|
||||
ext.sourcesDir = "${genSourcesDir}/castor"
|
||||
ext.classesDir = "${buildDir}/classes/castor"
|
||||
ext.sourcesDir = "${genSourcesDir}/castor"
|
||||
ext.classesDir = "${buildDir}/classes/castor"
|
||||
|
||||
inputs.files flightSchema, orderSchema, castorBuilderProperties
|
||||
outputs.dir classesDir
|
||||
inputs.files flightSchema, orderSchema, castorBuilderProperties
|
||||
outputs.dir classesDir
|
||||
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef name: "castor", classname: "org.castor.anttask.CastorCodeGenTask",
|
||||
classpath: configurations.castor.asPath
|
||||
mkdir(dir: sourcesDir)
|
||||
mkdir(dir: classesDir)
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef name: "castor", classname: "org.castor.anttask.CastorCodeGenTask",
|
||||
classpath: configurations.castor.asPath
|
||||
mkdir(dir: sourcesDir)
|
||||
mkdir(dir: classesDir)
|
||||
|
||||
castor(types: "j2", warnings: false, file: flightSchema, todir: sourcesDir,
|
||||
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)
|
||||
castor(types: "j2", warnings: false, file: flightSchema, todir: sourcesDir,
|
||||
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)
|
||||
|
||||
castor(types: "j2", warnings: false, file: orderSchema, todir: sourcesDir,
|
||||
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)
|
||||
castor(types: "j2", warnings: false, file: orderSchema, todir: sourcesDir,
|
||||
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)
|
||||
|
||||
javac(destdir: classesDir, source: 1.5, target: 1.5, debug: true,
|
||||
debugLevel: "lines,vars,source", classpath: configurations.castor.asPath) {
|
||||
src(path: sourcesDir)
|
||||
include(name: "**/*.java")
|
||||
include(name: "*.java")
|
||||
}
|
||||
javac(destdir: classesDir, source: 1.5, target: 1.5, debug: true,
|
||||
debugLevel: "lines,vars,source", classpath: configurations.castor.asPath) {
|
||||
src(path: sourcesDir)
|
||||
include(name: "**/*.java")
|
||||
include(name: "*.java")
|
||||
}
|
||||
|
||||
copy(todir: classesDir) {
|
||||
fileset(dir: sourcesDir, erroronmissingdir: false) {
|
||||
exclude(name: "**/*.java")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
copy(todir: classesDir) {
|
||||
fileset(dir: sourcesDir, erroronmissingdir: false) {
|
||||
exclude(name: "**/*.java")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task genJaxb {
|
||||
ext.sourcesDir = "${genSourcesDir}/jaxb"
|
||||
ext.classesDir = "${buildDir}/classes/jaxb"
|
||||
ext.sourcesDir = "${genSourcesDir}/jaxb"
|
||||
ext.classesDir = "${buildDir}/classes/jaxb"
|
||||
|
||||
inputs.files flightSchema
|
||||
outputs.dir classesDir
|
||||
inputs.files flightSchema
|
||||
outputs.dir classesDir
|
||||
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef name: "xjc", classname: "com.sun.tools.xjc.XJCTask",
|
||||
classpath: configurations.xjc.asPath
|
||||
mkdir(dir: sourcesDir)
|
||||
mkdir(dir: classesDir)
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef name: "xjc", classname: "com.sun.tools.xjc.XJCTask",
|
||||
classpath: configurations.xjc.asPath
|
||||
mkdir(dir: sourcesDir)
|
||||
mkdir(dir: classesDir)
|
||||
|
||||
xjc(destdir: sourcesDir, schema: flightSchema,
|
||||
package: "org.springframework.oxm.jaxb.test") {
|
||||
produces(dir: sourcesDir, includes: "**/*.java")
|
||||
}
|
||||
xjc(destdir: sourcesDir, schema: flightSchema,
|
||||
package: "org.springframework.oxm.jaxb.test") {
|
||||
produces(dir: sourcesDir, includes: "**/*.java")
|
||||
}
|
||||
|
||||
javac(destdir: classesDir, source: 1.5, target: 1.5, debug: true,
|
||||
debugLevel: "lines,vars,source",
|
||||
classpath: configurations.castor.asPath) {
|
||||
src(path: sourcesDir)
|
||||
include(name: "**/*.java")
|
||||
include(name: "*.java")
|
||||
}
|
||||
javac(destdir: classesDir, source: 1.5, target: 1.5, debug: true,
|
||||
debugLevel: "lines,vars,source",
|
||||
classpath: configurations.castor.asPath) {
|
||||
src(path: sourcesDir)
|
||||
include(name: "**/*.java")
|
||||
include(name: "*.java")
|
||||
}
|
||||
|
||||
copy(todir: classesDir) {
|
||||
fileset(dir: sourcesDir, erroronmissingdir: false) {
|
||||
exclude(name: "**/*.java")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
copy(todir: classesDir) {
|
||||
fileset(dir: sourcesDir, erroronmissingdir: false) {
|
||||
exclude(name: "**/*.java")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task genXmlbeans {
|
||||
ext.classesDir = "${buildDir}/classes/xmlbeans"
|
||||
ext.classesDir = "${buildDir}/classes/xmlbeans"
|
||||
|
||||
inputs.files flightSchema
|
||||
outputs.dir classesDir
|
||||
inputs.files flightSchema
|
||||
outputs.dir classesDir
|
||||
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef name: "xmlbeans",
|
||||
classname: "org.apache.xmlbeans.impl.tool.XMLBean",
|
||||
classpath: configurations.xmlbeans.asPath
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef name: "xmlbeans",
|
||||
classname: "org.apache.xmlbeans.impl.tool.XMLBean",
|
||||
classpath: configurations.xmlbeans.asPath
|
||||
|
||||
xmlbeans(classgendir: classesDir, schema: flightSchema,
|
||||
compiler: "modern", verbose: "false",
|
||||
classpath: configurations.xmlbeans.asPath)
|
||||
}
|
||||
}
|
||||
xmlbeans(classgendir: classesDir, schema: flightSchema,
|
||||
compiler: "modern", verbose: "false",
|
||||
classpath: configurations.xmlbeans.asPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// add jibx binding to the normal test compilation process
|
||||
compileTestJava {
|
||||
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
|
||||
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
|
||||
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef(name: "jibx",
|
||||
classname: "org.jibx.binding.ant.CompileTask",
|
||||
classpath: configurations.jibx.asPath)
|
||||
doLast() {
|
||||
project.ant {
|
||||
taskdef(name: "jibx",
|
||||
classname: "org.jibx.binding.ant.CompileTask",
|
||||
classpath: configurations.jibx.asPath)
|
||||
|
||||
jibx(verbose: true, load: true, binding: bindingXml) {
|
||||
classpathset(dir: sourceSets.test.output.classesDir) {
|
||||
include(name: "**/jibx/**/*")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
jibx(verbose: true, load: true, binding: bindingXml) {
|
||||
classpathset(dir: sourceSets.test.output.classesDir) {
|
||||
include(name: "**/jibx/**/*")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ import org.gradle.plugins.ide.eclipse.model.ProjectDependency
|
|||
|
||||
// SPR-10042
|
||||
eclipse.classpath.file.whenMerged { classpath ->
|
||||
def projectName = 'spring-webmvc-tiles3'
|
||||
classpath.entries.add(0, new ProjectDependency("/${projectName}", project(":${projectName}").path))
|
||||
def projectName = 'spring-webmvc-tiles3'
|
||||
classpath.entries.add(0, new ProjectDependency("/${projectName}", project(":${projectName}").path))
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue