tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Spring Framework
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19576 Commits
19 Branches
274 Tags
318 MiB
Tree: 333711fd36
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '333711fd36'
${ noResults }
src-spring-framework/build.gradle

422 lines
15 KiB
Raw Normal View History Unescape

Generate reference docs with docbook-gradle-plugin The docbook-gradle-plugin has been custom-developed specifically to handle Spring projects. It is highly opinionated, and not terribly configurable in its current form. Sources and documentation are available via the 'gradle-plugins' github repository at https://github.com/cbeams/gradle-plugins Note that this repository may soon move locations to the SpringSource GitHub organization, in which case the url will be https://github.com/SpringSource/gradle-plugins In any case, the build plans for these plugins can be found at https://build.springsource.org/browse/GRADLEPLUGINS
13 years ago
buildscript {
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
dependencies {
Download docs resources as zip file in asciidoc build Prior to this commit, the reference documentation build with asciidoctor would get the common "spring-docs-resources" as a dependency and then use it when generating the docs. As seen in #23124, this can cause problems since we'd like to consistently resolve our dependencies. In this case, the "spring-doc-resources" archive is not published on maven central since it's not officially supported by the Spring team as an open source project. This commit updates the reference documentation build to get this archive as a simple download task and avoid resolving it as a dependency. See gh-23282
5 years ago
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
classpath 'io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE'
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
}
Generate reference docs with docbook-gradle-plugin The docbook-gradle-plugin has been custom-developed specifically to handle Spring projects. It is highly opinionated, and not terribly configurable in its current form. Sources and documentation are available via the 'gradle-plugins' github repository at https://github.com/cbeams/gradle-plugins Note that this repository may soon move locations to the SpringSource GitHub organization, in which case the url will be https://github.com/SpringSource/gradle-plugins In any case, the build plans for these plugins can be found at https://build.springsource.org/browse/GRADLEPLUGINS
13 years ago
}
Polish build.gradle
5 years ago
Use the official SonarQube Gradle plugin Since the build has been upgraded to Gradle 2.10, it's showing the following message: "The 'sonar-runner' plugin has been deprecated and is scheduled to be removed in Gradle 3.0. please use the official plugin from SonarQube" This commit makes use of the "org.sonarqube" Gradle plugin and uprgrades the Jacoco agent version to 0.7.5. See: https://sonar.spring.io/updatecenter/updates See: https://jira.sonarsource.com/browse/SONARJAVA-1091 Closes gh-949
9 years ago
plugins {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
Upgrade to Kotlin 1.3.50 Closes gh-23536
5 years ago
id 'org.jetbrains.kotlin.jvm' version '1.3.50' apply false
Download docs resources as zip file in asciidoc build Prior to this commit, the reference documentation build with asciidoctor would get the common "spring-docs-resources" as a dependency and then use it when generating the docs. As seen in #23124, this can cause problems since we'd like to consistently resolve our dependencies. In this case, the "spring-doc-resources" archive is not published on maven central since it's not officially supported by the Spring team as an open source project. This commit updates the reference documentation build to get this archive as a simple download task and avoid resolving it as a dependency. See gh-23282
5 years ago
id 'org.jetbrains.dokka' version '0.9.18' apply false
id 'org.asciidoctor.convert' version '1.5.8'
id 'io.spring.nohttp' version '0.0.3.RELEASE'
id 'de.undercouch.download' version '4.0.0'
Add opt-in build scan integration with Gradle Enterprise This commit adds opt-in build scan integration with Gradle Enterprise. When the GRADLE_ENTERPRISE_URL environment variable is set on a developer's machine or on CI, a build scan will be automatically uploaded to Gradle Enterprise at the end of the build. This initial integration will establish a baseline for Spring Framework builds. Once that baseline has been established we can use the build scans to identify ways in which the build can be optimized and updated to make use of Gradle's build caching which should reduce build times, significantly so for changes that only affect tasks near the leaf nodes of the task graph.
5 years ago
id 'com.gradle.build-scan' version '2.4.1'
Apply Artifactory Gradle plugin Instead of relying on the CI server to apply and configure this plugin, this commit does it directly in the Spring Framework build. This allows us to take full control over which projects are published and how. See gh-23282
5 years ago
id "com.jfrog.artifactory" version '4.9.8' apply false
Use the 'io.freefair.aspectj' Gradle plugin See gh-23282 See spring-projects/spring-security#7183 Closes gh-23506
5 years ago
id "io.freefair.aspectj" version "4.0.0" apply false
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
id "com.github.ben-manes.versions" version "0.24.0"
Use Gradle build scans This commit configures Gradle build scans for the Spring Framework build. Scans aren't performed for every build but can be enabled with the following: ``` ./gradlew build --scan ``` Issue: SPR-15885
7 years ago
}
Add opt-in build scan integration with Gradle Enterprise This commit adds opt-in build scan integration with Gradle Enterprise. When the GRADLE_ENTERPRISE_URL environment variable is set on a developer's machine or on CI, a build scan will be automatically uploaded to Gradle Enterprise at the end of the build. This initial integration will establish a baseline for Spring Framework builds. Once that baseline has been established we can use the build scans to identify ways in which the build can be optimized and updated to make use of Gradle's build caching which should reduce build times, significantly so for changes that only affect tasks near the leaf nodes of the task graph.
5 years ago
if (System.getenv('GRADLE_ENTERPRISE_URL')) {
apply from: "$rootDir/gradle/build-scan-user-data.gradle"
buildScan {
captureTaskInputFiles = true
publishAlways()
server = System.getenv('GRADLE_ENTERPRISE_URL')
}
}
Add sonar integration. This commit configures the SonarRunner plugin so that SonarQube can be used against the project. A few customizations were applied to namely exclude the asm and cglib repackaged classes. Issue: SPR-10766
11 years ago
ext {
Rename non-Framework project modules Prior to this commit, the Spring Framework build would mix proper framework modules (spring-* modules published to maven central) and internal modules such as: * "spring-framework-bom" (which publishes the Framework BOM with all modules) * "spring-core-coroutines" which is an internal modules for Kotlin compilation only This commit renames these modules so that they don't start with "spring-*"; we're also moving the "kotlin-coroutines" module under "spring-core", since it's merged in the resulting JAR. See gh-23282
5 years ago
moduleProjects = subprojects.findAll { it.name.startsWith("spring-") }
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
javaProjects = subprojects - project(":framework-bom")
Upgrade to AspectJ 1.9.4, RxJava 2.2.10, Jetty 9.4.19, Undertow 2.0.22 Includes Hibernate Validator 6.0.17 and renames "withoutJclOverSlf4j".
5 years ago
withoutJclOverSlf4j = {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
exclude group: "org.slf4j", name: "jcl-over-slf4j"
Remove dependency management noise from POMs Prior to this commit, the generated POMs for Spring Framework modules would contain unneeded/harmful information from the Spring Framework build: 1. The BOM imports applied to each module by the dependency management plugin, for example for Netty or Reactor Netty. Spring should not export that opinion to its POMs. 2. The exclusion of "org.slf4:jcl-over-slf4j" from *all* dependencies, which made the POMs much larger than necessary and suggested to developers that they should exclude it as well when using all those listed dependencies. In fact, only Apache Tiles currently brings that transitively. This commit removes that information from the POMs. The dependencyManagement Gradle plugin is disabled for POM generation and we manually resolve the dependency versions during the generation phase. The Gradle build is streamlined to exclude "org.slf4:jcl-over-slf4j" only when necessary. Issue: SPR-16893
7 years ago
}
Add sonar integration. This commit configures the SonarRunner plugin so that SonarQube can be used against the project. A few customizations were applied to namely exclude the asm and cglib repackaged classes. Issue: SPR-10766
11 years ago
}
Fix missing findbugs dependency for Dokka task
5 years ago
configure(allprojects) { project ->
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
apply plugin: "io.spring.dependency-management"
Introduce Gradle-based build - Use recent Gradle 1.0-milestone-8 snapshot - Add initial cut of build.gradle able to compile/test all modules - Update .gitignore - Generate Gradle wrapper scripts - Remove all Eclipse metadata files - Temporarily @Ignore tests that do not pass under Gradle
13 years ago
Remove dependency management noise from POMs Prior to this commit, the generated POMs for Spring Framework modules would contain unneeded/harmful information from the Spring Framework build: 1. The BOM imports applied to each module by the dependency management plugin, for example for Netty or Reactor Netty. Spring should not export that opinion to its POMs. 2. The exclusion of "org.slf4:jcl-over-slf4j" from *all* dependencies, which made the POMs much larger than necessary and suggested to developers that they should exclude it as well when using all those listed dependencies. In fact, only Apache Tiles currently brings that transitively. This commit removes that information from the POMs. The dependencyManagement Gradle plugin is disabled for POM generation and we manually resolve the dependency versions during the generation phase. The Gradle build is streamlined to exclude "org.slf4:jcl-over-slf4j" only when necessary. Issue: SPR-16893
7 years ago
dependencyManagement {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.9.9"
Upgrade to Netty 4.1.39.Final
5 years ago
mavenBom "io.netty:netty-bom:4.1.39.Final"
Upgrade Reactor to Dysprosium RC1 Closes: gh-23579
5 years ago
mavenBom "io.projectreactor:reactor-bom:Dysprosium-RC1"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
mavenBom "org.eclipse.jetty:jetty-bom:9.4.20.v20190813"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.50"
Upgrade to Kotlin Coroutines 1.3.1
5 years ago
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.1"
Upgrade to JUnit 5.5.2 This commit also removes the testRuntime dependency on Hamcrest which was a workaround for https://github.com/junit-team/junit5/issues/2004. Closes gh-23604
5 years ago
mavenBom "org.junit:junit-bom:5.5.2"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
}
dependencies {
Upgrade to Log4J 2.12.1
5 years ago
dependencySet(group: 'org.apache.logging.log4j', version: '2.12.1') {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
entry 'log4j-api'
entry 'log4j-core'
entry 'log4j-slf4j-impl'
entry 'log4j-jul'
}
dependency "org.slf4j:slf4j-api:1.7.26"
dependency "com.google.code.findbugs:jsr305:3.0.2"
dependencySet(group: 'org.aspectj', version: '1.9.4') {
entry 'aspectjrt'
entry 'aspectjtools'
entry 'aspectjweaver'
}
dependencySet(group: 'org.codehaus.groovy', version: '2.5.7') {
entry 'groovy'
entry 'groovy-jsr223'
entry 'groovy-templates'
entry 'groovy-test'
entry 'groovy-xml'
}
dependency "io.reactivex:rxjava:1.3.8"
dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
Upgrade to RxJava2 2.2.12
5 years ago
dependency "io.reactivex.rxjava2:rxjava:2.2.12"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
dependencySet(group: 'io.rsocket', version: '1.0.0-RC3') {
entry 'rsocket-core'
entry 'rsocket-transport-netty'
}
Upgrade to hessian 4.0.62
5 years ago
dependency "com.caucho:hessian:4.0.62"
Upgrade to Aalto 1.2.1
5 years ago
dependency "com.fasterxml:aalto-xml:1.2.1"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
dependency("com.fasterxml.woodstox:woodstox-core:5.2.0") {
exclude group: "stax", name: "stax-api"
}
dependency "com.google.code.gson:gson:2.8.5"
dependency "com.google.protobuf:protobuf-java-util:3.9.0"
dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
dependency("com.thoughtworks.xstream:xstream:1.4.11.1") {
exclude group: "xpp3", name: "xpp3_min"
exclude group: "xmlpull", name: "xmlpull"
}
dependency "org.apache.johnzon:johnzon-jsonb:1.1.12"
dependency("org.codehaus.jettison:jettison:1.3.8") {
exclude group: "stax", name: "stax-api"
}
dependencySet(group: 'org.jibx', version: '1.3.1') {
entry 'jibx-bind'
entry 'jibx-run'
}
dependency "org.ogce:xpp3:1.1.6"
dependency "org.yaml:snakeyaml:1.24"
dependency "com.h2database:h2:1.4.199"
Upgrade to Caffeine 2.8.0
5 years ago
dependency "com.github.ben-manes.caffeine:caffeine:2.8.0"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
dependency "com.github.librepdf:openpdf:1.2.21"
dependency "com.rometools:rome:1.12.1"
dependency "commons-io:commons-io:2.5"
dependency "io.vavr:vavr:0.10.0"
dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
dependencySet(group: 'org.apache.activemq', version: '5.8.0') {
entry 'activemq-broker'
entry('activemq-kahadb-store') {
exclude group: "org.springframework", name: "spring-context"
}
entry 'activemq-stomp'
}
dependency "org.apache.bcel:bcel:6.0"
dependency "org.apache.commons:commons-pool2:2.6.0"
dependencySet(group: 'org.apache.derby', version: '10.14.2.0') {
entry 'derby'
entry 'derbyclient'
}
dependency "org.apache.poi:poi-ooxml:4.1.0"
dependency "org.beanshell:bsh:2.0b5"
dependency "org.freemarker:freemarker:2.3.28"
dependency "org.hsqldb:hsqldb:2.5.0"
dependency "org.quartz-scheduler:quartz:2.3.1"
dependency "org.codehaus.fabric3.api:commonj:1.1.0"
Upgrade to ehcache 2.10.6
5 years ago
dependency "net.sf.ehcache:ehcache:2.10.6"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
dependency "org.ehcache:jcache:1.0.1"
dependency "org.ehcache:ehcache:3.4.0"
dependency "org.hibernate:hibernate-core:5.4.4.Final"
dependency "org.hibernate:hibernate-validator:6.0.17.Final"
dependency "org.webjars:webjars-locator-core:0.37"
dependency "org.webjars:underscorejs:1.8.3"
Upgrade to Tomcat 9.0.24
5 years ago
dependencySet(group: 'org.apache.tomcat', version: '9.0.24') {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
entry 'tomcat-util'
entry('tomcat-websocket') {
exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
}
}
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.22') {
entry 'tomcat-embed-core'
entry 'tomcat-embed-websocket'
}
Upgrade to Undertow 2.0.26.Final
5 years ago
dependencySet(group: 'io.undertow', version: '2.0.26.Final') {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
entry 'undertow-core'
entry('undertow-websockets-jsr') {
exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
}
entry('undertow-servlet') {
exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
}
}
Downgrade to okhttp3 3.14.2 The upgrade to 4.x was breaking some behavior in our tests. We need to reconsider this upgrade and check our mockrestserver usage in our tests.
5 years ago
dependencySet(group: 'com.squareup.okhttp3', version: '3.14.2') {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
entry 'okhttp'
entry 'mockwebserver'
}
dependency("org.apache.httpcomponents:httpclient:4.5.9") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.0.3"
dependency "org.jruby:jruby:9.2.7.0"
dependency "org.python:jython-standalone:2.7.1"
dependency "org.mozilla:rhino:1.7.10"
dependency "commons-fileupload:commons-fileupload:1.4"
dependency "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
dependency("dom4j:dom4j:1.6.1") {
exclude group: "xml-apis", name: "xml-apis"
}
dependency("jaxen:jaxen:1.1.1") {
exclude group: "xml-apis", name: "xml-apis"
exclude group: "xom", name: "xom"
exclude group: "xerces", name: "xercesImpl"
}
Downgrade to JUnit 4.12 Since it does not appear that JUnit 4.13 will be released before Spring Framework 5.2 GA, I am reverting back to JUnit 4.12 for the time being. See gh-22894
5 years ago
dependency("junit:junit:4.12") {
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
exclude group: "org.hamcrest", name: "hamcrest-core"
}
dependency("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1") {
exclude group: "junit", name: "junit"
}
dependency "org.testng:testng:6.14.3"
dependency "org.hamcrest:hamcrest:2.1"
Polish build.gradle
5 years ago
dependency "org.awaitility:awaitility:3.1.3"
Upgrade to AssertJ 3.13.2
5 years ago
dependency "org.assertj:assertj-core:3.13.2"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
dependencySet(group: 'org.xmlunit', version: '2.6.2') {
entry 'xmlunit-assertj'
entry('xmlunit-matchers') {
exclude group: "org.hamcrest", name: "hamcrest-core"
}
}
dependencySet(group: 'org.mockito', version: '3.0.0') {
entry('mockito-core') {
exclude group: "org.hamcrest", name: "hamcrest-core"
}
entry 'mockito-junit-jupiter'
}
dependency "io.mockk:mockk:1.9.3"
dependency("net.sourceforge.htmlunit:htmlunit:2.35.0") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency("org.seleniumhq.selenium:htmlunit-driver:2.35.1") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
exclude group: "commons-logging", name: "commons-logging"
exclude group: "io.netty", name: "netty"
}
dependency "org.skyscreamer:jsonassert:1.5.0"
dependency "com.jayway.jsonpath:json-path:2.4.0"
dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
entry 'tiles-api'
entry('tiles-core', withoutJclOverSlf4j)
entry('tiles-servlet', withoutJclOverSlf4j)
entry('tiles-jsp', withoutJclOverSlf4j)
entry('tiles-el', withoutJclOverSlf4j)
entry('tiles-extras') {
exclude group: "org.springframework", name: "spring-web"
exclude group: "org.slf4j", name: "jcl-over-slf4j"
}
}
dependency("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
exclude group: "org.apache.taglibs", name: "taglibs-standard-spec"
}
dependency "com.ibm.websphere:uow:6.0.2.17"
dependency "com.jamonapi:jamon:2.81"
Upgrade to Joda time 2.10.3
5 years ago
dependency "joda-time:joda-time:2.10.3"
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4"
dependency "org.javamoney:moneta:1.3"
dependency "com.sun.activation:javax.activation:1.2.0"
dependency "com.sun.mail:javax.mail:1.6.2"
dependencySet(group: 'com.sun.xml.bind', version: '2.3.0.1') {
entry 'jaxb-core'
entry 'jaxb-impl'
entry 'jaxb-xjc'
}
dependency "javax.activation:javax.activation-api:1.2.0"
dependency "javax.annotation:javax.annotation-api:1.3.2"
dependency "javax.cache:cache-api:1.1.0"
dependency "javax.ejb:javax.ejb-api:3.2"
dependency "javax.el:javax.el-api:3.0.1-b04"
dependency "javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0"
dependency "javax.faces:javax.faces-api:2.2"
dependency "javax.inject:javax.inject:1"
dependency "javax.inject:javax.inject-tck:1"
dependency "javax.interceptor:javax.interceptor-api:1.2.2"
dependency "javax.jms:javax.jms-api:2.0.1"
dependency "javax.json:javax.json-api:1.1.4"
dependency "javax.json.bind:javax.json.bind-api:1.0"
dependency "javax.mail:javax.mail-api:1.6.2"
dependency "javax.money:money-api:1.0.3"
dependency "javax.resource:javax.resource-api:1.7.1"
dependency "javax.servlet:javax.servlet-api:4.0.1"
dependency "javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02"
dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1"
dependency "javax.transaction:javax.transaction-api:1.3"
dependency "javax.validation:validation-api:2.0.1.Final"
dependency "javax.websocket:javax.websocket-api:1.1"
dependency "javax.xml.bind:jaxb-api:2.3.1"
dependency "javax.xml.ws:jaxws-api:2.3.1"
dependency "org.eclipse.persistence:javax.persistence:2.2.0"
// Substitute for "javax.management:jmxremote_optional:1.0.1_04" which
// is not available on Maven Central
dependency "org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea"
dependency "org.glassfish:javax.el:3.0.1-b08"
dependency "org.glassfish.main:javax.jws:4.0-b33"
dependency "org.glassfish.tyrus:tyrus-container-servlet:1.13.1"
Remove dependency management noise from POMs Prior to this commit, the generated POMs for Spring Framework modules would contain unneeded/harmful information from the Spring Framework build: 1. The BOM imports applied to each module by the dependency management plugin, for example for Netty or Reactor Netty. Spring should not export that opinion to its POMs. 2. The exclusion of "org.slf4:jcl-over-slf4j" from *all* dependencies, which made the POMs much larger than necessary and suggested to developers that they should exclude it as well when using all those listed dependencies. In fact, only Apache Tiles currently brings that transitively. This commit removes that information from the POMs. The dependencyManagement Gradle plugin is disabled for POM generation and we manually resolve the dependency versions during the generation phase. The Gradle build is streamlined to exclude "org.slf4:jcl-over-slf4j" only when necessary. Issue: SPR-16893
7 years ago
}
generatedPomCustomization {
enabled = false
}
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
resolutionStrategy {
cacheChangingModulesFor 0, "seconds"
}
repositories {
mavenCentral()
maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/milestone" } // Reactor
Execute test suite in Gradle using JUnit Platform Closes gh-23286
5 years ago
}
Remove dependency management noise from POMs Prior to this commit, the generated POMs for Spring Framework modules would contain unneeded/harmful information from the Spring Framework build: 1. The BOM imports applied to each module by the dependency management plugin, for example for Netty or Reactor Netty. Spring should not export that opinion to its POMs. 2. The exclusion of "org.slf4:jcl-over-slf4j" from *all* dependencies, which made the POMs much larger than necessary and suggested to developers that they should exclude it as well when using all those listed dependencies. In fact, only Apache Tiles currently brings that transitively. This commit removes that information from the POMs. The dependencyManagement Gradle plugin is disabled for POM generation and we manually resolve the dependency versions during the generation phase. The Gradle build is streamlined to exclude "org.slf4:jcl-over-slf4j" only when necessary. Issue: SPR-16893
7 years ago
}
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
}
Remove dependency management noise from POMs Prior to this commit, the generated POMs for Spring Framework modules would contain unneeded/harmful information from the Spring Framework build: 1. The BOM imports applied to each module by the dependency management plugin, for example for Netty or Reactor Netty. Spring should not export that opinion to its POMs. 2. The exclusion of "org.slf4:jcl-over-slf4j" from *all* dependencies, which made the POMs much larger than necessary and suggested to developers that they should exclude it as well when using all those listed dependencies. In fact, only Apache Tiles currently brings that transitively. This commit removes that information from the POMs. The dependencyManagement Gradle plugin is disabled for POM generation and we manually resolve the dependency versions during the generation phase. The Gradle build is streamlined to exclude "org.slf4:jcl-over-slf4j" only when necessary. Issue: SPR-16893
7 years ago
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
configure([rootProject] + javaProjects) { project ->
group = "org.springframework"
Improve logging dependencies for tests
7 years ago
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
apply plugin: "java"
apply plugin: "checkstyle"
apply plugin: 'org.springframework.build.compile'
apply from: "${rootDir}/gradle/ide.gradle"
Update build for spring-web-reactive module
8 years ago
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
pluginManager.withPlugin("kotlin") {
apply plugin: "org.jetbrains.dokka"
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs = ["-Xjsr305=strict"]
Treat Kotlin warnings as errors Closes gh-23566
5 years ago
allWarningsAsErrors = true
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
}
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
}
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs = ["-Xjsr305=strict"]
}
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
}
Groovy-based bean definitions Formerly known as the Grails BeanBuilder, now in Spring proper. Based on https://github.com/spring-projects/spring-framework/pull/355 but heavily refactored and restructured. Issue: SPR-7123
11 years ago
}
Polish build.gradle - Consolidate shared test systemProperty declarations - Consolidate easymock dependency declarations
12 years ago
test {
Simplify Gradle test task configuration
5 years ago
useJUnitPlatform()
include(["**/*Tests.class", "**/*Test.class"])
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
systemProperty("java.awt.headless", "true")
systemProperty("testGroups", project.properties.get("testGroups"))
Enable io.netty.leakDetection.level=paranoid in tests Issue: SPR-17574
6 years ago
systemProperty("io.netty.leakDetection.level", "paranoid")
Polish build.gradle - Consolidate shared test systemProperty declarations - Consolidate easymock dependency declarations
12 years ago
}
Introduce Gradle-based build - Use recent Gradle 1.0-milestone-8 snapshot - Add initial cut of build.gradle able to compile/test all modules - Update .gitignore - Generate Gradle wrapper scripts - Remove all Eclipse metadata files - Temporarily @Ignore tests that do not pass under Gradle
13 years ago
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
checkstyle {
Upgrade to Netty 4.1.38 and Checkstyle 8.23
5 years ago
toolVersion = "8.23"
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
configDir = rootProject.file("src/checkstyle")
}
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
dependencies {
Migrate test suite from JUnit 4 to JUnit Jupiter This first commit for this issue: - allows JUnit Jupiter to be used for all tests - adds a dependency on mockito-junit-jupiter - migrates tests in spring-core to JUnit Jupiter, except parameterized tests The following script was developed in order to semi-automate the migration process. https://github.com/sbrannen/junit-converters/blob/master/junit4ToJUnitJupiter.zsh See gh-23451
5 years ago
testCompile("org.junit.jupiter:junit-jupiter-api")
testCompile("org.junit.jupiter:junit-jupiter-params")
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
testCompile("org.mockito:mockito-core")
testCompile("org.mockito:mockito-junit-jupiter")
testCompile("io.mockk:mockk")
testCompile("org.assertj:assertj-core")
Migrate test suite from JUnit 4 to JUnit Jupiter This first commit for this issue: - allows JUnit Jupiter to be used for all tests - adds a dependency on mockito-junit-jupiter - migrates tests in spring-core to JUnit Jupiter, except parameterized tests The following script was developed in order to semi-automate the migration process. https://github.com/sbrannen/junit-converters/blob/master/junit4ToJUnitJupiter.zsh See gh-23451
5 years ago
// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
Execute test suite in Gradle using JUnit Platform Closes gh-23286
5 years ago
testRuntime("org.junit.platform:junit-platform-launcher")
Migrate test suite from JUnit 4 to JUnit Jupiter This first commit for this issue: - allows JUnit Jupiter to be used for all tests - adds a dependency on mockito-junit-jupiter - migrates tests in spring-core to JUnit Jupiter, except parameterized tests The following script was developed in order to semi-automate the migration process. https://github.com/sbrannen/junit-converters/blob/master/junit4ToJUnitJupiter.zsh See gh-23451
5 years ago
testRuntime("org.junit.jupiter:junit-jupiter-engine")
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
testRuntime("org.apache.logging.log4j:log4j-core")
testRuntime("org.apache.logging.log4j:log4j-slf4j-impl")
testRuntime("org.apache.logging.log4j:log4j-jul")
Add checkstyle to build Add checkstyle to the build to enforce Spring Framework coding conventions. Rule suppressions are used for several classes where relaxing the rules makes more sense than fixing them. Issue: SPR-16968
7 years ago
// JSR-305 only used for non-required meta-annotations
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
compileOnly("com.google.code.findbugs:jsr305")
testCompileOnly("com.google.code.findbugs:jsr305")
Upgrade to spring-javaformat-checkstyle v0.0.15
5 years ago
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.15")
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
}
Eliminate all Javadoc warnings - Support external Javadoc links using Gradle's javadoc.options.links - Fix all other Javadoc warnings, such as typos, references to non-existent (or no longer existent) types and members, etc, including changes related to the Quartz 2.0 upgrade (SPR-8275) and adding the HTTP PATCH method (SPR-7985). - Suppress all output for project-level `javadoc` tasks in order to hide false-negative warnings about cross-module @see and @link references (e.g. spring-core having a @see reference to spring-web). Use the `--info` (-i) flag to gradle at any time to see project-level javadoc warnings without running the entire `api` task. e.g. `gradle :spring-core:javadoc -i` - Favor root project level `api` task for detection of legitimate Javadoc warnings. There are now zero Javadoc warnings across the entirety of spring-framework. Goal: keep it that way. - Remove all @link and @see references to types and members that exist only in Servlet <= 2.5 and Hibernate <= 4.0, favoring 3.0+ and 4.0+ respectively. This is necessary because only one version of each of these dependencies can be present on the global `api` javadoc task's classpath. To that end, the `api` task classpath has now been customized to ensure that the Servlet 3 API and Hibernate Core 4 jars have precedence. - SPR-8896 replaced our dependency on aspectjrt with a dependency on aspectjweaver, which is fine from a POM point of view, but causes a spurious warning to be emitted from the ant iajc task that it "cannot find aspectjrt on the classpath" - even though aspectjweaver is perfectly sufficient. In the name of keeping the console quiet, a new `rt` configuration has been added, and aspectjrt added as a dependency to it. In turn, configurations.rt.asPath is appended to the iajc classpath during both compileJava and compileTestJava for spring-aspects. Issue: SPR-10078, SPR-8275, SPR-7985, SPR-8896
12 years ago
ext.javadocLinks = [
Use dependency management in Framework build Prior to this commit, the Spring Framework build would partially use the dependency management plugin to import and enforce BOMs. This commit applies the dependency management plugin to all Java projects and regroups all version management declaration in the root `build.gradle` file (versions and exclusions). Some versions are overridden in specific modules for backwards-compatibility reasons or extended support. This commit also adds the Gradle versions plugin that checks for dependency upgrades in artifact repositories and produces a report; you can use the following: ./gradlew dependencyUpdates
5 years ago
"https://docs.oracle.com/javase/8/docs/api/",
"https://docs.oracle.com/javaee/7/api/",
"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
"https://glassfish.java.net/nonav/docs/v3/api/",
"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
"https://tiles.apache.org/tiles-request/apidocs/",
"https://tiles.apache.org/framework/apidocs/",
"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
"https://www.ehcache.org/apidocs/2.10.4",
"https://www.quartz-scheduler.org/api/2.3.0/",
"https://fasterxml.github.io/jackson-core/javadoc/2.9/",
"https://fasterxml.github.io/jackson-databind/javadoc/2.9/",
"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/",
"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
"https://junit.org/junit4/javadoc/4.12/",
Upgrade to JUnit 5.5.2 This commit also removes the testRuntime dependency on Hamcrest which was a workaround for https://github.com/junit-team/junit5/issues/2004. Closes gh-23604
5 years ago
"https://junit.org/junit5/docs/5.5.2/api/"
Eliminate all Javadoc warnings - Support external Javadoc links using Gradle's javadoc.options.links - Fix all other Javadoc warnings, such as typos, references to non-existent (or no longer existent) types and members, etc, including changes related to the Quartz 2.0 upgrade (SPR-8275) and adding the HTTP PATCH method (SPR-7985). - Suppress all output for project-level `javadoc` tasks in order to hide false-negative warnings about cross-module @see and @link references (e.g. spring-core having a @see reference to spring-web). Use the `--info` (-i) flag to gradle at any time to see project-level javadoc warnings without running the entire `api` task. e.g. `gradle :spring-core:javadoc -i` - Favor root project level `api` task for detection of legitimate Javadoc warnings. There are now zero Javadoc warnings across the entirety of spring-framework. Goal: keep it that way. - Remove all @link and @see references to types and members that exist only in Servlet <= 2.5 and Hibernate <= 4.0, favoring 3.0+ and 4.0+ respectively. This is necessary because only one version of each of these dependencies can be present on the global `api` javadoc task's classpath. To that end, the `api` task classpath has now been customized to ensure that the Servlet 3 API and Hibernate Core 4 jars have precedence. - SPR-8896 replaced our dependency on aspectjrt with a dependency on aspectjweaver, which is fine from a POM point of view, but causes a spurious warning to be emitted from the ant iajc task that it "cannot find aspectjrt on the classpath" - even though aspectjweaver is perfectly sufficient. In the name of keeping the console quiet, a new `rt` configuration has been added, and aspectjrt added as a dependency to it. In turn, configurations.rt.asPath is appended to the iajc classpath during both compileJava and compileTestJava for spring-aspects. Issue: SPR-10078, SPR-8275, SPR-7985, SPR-8896
12 years ago
] as String[]
Upgrade to JUnit 4.11 snapshot in support of JDK7 Class#getDeclaredMembers returns arbitrary results under JDK7. This results in non-deterministic execution of JUnit test methods, often revealing unintended dependencies between methods that rely on a specific order to succeed. JUnit 4.11 contains support for predictable test ordering [1], but at the time of this commit, JUnit 4.11 has not yet been released. Therefore we are testing against a snapshot version [2], which has been uploaded to repo.springsource.org [3] for easy access. Note that this artifact may be removed when JUnit 4.11 goes GA. - Care has been taken to ensure that spring-test's compile-time dependency on JUnit remains at 4.10. This means that the spring-test pom.xml will continue to have an optional <dependency> on JUnit 4.10, instead of the 4.11 snapshot. - For reasons not fully understood, the upgrade to the 4.11 snapshot of junit-dep caused NoSuchMethodErrors around certain Hamcrest types, particularly CoreMatchers and Matchers. import statements have been updated accordingly throughout affected test cases. - Runtime errors also occurred around uses of JUnit @Rule and ExpectedException. These have been reverted to use simpler mechanisms like @Test(expected) in the meantime. - Some test methods with order-based dependencies on one another have been renamed in order to fall in line with JUnit 4.11's new method ordering (as opposed to actually fixing the inter-test dependencies). In other areas, the fix was as simple as adding a tearDown method and cleaning up state. - For no apparent reason, the timeout in AspectJAutoProxyCreatorTests' testAspectsAndAdvisorNotAppliedToPrototypeIsFastEnough method begins to be exceeded. Prior to this commit the timeout value was 3000 ms; on the CI server under Linux/JDK6 and JDK7, the test begins taking anywhere from 3500-5500 ms with this commit. It is presumed that this is an incidental artifact of the upgrade to JUnit 4.11. In any case, there are no changes to src/main in this commit, so this should not actually represent a performance risk for Spring Framework users. The timeout has been increased to 6000 ms to accommodate this situation. [1]: https://github.com/KentBeck/junit/pull/293 [2]: https://github.com/downloads/KentBeck/junit/junit-dep-4.11-SNAPSHOT-20120805-1225.jar [3]: https://repo.springsource.org/simple/ext-release-local/junit/junit-dep/4.11.20120805.1225 Issue: SPR-9783
12 years ago
}
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
configure(moduleProjects) { project ->
apply from: "${rootDir}/gradle/spring-module.gradle"
Introduce Gradle-based build - Use recent Gradle 1.0-milestone-8 snapshot - Add initial cut of build.gradle able to compile/test all modules - Update .gitignore - Generate Gradle wrapper scripts - Remove all Eclipse metadata files - Temporarily @Ignore tests that do not pass under Gradle
13 years ago
}
Generate -docs, -schema and -dist zips - Add 'api' gradle task to generate project-wide API Javadoc results in <root>/build/api - Add docsZip task including api and reference documentation suitable for publication to http://static.springframework.org/docs/spring-framework - Add schemaZip task including all spring-* XSD files suitable for publication to http://static.springframework.org/schema - Add distZip task to include all libs, docs and schema - filter src/dist/*.txt for ${copyright} and ${version} - copy legal (notice, license) dynamically into individual jar files - copy legal and readme files into root of distribution zip - Refactor location of 'wrapper' task Each of the zip tasks (docsZip, schemaZip, distZip) have been added to the 'archives' configuration, meaning that (a) they will be built automatically with `gradle build` and (b) will be published automatically to artifactory when using the Artifactory Gradle plugin and/or Artifactory Bamboo integration.
13 years ago
configure(rootProject) {
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
description = "Spring Framework"
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
Consistently use double quotes (even if no interpolation needed) Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
6 years ago
apply plugin: "groovy"
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
apply plugin: "kotlin"
Add nohttp to build See gh-22839
6 years ago
apply plugin: "io.spring.nohttp"
Use JApiCmp Gradle plugin for API diffs This commit removes JDiff from the Spring Framework build and instead, adds a Gradle plugin that configure JApiCmp tasks on the framework modules. Fixes gh-22942 See gh-23282
5 years ago
apply plugin: 'org.springframework.build.api-diff'
Configure Maven publications with Gradle Prior to this commit, the build would use a custom task to create a BOM and manually include/exclude/customize dependencies. It would also use the "maven" plugin to customize the POM before publication. This commit now uses a Gradle Java Platform for publishing the Spring Framework BOM. We're also now using the "maven-publish" plugin to prepare and customize publications. This commit also tells the artifactory plugin (which is currently applied only on the CI) not to publish internal modules. See gh-23282
5 years ago
apply from: "${rootDir}/gradle/publications.gradle"
Revert "Revert "Refactor Gradle tasks in Spring Framework build"" This reverts commit fb0d618751a073c067c41266b9601094ccaa7560.
5 years ago
apply from: "${rootDir}/gradle/docs.gradle"
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
Add nohttp to build See gh-22839
6 years ago
nohttp {
source.exclude "**/test-output/**"
whitelistFile = project.file("src/nohttp/whitelist.lines")
def projectDirURI = project.projectDir.toURI()
allprojects.forEach { p ->
def outURI = p.file("out").toURI()
def pattern = projectDirURI.relativize(outURI).path + "**"
source.exclude pattern
}
}
Move integration tests to dedicated module This commit moves the dependency management and test source files related to integration tests to a dedicated module. This allows us to focus the root project on building the Spring Framework. See gh-23282
5 years ago
dependencies {
Add Kotlin code snippets to core refdoc This commit introduces Kotlin code snippets, for now in the core reference documentation. Other sections will follow, as well as improvements like global language switch. See gh-21778
5 years ago
asciidoctor("io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE")
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
}
Configure Maven publications with Gradle Prior to this commit, the build would use a custom task to create a BOM and manually include/exclude/customize dependencies. It would also use the "maven" plugin to customize the POM before publication. This commit now uses a Gradle Java Platform for publishing the Spring Framework BOM. We're also now using the "maven-publish" plugin to prepare and customize publications. This commit also tells the artifactory plugin (which is currently applied only on the CI) not to publish internal modules. See gh-23282
5 years ago
publishing {
publications {
Change Gradle publication name for artifactory This commit switches to the default publication name considered by the artifactory plugin when it comes to publishing artifacts to the artifactory repository. See gh-23282
5 years ago
mavenJava(MavenPublication) {
Configure Maven publications with Gradle Prior to this commit, the build would use a custom task to create a BOM and manually include/exclude/customize dependencies. It would also use the "maven" plugin to customize the POM before publication. This commit now uses a Gradle Java Platform for publishing the Spring Framework BOM. We're also now using the "maven-publish" plugin to prepare and customize publications. This commit also tells the artifactory plugin (which is currently applied only on the CI) not to publish internal modules. See gh-23282
5 years ago
artifact docsZip
artifact schemaZip
artifact distZip
}
}
Polish .gradle file formatting to use tabs Replace spaces with tabs for consistency with Java source code
12 years ago
}
Remove need to manually set wrapper GRADLE_OPTS Replace the wrapper task with a variant that automatically adds the appropriate GRADLE_OPTS to the shell and bat files.
12 years ago
}