diff --git a/build.gradle b/build.gradle index b8c37af..0727123 100644 --- a/build.gradle +++ b/build.gradle @@ -12,17 +12,8 @@ buildscript { apply plugin: 'io.spring.convention.root' group = 'org.springframework.session' -description = 'Spring Session' +description = 'Spring Session Data Geode' ext.releaseBuild = version.endsWith('RELEASE') ext.snapshotBuild = version.endsWith('SNAPSHOT') ext.milestoneBuild = !(releaseBuild || snapshotBuild) - -ext.BOM_GRADLE = "$rootDir/gradle/bom.gradle" -ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle" -ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle" -ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle" -ext.SAMPLE_GRADLE = "$rootDir/gradle/sample.gradle" -ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle" -ext.TOMCAT_6_GRADLE = "$rootDir/gradle/tomcat6.gradle" -ext.TOMCAT_7_GRADLE = "$rootDir/gradle/tomcat7.gradle" diff --git a/gradle/ide.gradle b/gradle/ide.gradle deleted file mode 100644 index fed994e..0000000 --- a/gradle/ide.gradle +++ /dev/null @@ -1,56 +0,0 @@ -apply plugin: "propdeps-eclipse" -apply plugin: "propdeps-idea" - -eclipse { - jdt { - javaRuntimeName = "J2SE-1.5" - } -} - -eclipse.project.buildCommand "net.sf.eclipsecs.core.CheckstyleBuilder" -eclipse.project.natures "net.sf.eclipsecs.core.CheckstyleNature" - -// Include project specific settings -task cleanEclipseJdtUi(type: Delete) { - delete project.file(".settings/org.eclipse.jdt.core.prefs") - delete project.file(".settings/org.eclipse.jdt.ui.prefs") - delete project.file(".settings/org.eclipse.wst.common.component") - delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml") -} - -task eclipseCheckstyle(type: Copy) { - from rootProject.files( - "eclipse/.checkstyle") - into project.projectDir - expand(configDir: rootProject.file('config/checkstyle').absolutePath) -} - -task eclipseJdtPrepare(type: Copy) { - from rootProject.file("eclipse/org.eclipse.jdt.core.prefs") - into project.file(".settings/") - outputs.upToDateWhen { false } -} - -task eclipseSettings(type: Copy) { - from rootProject.files( - "eclipse/org.eclipse.jdt.ui.prefs", - "eclipse/org.eclipse.wst.common.project.facet.core.xml") - into project.file('.settings/') - outputs.upToDateWhen { false } -} - -task eclipseWstComponent(type: Copy) { - from rootProject.files( - "eclipse/org.eclipse.wst.common.component") - into project.file('.settings/') - expand(deployname: project.name) - outputs.upToDateWhen { false } -} - -task eclipseConfiguration(dependsOn: [eclipseCheckstyle, eclipseJdtPrepare, eclipseSettings, eclipseWstComponent]) { - group 'ide' -} - -tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare) -tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi) -tasks["eclipse"].dependsOn(eclipseConfiguration) diff --git a/gradle/java.gradle b/gradle/java.gradle deleted file mode 100644 index 93246bf..0000000 --- a/gradle/java.gradle +++ /dev/null @@ -1,92 +0,0 @@ -apply plugin: 'java' -apply plugin: 'groovy' -apply plugin: 'eclipse-wtp' -apply plugin: 'propdeps' -apply plugin: 'propdeps-idea' -apply plugin: 'propdeps-eclipse' -apply plugin: 'checkstyle' -apply from: IDE_GRADLE - -group = 'org.springframework.session' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'Cairo-BUILD-SNAPSHOT' - -ext.seleniumDependencies = [ - "org.seleniumhq.selenium:htmlunit-driver:$htmlUnitVersion", - "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion" -] - -ext.jstlDependencies = [ - "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion", - "org.apache.taglibs:taglibs-standard-jstlel:1.2.1" -] - -repositories { - mavenCentral() - maven { url 'https://repo.spring.io/libs-snapshot' } - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } -} - -configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.springframework') { - details.useVersion springVersion - } - } -} - -// Integration test setup -configurations { - integrationTestCompile { - extendsFrom testCompile, optional, provided - } - integrationTestRuntime { - extendsFrom integrationTestCompile, testRuntime - } -} - -sourceSets { - integrationTest { - java.srcDir file('src/integration-test/java') - groovy.srcDirs file('src/integration-test/groovy') - resources.srcDir file('src/integration-test/resources') - compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile - runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime - } -} - -task integrationTest(type: Test, dependsOn: jar) { - testClassesDir = sourceSets.integrationTest.output.classesDir - logging.captureStandardOutput(LogLevel.INFO) - classpath = sourceSets.integrationTest.runtimeClasspath - maxParallelForks = 1 - reports { - html.destination = project.file("$project.buildDir/reports/integration-tests/") - junitXml.destination = project.file("$project.buildDir/integration-test-results/") - } -} - -check.dependsOn integrationTest - -checkstyle { - configFile = rootProject.file('config/checkstyle/checkstyle.xml') - configProperties.configDir = configFile.parentFile - toolVersion = '6.16.1' -} - -task checkstyle { - dependsOn project.tasks.findAll { task -> task.name.matches('checkstyle\\w+') } -} - -eclipse { - classpath { - plusConfigurations += [ configurations.integrationTestCompile ] - } -} - -project.idea.module { - scopes.TEST.plus += [project.configurations.integrationTestRuntime] -} diff --git a/gradle/publish-maven.gradle b/gradle/publish-maven.gradle deleted file mode 100644 index ef672e8..0000000 --- a/gradle/publish-maven.gradle +++ /dev/null @@ -1,58 +0,0 @@ -apply plugin: 'propdeps-maven' - -install { - repositories.mavenInstaller { - customizePom(pom, project) - } -} - -def customizePom(pom, gradleProject) { - - pom.whenConfigured { generatedPom -> - - // sort to make pom dependencies order consistent to ease comparison of older poms - generatedPom.dependencies = generatedPom.dependencies.sort { dep -> - "$dep.scope:$dep.groupId:$dep.artifactId" - } - - // add all items necessary for maven central publication - generatedPom.project { - - name = gradleProject.description - description = gradleProject.description - url = "https://github.com/spring-projects/spring-session" - - licenses { - license { - name "The Apache Software License, Version 2.0" - url "http://www.apache.org/licenses/LICENSE-2.0.txt" - distribution "repo" - } - } - - organization { - name = "Spring IO" - url = "http://projects.spring.io/spring-session" - } - - developers { - developer { - id = "jblum" - name = "John Blum" - email = "jblum@pivotal.io" - } - } - - scm { - url = "https://github.com/spring-projects/spring-session-data-geode" - connection = "scm:git:git://github.com/spring-projects/spring-session-data-geode" - developerConnection = "scm:git:git://github.com/spring-projects/spring-session-data-geode" - } - - issueManagement { - system = "GitHub" - url = "https://github.com/spring-projects/spring-session-data-geode/issues" - } - } - } -} diff --git a/gradle/sample.gradle b/gradle/sample.gradle deleted file mode 100644 index a997121..0000000 --- a/gradle/sample.gradle +++ /dev/null @@ -1,5 +0,0 @@ -tasks.findByPath("artifactoryPublish")?.enabled = false - -sonarqube { - skipProject = true -}