diff --git a/gradle/bom.gradle b/gradle/bom.gradle deleted file mode 100644 index f7d6c6b6..00000000 --- a/gradle/bom.gradle +++ /dev/null @@ -1,3 +0,0 @@ -sonarqube { - skipProject = true -} diff --git a/gradle/ide.gradle b/gradle/ide.gradle deleted file mode 100644 index f28e88d8..00000000 --- a/gradle/ide.gradle +++ /dev/null @@ -1,60 +0,0 @@ -import org.gradle.plugins.ide.eclipse.model.ProjectDependency -import org.gradle.plugins.ide.eclipse.model.SourceFolder - - -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 eclipseCheckstyle(type: Copy) { - from rootProject.files( - "eclipse/.checkstyle") - into project.projectDir - expand(configDir: rootProject.file('config/checkstyle').absolutePath) -} - -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 eclipseJdtPrepare(type: Copy) { - from rootProject.file("eclipse/org.eclipse.jdt.core.prefs") - into project.file(".settings/") - outputs.upToDateWhen { false } -} - -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 eclipseConfiguration(dependsOn: [eclipseCheckstyle, eclipseJdtPrepare, eclipseSettings, eclipseWstComponent]) { - group 'ide' -} - -tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare) -tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi) -tasks["eclipse"].dependsOn(eclipseConfiguration) \ No newline at end of file diff --git a/gradle/java.gradle b/gradle/java.gradle deleted file mode 100644 index fb6213d8..00000000 --- a/gradle/java.gradle +++ /dev/null @@ -1,92 +0,0 @@ -apply plugin: 'java' -apply plugin: 'groovy' -apply plugin: 'javadocHotfix' -apply plugin: 'eclipse-wtp' -apply plugin: 'propdeps' -apply plugin: 'propdeps-idea' -apply plugin: 'propdeps-eclipse' -apply plugin: 'com.github.ben-manes.versions' -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 89fc7673..00000000 --- a/gradle/publish-maven.gradle +++ /dev/null @@ -1,51 +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" - organization { - name = "Spring IO" - url = "http://projects.spring.io/spring-session" - } - 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/spring-projects/spring-session" - connection = "scm:git:git://github.com/spring-projects/spring-session" - developerConnection = "scm:git:git://github.com/spring-projects/spring-session" - } - developers { - developer { - id = "rwinch" - name = "Rob Winch" - email = "rwinch@pivotal.io" - } - } - issueManagement { - system = "GitHub" - url = "https://github.com/spring-projects/spring-session/issues" - } - } - } -} \ No newline at end of file diff --git a/gradle/sample.gradle b/gradle/sample.gradle deleted file mode 100644 index c2170ae0..00000000 --- a/gradle/sample.gradle +++ /dev/null @@ -1,4 +0,0 @@ -tasks.findByPath("artifactoryPublish")?.enabled = false -sonarqube { - skipProject = true -} \ No newline at end of file diff --git a/gradle/spring3.gradle b/gradle/spring3.gradle deleted file mode 100644 index f3ef99b1..00000000 --- a/gradle/spring3.gradle +++ /dev/null @@ -1,36 +0,0 @@ -configurations { - spring3TestRuntime.extendsFrom testRuntime -} - -configurations.spring3TestRuntime { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - if (details.requested.group == 'org.springframework' - && details.requested.name != 'spring-websocket' - && details.requested.name != 'spring-messaging') { - details.useVersion '3.2.18.RELEASE' - } - if (details.requested.group == 'org.springframework.data') { - if (details.requested.name == 'spring-data-commons') { - details.useVersion '1.12.1.RELEASE' - } - if (details.requested.name == 'spring-data-keyvalue') { - details.useVersion '1.1.1.RELEASE' - } - if (details.requested.name == 'spring-data-redis') { - details.useVersion '1.7.1.RELEASE' - } - } - } -} - -task spring3Test(type: Test) { - jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M'] - classpath = sourceSets.test.output + sourceSets.main.output + configurations.spring3TestRuntime - exclude "org/springframework/session/web/socket/**" - reports { - html.destination = project.file("$buildDir/spring3-test-results/") - junitXml.destination = project.file("$buildDir/reports/spring3-tests/") - } -} - -//check.dependsOn spring3Test diff --git a/gradle/tomcat.gradle b/gradle/tomcat.gradle deleted file mode 100644 index bbc08612..00000000 --- a/gradle/tomcat.gradle +++ /dev/null @@ -1,61 +0,0 @@ -buildscript { - repositories { - maven { url "https://repo.spring.io/plugins-release" } - } - dependencies { - classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5") - } -} - -apply plugin: 'war' -apply plugin: 'com.bmuschko.tomcat' - -[tomcatRun,tomcatRunWar]*.contextPath = '/' - - -task integrationTomcatRun(type: com.bmuschko.gradle.tomcat.tasks.TomcatRun) { - onlyIf { !sourceSets.integrationTest.allSource.empty } - contextPath = tomcatRun.contextPath - daemon = true - tomcatClasspath = tomcatRun.tomcatClasspath - webAppClasspath = tomcatRun.webAppClasspath - webAppSourceDirectory = tomcatRun.webAppSourceDirectory - doFirst { - def mainOutputDir = project.sourceSets.main.output.classesDir - if(mainOutputDir) { - classesDirectory = mainOutputDir - } - // delay reserving ports to ensure they are still available - def ports = reservePorts(3) - httpPort = ports[0] - ajpPort = ports[1] - stopPort = ports[2] - - System.setProperty('spring.session.redis.namespace',project.name) - } -} - -task integrationTomcatStop(type: com.bmuschko.gradle.tomcat.tasks.TomcatStop) { - onlyIf { !sourceSets.integrationTest.allSource.empty } - doFirst { - stopPort = integrationTomcatRun.stopPort - } -} - -integrationTest { - dependsOn integrationTomcatRun - doFirst { - systemProperties['tomcat.port'] = integrationTomcatRun.httpPort - } - finalizedBy integrationTomcatStop -} - -def reservePorts(int count) { - def sockets = [] - for(int i in 1..count) { - sockets << new ServerSocket(0) - } - def result = sockets*.localPort - sockets*.close() - result -} diff --git a/gradle/tomcat6.gradle b/gradle/tomcat6.gradle deleted file mode 100644 index 964cb644..00000000 --- a/gradle/tomcat6.gradle +++ /dev/null @@ -1,8 +0,0 @@ -apply from: TOMCAT_GRADLE - -dependencies { - def tomcatVersion = '6.0.43' - tomcat "org.apache.tomcat:catalina:${tomcatVersion}", - "org.apache.tomcat:coyote:${tomcatVersion}", - "org.apache.tomcat:jasper:${tomcatVersion}" -} \ No newline at end of file diff --git a/gradle/tomcat7.gradle b/gradle/tomcat7.gradle deleted file mode 100644 index 4f41f943..00000000 --- a/gradle/tomcat7.gradle +++ /dev/null @@ -1,8 +0,0 @@ -apply from: TOMCAT_GRADLE - -dependencies { - def tomcatVersion = '7.0.59' - tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}", - "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}", - "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}" -}