X Tutup
Skip to content

Commit ce4be3b

Browse files
cbeamscbeams
committed
Merge branch '3.2.x' into master
Conflicts: gradle.properties spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
2 parents dcf7d18 + ba03d5b commit ce4be3b

File tree

1,450 files changed

+17806
-43126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,450 files changed

+17806
-43126
lines changed

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ jmx.log
1313
derby.log
1414
spring-test/test-output/
1515
.gradle
16-
.classpath
17-
.project
1816
argfile*
1917
pom.xml
2018

2119
/build
2220
buildSrc/build
2321
/spring-*/build
2422

23+
# Eclipse artifacts, including WTP generated manifests
24+
.classpath
25+
.project
26+
spring-*/src/main/java/META-INF/MANIFEST.MF
27+
2528
# IDEA artifacts and output dirs
2629
*.iml
2730
*.ipr

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ present in the framework.
8787

8888
```java
8989
/*
90-
* Copyright 2002-2012 the original author or authors.
90+
* Copyright 2002-2013 the original author or authors.
9191
*
9292
* Licensed under the Apache License, Version 2.0 (the "License");
9393
* you may not use this file except in compliance with the License.
@@ -108,16 +108,16 @@ package ...;
108108
## Update Apache license header to modified files as necessary
109109

110110
Always check the date range in the license header. For example, if you've
111-
modified a file in 2012 whose header still reads
111+
modified a file in 2013 whose header still reads
112112

113113
```java
114114
* Copyright 2002-2011 the original author or authors.
115115
```
116116

117-
then be sure to update it to 2012 appropriately
117+
then be sure to update it to 2013 appropriately
118118

119119
```java
120-
* Copyright 2002-2012 the original author or authors.
120+
* Copyright 2002-2013 the original author or authors.
121121
```
122122

123123
## Use @since tags for newly-added public API types and methods

‎build.gradle‎

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ buildscript {
33
maven { url "http://repo.springsource.org/plugins-release" }
44
}
55
dependencies {
6-
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.1")
7-
classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.4")
6+
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.3")
7+
classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.6")
88
}
99
}
1010

1111
configure(allprojects) { project ->
1212
group = "org.springframework"
1313
version = qualifyVersionIfNecessary(version)
1414

15-
ext.aspectjVersion = "1.7.1"
15+
ext.aspectjVersion = "1.7.2"
1616
ext.easymockVersion = "2.5.2"
1717
ext.hsqldbVersion = "1.8.0.10"
1818
ext.junitVersion = "4.11"
@@ -21,8 +21,6 @@ configure(allprojects) { project ->
2121

2222
apply plugin: "propdeps"
2323
apply plugin: "java"
24-
apply plugin: "propdeps-eclipse"
25-
apply plugin: "propdeps-idea"
2624
apply plugin: "test-source-set-dependencies"
2725
apply from: "${gradleScriptDir}/ide.gradle"
2826

@@ -60,7 +58,7 @@ configure(allprojects) { project ->
6058

6159
test {
6260
systemProperty("java.awt.headless", "true")
63-
systemProperty("testGroups", properties.get("testGroups"))
61+
systemProperty("testGroups", project.properties.get("testGroups"))
6462
}
6563

6664
repositories {
@@ -71,7 +69,7 @@ configure(allprojects) { project ->
7169
testCompile("junit:junit:${junitVersion}")
7270
testCompile("org.hamcrest:hamcrest-all:1.3")
7371
testCompile("org.mockito:mockito-core:1.9.5")
74-
if (project.name in ["spring", "spring-jms", "spring-orm",
72+
if (project.name in ["spring",
7573
"spring-orm-hibernate4", "spring-oxm", "spring-struts",
7674
"spring-test", "spring-test-mvc", "spring-tx", "spring-web",
7775
"spring-webmvc", "spring-webmvc-portlet", "spring-webmvc-tiles3"]) {
@@ -235,7 +233,9 @@ project("spring-core") {
235233
optional("net.sf.jopt-simple:jopt-simple:3.0")
236234
optional("log4j:log4j:1.2.17")
237235
testCompile("xmlunit:xmlunit:1.3")
238-
testCompile("org.codehaus.woodstox:wstx-asl:3.2.7")
236+
testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
237+
exclude group: "stax", module: "stax-api"
238+
}
239239
}
240240

241241
jar {
@@ -526,8 +526,8 @@ project("spring-orm-hibernate4") {
526526
description = "Spring Object/Relational Mapping - Hibernate 4 support"
527527
merge.into = project(":spring-orm")
528528
dependencies {
529-
compile(project(":spring-tx"))
530-
compile(project(":spring-jdbc"))
529+
provided(project(":spring-tx"))
530+
provided(project(":spring-jdbc"))
531531
optional("org.hibernate:hibernate-core:4.1.0.Final")
532532
optional("org.hibernate:hibernate-entitymanager:4.1.0.Final")
533533
optional(project(":spring-web"))
@@ -587,7 +587,6 @@ project("spring-webmvc") {
587587
testCompile("commons-io:commons-io:1.3")
588588
testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
589589
testCompile("org.apache.httpcomponents:httpclient:4.2")
590-
testCompile(project(":spring-web").sourceSets.test.output)
591590
}
592591

593592
// pick up DispatcherServlet.properties in src/main
@@ -598,7 +597,8 @@ project("spring-webmvc-tiles3") {
598597
description = "Spring Framework Tiles3 Integration"
599598
merge.into = project(":spring-webmvc")
600599
dependencies {
601-
compile(project(":spring-context"))
600+
provided(project(":spring-context"))
601+
provided(project(":spring-web"))
602602
provided("javax.el:el-api:1.0")
603603
provided("javax.servlet:jstl:1.2")
604604
provided("javax.servlet.jsp:jsp-api:2.1")
@@ -613,11 +613,13 @@ project("spring-webmvc-tiles3") {
613613
optional("org.apache.tiles:tiles-jsp:3.0.1") {
614614
exclude group: "org.slf4j", module: "jcl-over-slf4j"
615615
}
616+
optional("org.apache.tiles:tiles-extras:3.0.1") {
617+
exclude group: "org.slf4j", module: "jcl-over-slf4j"
618+
}
616619
optional("org.apache.tiles:tiles-el:3.0.1") {
617620
exclude group: "org.slf4j", module: "jcl-over-slf4j"
618621
}
619622
provided("javax.servlet:javax.servlet-api:3.0.1")
620-
compile(project(":spring-web").sourceSets*.output) // mock request & response
621623
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
622624
}
623625
}
@@ -641,10 +643,22 @@ project("spring-webmvc-portlet") {
641643

642644
project("spring-test") {
643645
description = "Spring TestContext Framework"
646+
647+
task testNG(type: Test) {
648+
useTestNG()
649+
// "TestCase" classes are run by other test classes, not the build.
650+
exclude "**/*TestCase.class"
651+
// Generate TestNG reports alongside JUnit reports.
652+
testReport true
653+
}
654+
644655
test {
656+
dependsOn testNG
645657
useJUnit()
646-
useTestNG()
658+
// "TestCase" classes are run by other test classes, not the build.
659+
exclude(["**/*TestCase.class", "**/*TestSuite.class"])
647660
}
661+
648662
dependencies {
649663
compile(project(":spring-core"))
650664
optional(project(":spring-beans"))
@@ -676,7 +690,7 @@ project("spring-test-mvc") {
676690
merge.into = project(":spring-test")
677691
dependencies {
678692
optional(project(":spring-context"))
679-
compile(project(":spring-webmvc"))
693+
provided(project(":spring-webmvc"))
680694
provided("javax.servlet:javax.servlet-api:3.0.1")
681695
optional("org.hamcrest:hamcrest-core:1.3")
682696
optional("com.jayway.jsonpath:json-path:0.8.1")
@@ -753,19 +767,23 @@ configure(rootProject) {
753767

754768
apply plugin: "docbook-reference"
755769
apply plugin: "groovy"
770+
apply plugin: "detect-split-packages"
756771
apply from: "${gradleScriptDir}/jdiff.gradle"
757772

758773
reference {
759774
sourceDir = file("src/reference/docbook")
760775
pdfFilename = "spring-framework-reference.pdf"
761776
}
762777

763-
// don"t publish the default jar for the root project
778+
detectSplitPackages {
779+
projectsToScan -= project(":spring-instrument-tomcat")
780+
}
781+
782+
// don't publish the default jar for the root project
764783
configurations.archives.artifacts.clear()
765784

766785
dependencies { // for integration tests
767786
testCompile(project(":spring-core"))
768-
testCompile(project(":spring-core").sourceSets.test.output)
769787
testCompile(project(":spring-beans"))
770788
testCompile(project(":spring-aop"))
771789
testCompile(project(":spring-expression"))
@@ -790,29 +808,37 @@ configure(rootProject) {
790808
description = "Generates aggregated Javadoc API documentation."
791809
title = "${rootProject.description} ${version} API"
792810

811+
dependsOn {
812+
subprojects.collect {
813+
it.tasks.getByName("jar")
814+
}
815+
}
793816
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
794817
options.author = true
795818
options.header = rootProject.description
796819
options.overview = "src/api/overview.html"
820+
options.stylesheetFile = file("src/api/stylesheet.css")
797821
options.splitIndex = true
798822
options.links(project.ext.javadocLinks)
799823

800824
source subprojects.collect { project ->
801825
project.sourceSets.main.allJava
802826
}
803827

804-
classpath = files(
805-
// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
806-
// classpath over their respective 2.5 and 3.x variants
807-
project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
808-
rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
809-
// ensure the javadoc process can resolve types compiled from .aj sources
810-
project(":spring-aspects").sourceSets.main.output
811-
)
812-
classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
813-
814828
maxMemory = "1024m"
815829
destinationDir = new File(buildDir, "api")
830+
831+
doFirst {
832+
classpath = files(
833+
// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
834+
// classpath over their respective 2.5 and 3.x variants
835+
project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
836+
rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
837+
// ensure the javadoc process can resolve types compiled from .aj sources
838+
project(":spring-aspects").sourceSets.main.output
839+
)
840+
classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
841+
}
816842
}
817843

818844
task docsZip(type: Zip) {
@@ -954,6 +980,7 @@ configure(rootProject) {
954980
"set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=")
955981
}
956982
}
983+
957984
}
958985

959986
/*

0 commit comments

Comments
 (0)
X Tutup