Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Include eclipse source formatter #98

Closed
wants to merge 65 commits into from

8 participants

@philwebb
Owner

Restore eclipse-code-formatter.xml from Spring 3.1 (now in src/eclipse)
and also update the gradle build to generate eclipse project specific
settings.

Eclipse settings now includes:

  • Java Formatting settings
  • Cleanup options
  • Warning settings
  • Code template to add the Apache header

Issues: SPR-9518

@cbeams cbeams was assigned
philwebb and others added some commits
@philwebb philwebb Add test dependencies sources for testCompile
Update the TestSourceSetDependenciesPlugin to consider testCompile
configurations.
d52f883
@philwebb philwebb Polish test sourceSet dependencies
Remove all direct sourceSets.test.output dependencies and instead rely
on the 'test-source-set-dependencies' plugin.

This commit also updates the api JavaDoc task to ensure that
dependencies are not resolved too early.
16a3a8b
@cbeams cbeams Merge branch 'share-test-classes' into cleanup-3.2.x
* share-test-classes:
  Polish test sourceSet dependencies
  Add test dependencies sources for testCompile
bd1db73
@philwebb philwebb Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'.
2a30fa0
@philwebb philwebb Remove duplicate test classes
Prior to this commit many test utility classes and sample beans were
duplicated across projects. This was previously necessary due to the
fact that dependent test sources were not shared during a gradle
build. Since the introduction of the 'test-source-set-dependencies'
gradle plugin this is no longer the case.

This commit attempts to remove as much duplicate code as possible,
co-locating test utilities and beans in the most suitable project.
For example, test beans are now located in the 'spring-beans'
project.

Some of the duplicated code had started to drift apart when
modifications made in one project where not ported to others. All
changes have now been consolidated and when necessary existing tests
have been refactored to account for the differences.

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
	spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
42b5d6d
@cbeams cbeams Update Apache license headers for affected sources d1e6dbe
@cbeams cbeams Merge branch 'cleanup-test-duplicates' into cleanup-3.2.x
* cleanup-test-duplicates:
  Update Apache license headers for affected sources
  Remove duplicate test classes
  Replace test beans with test objects

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
b836e14
@cbeams cbeams Merge branch 'cleanup-3.2.x' into SPR-9431
Catch up to latest changes on cleanup-3.2.x in order to avoid conflicts
when adding additional commits fixing compiler warnings.
0351787
@cbeams cbeams Fix warnings due to unused import statements
Issue: SPR-9431
51b3076
@cbeams cbeams Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.

This change was prompted by associated Eclipse warnings, which have now
been quelled.

Issue: SPR-9431
15e9fe6
@cbeams cbeams Fix several miscellaneous compiler/Eclipse warnings
 - Suppress an (intentional) AspectJ warning
 - Remove unused imports
 - Suppress a [hiding] warning
 - Fix a generics warning related to extension of final types

Issue: SPR-9431
662a02b
@cbeams cbeams Move namespace tests to root integration module
Prior to this change, spring-beans contained its own META-INF containing
spring.handlers and spring.schemas files in src/main/resources; it also
had files of the same name within src/test/resources/META-INF, causing
'duplicate resource' warnings and confusion in general.

This commit moves the com.foo test package, it's associated namespace
parsing tests and test versions of META-INF files to the root project
and it's src/test integration testing folder.

Issue: SPR-9431
4272901
@cbeams cbeams Update Apache license headers for moved files
Issue: SPR-9431
6762316
@cbeams cbeams Eliminate AJ @Async warning in test case
Prior to this commit, ClassWithAsyncAnnotation#return5 forced an
unsuppressable warning in Eclipse, making it virtually impossible to
get to a zero-warnings state in the codebase.

The 'solution' here is simply to comment out the method and it's
associated test case. The 'declare warnings' functionality around
@Async is well-understood and has long been stable.

Also, the entire AnnotationAsyncExecutionAspectTests class has been
added to TestGroup#PERFORMANCE (SPR-9984), as opposed to just
asyncMethodGetsRoutedAsynchronously as it was previously, the
rationale being that all tests are actually timing dependent.

Issue: SPR-9431, SPR-9984
cf68cc5
@cbeams cbeams Merge branch 'SPR-9431' into cleanup-3.2.x
* SPR-9431:
  Eliminate AJ @Async warning in test case
  Update Apache license headers for moved files
  Move namespace tests to root integration module
  Fix several miscellaneous compiler/Eclipse warnings
  Remove duplicate test resources
  Fix warnings due to unused import statements
3a61e99
@cbeams cbeams Merge branch 'cleanup-3.2.x' into 3.2.x
* cleanup-3.2.x:
  Eliminate AJ @Async warning in test case
  Update Apache license headers for moved files
  Move namespace tests to root integration module
  Fix several miscellaneous compiler/Eclipse warnings
  Remove duplicate test resources
  Fix warnings due to unused import statements
  Update Apache license headers for affected sources
  Remove duplicate test classes
  Replace test beans with test objects
  Polish test sourceSet dependencies
  Add test dependencies sources for testCompile
895feda
@philwebb philwebb Merge branch 'cleanup-3.2.x' into SPR-10126
* cleanup-3.2.x: (37 commits)
  Eliminate AJ @Async warning in test case
  Update Apache license headers for moved files
  Move namespace tests to root integration module
  Fix several miscellaneous compiler/Eclipse warnings
  Remove duplicate test resources
  Fix warnings due to unused import statements
  Update Apache license headers for affected sources
  Remove duplicate test classes
  Replace test beans with test objects
  Polish test sourceSet dependencies
  Add test dependencies sources for testCompile
  Use unmodified 'version' when not on a topic branch
  Enable execution of TestNG tests in spring-test
  Polish support for topic branch-specific versions
  Segregate add'l long-running and performance tests
  Eliminate EBR dependencies and repository config
  Skip creation of IDEA metadata for spring-aspects
  Fix Eclipse compilation error in Gradle plugin
  Polish build.gradle
  Recursively add test dependencies
  ...
b78a8a4
@sslavic sslavic Mark all IsFastEnough tests as performance tests
This patch marks remaining/missed tests as ones belonging to
performance tests group.

Issue: SPR-9984
4c0a306
@cbeams cbeams Merge pull request #212 from sslavic/SPR-9984
# By Stevo Slavic
* sslavic/SPR-9984:
  Mark all IsFastEnough tests as performance tests
29dd91b
@cbeams cbeams Merge branch 'SPR-9984' into cleanup-3.2.x
* SPR-9984:
  Mark all IsFastEnough tests as performance tests
ad1fda5
Glyn Normington Detect split packages at build time
Split packages are a well-known anti-pattern for OSGi and a blocker for
Eclipse Virgo (which prevents split packages being accessed via its
Import-Library construct).

Split packages are also unhelpful with a traditional linear classpath
as a split package name does not uniquely identify the Spring framework
JAR from which it came, thus complicating problem diagnosis and
maintenance.

Juergen Hoeller supports this position in the following comment in
SPR-9990:

>FWIW, I generally find split packages a bad practice, even without
>OSGi in the mix. For the Spring Framework codebase, I consider a
>split-package arrangement a design accident that we want to detect
>in any case - and that we're willing to fix if it happened.
>
>I'm actually equally concerned about the source perspective: After
>all, we want a package to be comprehensible from a single glance
>at the project, not requiring the developer to jump into several
>source modules to understand the overall layout of a package.

Split packages have crept into Spring framework twice in recent months
- see SPR-9811 and SPR-9988. Currently, they are only detected once
the Spring framework has been converted to OSGi bundles and these
bundles have been tested with Eclipse Virgo.

This commit adds a build-time check for split packages to the Spring
framework build.

Issue: SPR-9990

Conflicts:

	build.gradle
00a86c3
@rwinch rwinch Example SplitPackageDetectorPlugin a27a3be
Glyn Normington Rework split package detection code
Allow packages to be split across projects which will be merged into a
single JAR file.

Make split package detection a dependency of the 'check' task. This
is idiomatic gradle as well as allowing the 'test' task (another
dependency of 'check') to be executed without split packages being
detected.

Omit the project spring-instructment-tomcat from the check on the basis
of SPR-10150.

Issues: SPR-9990, SPR-10150

Conflicts:

	build.gradle
2df08bd
@cbeams

@philwebb, this change causes ./gradlew clean api to fail, because spring-core's asmRepackJar and cglibRepackJar tasks are not executed, meaning that these JARs are not available on the classpath when javadoc is trying to resolve symbols.

Your comment states that "This commit also updates the api JavaDoc task to ensure that dependencies are not resolved too early." — what was the actual problem here? Why was it "bad" to have deps resolving early?

In any case, can you see about fixing this up? I'd prefer not to go the route of having api depend on (cglib|asm)RepackJar tasks — this means that api has to know "too much", IMO.

Thanks!

Owner

Commit f92f58d has fixed this

philwebb and others added some commits
@philwebb philwebb Gradle 'api' task depends on 'jar' tasks
Update the gradle 'api' task to depend on the 'jar' task of all
subprojects. This intern ensures that the 'asmRepackJar' and
'cglibRepackJar' tasks run which is critical for JavaDoc
generation.
f92f58d
@rstoyanchev rstoyanchev Support "X-Forwarded-Host" in UriComponentsBuilder
ServletUriComponentsBuilder now supports setting the host to the
value held in the X-Forwarded-Host [0] header used in reverse
proxy scenarios.

[0] http://tools.ietf.org/html/draft-ietf-appsawg-http-forwarded-10

Issue: SPR-10110
153508a
@philwebb philwebb Merge branch 'cleanup-3.2.x' into 3.2.x
* cleanup-3.2.x:
  Gradle 'api' task depends on 'jar' tasks
  Mark all IsFastEnough tests as performance tests
15c0971
@rstoyanchev rstoyanchev Add support for placeholders in @RequestMapping
@RequestMapping annotations now support ${...} placeholders.

Issue: SPR-9935
7bc9667
@cbeams cbeams Add 3.1 migration section to reference docs
Address error raised when using component-scan against the unqualified
"org" base package.

Issue: SPR-9843
b8f223c
@cbeams cbeams Merge branch 'SPR-9843' into 3.2.x
* SPR-9843:
  Add 3.1 migration section to reference docs
4611d15
@acogoluegnes acogoluegnes Add support for HTTP OPTIONS in Spring MVC Test
Issue: SPR-10093
a56d8f2
@rstoyanchev rstoyanchev Fix issue in BufferedImageHttpMessageConverter
This change ensures BufferedImageHttpMessageConverter writes when
"*/*" is requested.

Issue: SPR-7763
2391277
@rstoyanchev rstoyanchev Add decoding matrix variable values
Issue: SPR-10140
87109b3
@rstoyanchev rstoyanchev Update mvc chapter on annotations and proxies
Issue: SPR-10132
2ac4a8c
@rstoyanchev rstoyanchev Remove closing tag in form tag's extra hidden fields
The fields returned from a RequestDataValueProcessor are now
written as hidden fields without a closing tag.

Before:
<input type="hidden" name="xxx" value="yyy"></input>

After:
<input type="hidden" name="xxx" value="yyy" />

Issue: SPR-10103
c7d0054
@rstoyanchev rstoyanchev Merge pull request #205 from acogoluegnes/SPR-10093
* tmp:
  Add support for HTTP OPTIONS in Spring MVC Test
0760594
@cbeams cbeams Update license header for recently modified files
Issue: SPR-7763, SPR-10140, SPR-10132, SPR-10093, SPR-10103
0829cbf
@rstoyanchev rstoyanchev Update info on RestTemplate related to 401 status code
Issue: SPR-9367
24ffa5a
@rstoyanchev rstoyanchev Add option to always append 'must-revalidate'
Issue: SPR-9248
68d4a70
@rstoyanchev rstoyanchev Add option to not trim path segments in AntPathMatch
Issue: SPR-8687
f185c3a
@rstoyanchev rstoyanchev Add protected method to AbstractHandlerMethodMapping 2f6e45f
@philwebb philwebb Replace EasyMock with Mockito in spring-orm
Issue: SPR-10126
ee1ddc9
@philwebb philwebb Merge branch 'SPR-10126' into cleanup-3.2.x
* SPR-10126:
  Replace EasyMock with Mockito in spring-orm
1386479
@philwebb philwebb Merge branch 'cleanup-3.2.x' into 3.2.x
* cleanup-3.2.x:
  Replace EasyMock with Mockito in spring-orm
0b612d6
@sbrannen sbrannen Ensure JUnit & TestNG tests run in spring-test
Prior to this commit, the Gradle build configuration only executed
TestNG-based tests and effectively disabled all JUnit-based tests in the
spring-test module. Furthermore, TestNG-based tests were not properly
reported in Bamboo CI builds.

This commit ensures that both JUnit and TestNG tests are executed in the
Gradle build by defining a new testNG task within the spring-test
configuration. The test task now depends on the new testNG task.
Furthermore, the testNG task makes use of Gradle 1.3's support for
generating test reports for TestNG tests alongside reports for JUnit
tests. The net effect is that all tests are executed and reportedly
properly in Bamboo builds on the CI server.

- Enabled both JUnit and TestNG tests for the spring-test module.
- Corrected bugs in FailingBeforeAndAfterMethodsTests introduced in
  commit 3d1b386.
- Deleted the now obsolete SPR-9398.txt file.

Issue: SPR-9398
4ae9cf7
@jhoeller jhoeller Marked LocalCacheProviderProxy as deprecated (following Hibernate 3.3…
….'s CacheProvider deprecation)
10dceb1
@jhoeller jhoeller MessageSourceResourceBundle overrides JDK 1.6 containsKey method, avo…
…iding NPE in getKeys

Issue: SPR-10136
3a9ca4a
@jhoeller jhoeller AbstractAdvisingBeanPostProcessor caches per bean target class, worki…
…ng for null bean names as well

Issue: SPR-10144
97ae403
@jhoeller jhoeller MimeMessageHelper encodes attachment filename if not ASCII compliant
Issue: SPR-9258
f8a7cf9
@jhoeller jhoeller FreeMarkerConfigurationFactory properly supports TemplateLoaders when…
… recreating Configurations

Issue: SPR-9389
5e8e901
@jhoeller jhoeller SpringContextResourceAdapter implements equals/hashCode according to …
…the JCA 1.5 contract

Issue: SPR-9162
f6d7518
@jhoeller jhoeller Added dedicated sort method to AnnotationAwareOrderComparator
Issue: SPR-9625
dae4485
@jhoeller jhoeller AnnotationAwareOrderComparator is able to sort Class objects as well
Issue: SPR-10152
e806c4e
@jhoeller jhoeller AnnotationAwareOrderComparator etc ea823fd
@sbrannen sbrannen Polish Javadoc in CookieValue and RequestHeader 2427391
@rwinch rwinch Use explicit JDK versions in aspects.gradle
Previously aspects.gradle used the Gradle conventions for the source
and target compatibility. This means that unless the conventions were
updated the current JDK would be used for both source and target
compatibilty. Since an update to build.gradle changed to configure the
compileJava and compileTestJava tasks explicitly spring-aspects has
been compiled with JDK 7 compatibility.

This commit explicitly uses the source and target compatibility from
spring-core to ensure that aspects.gradle is kept up to date.

Issue: SPR-10161
91da138
@sbrannen sbrannen Update Javadoc for MockMvc
Deleted reference to the obsolete configureWarRootDir() method from the
stand-alone spring-test-mvc project.
18bf860
@philwebb philwebb Exclude stax test dependency
Exclude transitive stax 1.0 dependency to prevent compile time
eclipse errors.
a0e5394
@philwebb philwebb Exclude eclipse WTP generated artifacts c425d22
@cbeams cbeams Replace space indentation with tabs
Issue: SPR-9990
b8f408e
@cbeams cbeams Refactor detect-split-packages Gradle plugin
 - Use conventional plugin naming, i.e. "detect-split-packages" instead
   of applying plugin based on fully-qualified class name

 - Rename "diagnose" => "detect" consistently throughout plugin, task
   and method names and generally refactor naming throughout to follow
   "detect split packages" phrasing

 - Add Javadoc to DetectSplitPackagesPlugin

 - Improve error reporting when split packages are detected

   Upon detecting one or more split packages, `detectSplitPackages` now
   fails idiomatically, throwing a GradleException to signal task failure
   (as opposed to the previous approach of using an assert assertion), and
   the output reads as follows:

       $ gradle detectSplitPackages
       [...]
       :buildSrc:build UP-TO-DATE
       :detectSplitPackages FAILED

       FAILURE: Build failed with an exception.

       * What went wrong:
       Execution failed for task ':detectSplitPackages'.
       > The following split package(s) have been detected:
          - org.springframework.beans (split across spring-beans and spring-orm)
          - org.springframework.core.env (split across spring-context and spring-core)

 - DetectSplitPackagesTask now automatically attaches itself to `check`
   task lifecycle if the enclosing project contains a `check` task

 - DetectSplitPackagesTask adds itself to the 'Verification' task group,
   ensuring that it shows up correctly in `gradle tasks` task listings

 - packagesToScan now defaults to all subprojects; users may then
   customize this by removing individual subprojects from the collection

Issue: SPR-9990
654c07d
@cbeams cbeams Merge pull request #214 from glyn/SPR-9990
# By Chris Beams (2) and others
* SPR-9990:
  Refactor detect-split-packages Gradle plugin
  Replace space indentation with tabs
  Rework split package detection code
  Example SplitPackageDetectorPlugin
  Detect split packages at build time
54d2846
@cbeams cbeams Polish changes from pull request #205
 - Replace space intendation with tabs
 - Remove leading tabs on otherwise empty lines
 - Remove illegal {@link ...} syntax in Javadoc @see reference

Issue: SPR-10093
7413779
@cbeams cbeams Merge branch 'SPR-10093' into 3.2.x
* SPR-10093:
  Polish changes from pull request #205
bfdc191
@philwebb philwebb Polish DetectSplitPackagesPlugin
Polish DetectSplitPackagesPlugin to favor double-quoted strings.
c1fe3c0
@philwebb philwebb Generate eclipse project settings from gradle
Update gradle to generate the following project specific eclipse
settings:

- Java formatting
- Cleanup options
- Warning settings
- Code template with copyright header
- WTP module meta-data

In addition this commit changes the eclipse project .classpath file
to output test and main classes to different folders. This is required
to prevent eclipse WTP from packaging test classes into /WEB-INF/lib
jar files.

Issue: SPR-9518
967ba7d
@philwebb philwebb closed this
@EtiennePerot EtiennePerot referenced this pull request in EtiennePerot/fuse-jna
Merged

Upgraded jna to 3.5.2 and switched to Gradle #11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 4, 2013
  1. @philwebb @cbeams

    Add test dependencies sources for testCompile

    philwebb authored cbeams committed
    Update the TestSourceSetDependenciesPlugin to consider testCompile
    configurations.
  2. @philwebb @cbeams

    Polish test sourceSet dependencies

    philwebb authored cbeams committed
    Remove all direct sourceSets.test.output dependencies and instead rely
    on the 'test-source-set-dependencies' plugin.
    
    This commit also updates the api JavaDoc task to ensure that
    dependencies are not resolved too early.
  3. @cbeams

    Merge branch 'share-test-classes' into cleanup-3.2.x

    cbeams authored
    * share-test-classes:
      Polish test sourceSet dependencies
      Add test dependencies sources for testCompile
  4. @philwebb @cbeams

    Replace test beans with test objects

    philwebb authored cbeams committed
    Refactor spring-core tests to replace test beans from
    'org.springframework.beans' with lighter test objects in
    'org.springframework.tests.sample.objects'.
  5. @philwebb @cbeams

    Remove duplicate test classes

    philwebb authored cbeams committed
    Prior to this commit many test utility classes and sample beans were
    duplicated across projects. This was previously necessary due to the
    fact that dependent test sources were not shared during a gradle
    build. Since the introduction of the 'test-source-set-dependencies'
    gradle plugin this is no longer the case.
    
    This commit attempts to remove as much duplicate code as possible,
    co-locating test utilities and beans in the most suitable project.
    For example, test beans are now located in the 'spring-beans'
    project.
    
    Some of the duplicated code had started to drift apart when
    modifications made in one project where not ported to others. All
    changes have now been consolidated and when necessary existing tests
    have been refactored to account for the differences.
    
    Conflicts:
    	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
    	spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
    	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
  6. @cbeams
  7. @cbeams

    Merge branch 'cleanup-test-duplicates' into cleanup-3.2.x

    cbeams authored
    * cleanup-test-duplicates:
      Update Apache license headers for affected sources
      Remove duplicate test classes
      Replace test beans with test objects
    
    Conflicts:
    	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
    	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
  8. @cbeams

    Merge branch 'cleanup-3.2.x' into SPR-9431

    cbeams authored
    Catch up to latest changes on cleanup-3.2.x in order to avoid conflicts
    when adding additional commits fixing compiler warnings.
  9. @cbeams

    Fix warnings due to unused import statements

    cbeams authored
    Issue: SPR-9431
  10. @cbeams

    Remove duplicate test resources

    cbeams authored
    The files deleted in this commit existed in identical form in two places
    within a given module; typically in src/test/java and
    src/test/resources. The version within src/test/resources has been
    favored in all cases.
    
    This change was prompted by associated Eclipse warnings, which have now
    been quelled.
    
    Issue: SPR-9431
  11. @cbeams

    Fix several miscellaneous compiler/Eclipse warnings

    cbeams authored
     - Suppress an (intentional) AspectJ warning
     - Remove unused imports
     - Suppress a [hiding] warning
     - Fix a generics warning related to extension of final types
    
    Issue: SPR-9431
  12. @cbeams

    Move namespace tests to root integration module

    cbeams authored
    Prior to this change, spring-beans contained its own META-INF containing
    spring.handlers and spring.schemas files in src/main/resources; it also
    had files of the same name within src/test/resources/META-INF, causing
    'duplicate resource' warnings and confusion in general.
    
    This commit moves the com.foo test package, it's associated namespace
    parsing tests and test versions of META-INF files to the root project
    and it's src/test integration testing folder.
    
    Issue: SPR-9431
  13. @cbeams

    Update Apache license headers for moved files

    cbeams authored
    Issue: SPR-9431
  14. @cbeams

    Eliminate AJ @Async warning in test case

    cbeams authored
    Prior to this commit, ClassWithAsyncAnnotation#return5 forced an
    unsuppressable warning in Eclipse, making it virtually impossible to
    get to a zero-warnings state in the codebase.
    
    The 'solution' here is simply to comment out the method and it's
    associated test case. The 'declare warnings' functionality around
    @Async is well-understood and has long been stable.
    
    Also, the entire AnnotationAsyncExecutionAspectTests class has been
    added to TestGroup#PERFORMANCE (SPR-9984), as opposed to just
    asyncMethodGetsRoutedAsynchronously as it was previously, the
    rationale being that all tests are actually timing dependent.
    
    Issue: SPR-9431, SPR-9984
  15. @cbeams

    Merge branch 'SPR-9431' into cleanup-3.2.x

    cbeams authored
    * SPR-9431:
      Eliminate AJ @Async warning in test case
      Update Apache license headers for moved files
      Move namespace tests to root integration module
      Fix several miscellaneous compiler/Eclipse warnings
      Remove duplicate test resources
      Fix warnings due to unused import statements
  16. @cbeams

    Merge branch 'cleanup-3.2.x' into 3.2.x

    cbeams authored
    * cleanup-3.2.x:
      Eliminate AJ @Async warning in test case
      Update Apache license headers for moved files
      Move namespace tests to root integration module
      Fix several miscellaneous compiler/Eclipse warnings
      Remove duplicate test resources
      Fix warnings due to unused import statements
      Update Apache license headers for affected sources
      Remove duplicate test classes
      Replace test beans with test objects
      Polish test sourceSet dependencies
      Add test dependencies sources for testCompile
  17. @philwebb

    Merge branch 'cleanup-3.2.x' into SPR-10126

    philwebb authored
    * cleanup-3.2.x: (37 commits)
      Eliminate AJ @Async warning in test case
      Update Apache license headers for moved files
      Move namespace tests to root integration module
      Fix several miscellaneous compiler/Eclipse warnings
      Remove duplicate test resources
      Fix warnings due to unused import statements
      Update Apache license headers for affected sources
      Remove duplicate test classes
      Replace test beans with test objects
      Polish test sourceSet dependencies
      Add test dependencies sources for testCompile
      Use unmodified 'version' when not on a topic branch
      Enable execution of TestNG tests in spring-test
      Polish support for topic branch-specific versions
      Segregate add'l long-running and performance tests
      Eliminate EBR dependencies and repository config
      Skip creation of IDEA metadata for spring-aspects
      Fix Eclipse compilation error in Gradle plugin
      Polish build.gradle
      Recursively add test dependencies
      ...
Commits on Jan 7, 2013
  1. @sslavic @cbeams

    Mark all IsFastEnough tests as performance tests

    sslavic authored cbeams committed
    This patch marks remaining/missed tests as ones belonging to
    performance tests group.
    
    Issue: SPR-9984
  2. @cbeams

    Merge pull request #212 from sslavic/SPR-9984

    cbeams authored
    # By Stevo Slavic
    * sslavic/SPR-9984:
      Mark all IsFastEnough tests as performance tests
  3. @cbeams

    Merge branch 'SPR-9984' into cleanup-3.2.x

    cbeams authored
    * SPR-9984:
      Mark all IsFastEnough tests as performance tests
  4. Detect split packages at build time

    Glyn Normington authored
    Split packages are a well-known anti-pattern for OSGi and a blocker for
    Eclipse Virgo (which prevents split packages being accessed via its
    Import-Library construct).
    
    Split packages are also unhelpful with a traditional linear classpath
    as a split package name does not uniquely identify the Spring framework
    JAR from which it came, thus complicating problem diagnosis and
    maintenance.
    
    Juergen Hoeller supports this position in the following comment in
    SPR-9990:
    
    >FWIW, I generally find split packages a bad practice, even without
    >OSGi in the mix. For the Spring Framework codebase, I consider a
    >split-package arrangement a design accident that we want to detect
    >in any case - and that we're willing to fix if it happened.
    >
    >I'm actually equally concerned about the source perspective: After
    >all, we want a package to be comprehensible from a single glance
    >at the project, not requiring the developer to jump into several
    >source modules to understand the overall layout of a package.
    
    Split packages have crept into Spring framework twice in recent months
    - see SPR-9811 and SPR-9988. Currently, they are only detected once
    the Spring framework has been converted to OSGi bundles and these
    bundles have been tested with Eclipse Virgo.
    
    This commit adds a build-time check for split packages to the Spring
    framework build.
    
    Issue: SPR-9990
    
    Conflicts:
    
    	build.gradle
  5. @rwinch

    Example SplitPackageDetectorPlugin

    rwinch authored Glyn Normington committed
  6. Rework split package detection code

    Glyn Normington authored
    Allow packages to be split across projects which will be merged into a
    single JAR file.
    
    Make split package detection a dependency of the 'check' task. This
    is idiomatic gradle as well as allowing the 'test' task (another
    dependency of 'check') to be executed without split packages being
    detected.
    
    Omit the project spring-instructment-tomcat from the check on the basis
    of SPR-10150.
    
    Issues: SPR-9990, SPR-10150
    
    Conflicts:
    
    	build.gradle
  7. @philwebb

    Gradle 'api' task depends on 'jar' tasks

    philwebb authored
    Update the gradle 'api' task to depend on the 'jar' task of all
    subprojects. This intern ensures that the 'asmRepackJar' and
    'cglibRepackJar' tasks run which is critical for JavaDoc
    generation.
  8. @rstoyanchev

    Support "X-Forwarded-Host" in UriComponentsBuilder

    rstoyanchev authored
    ServletUriComponentsBuilder now supports setting the host to the
    value held in the X-Forwarded-Host [0] header used in reverse
    proxy scenarios.
    
    [0] http://tools.ietf.org/html/draft-ietf-appsawg-http-forwarded-10
    
    Issue: SPR-10110
  9. @philwebb

    Merge branch 'cleanup-3.2.x' into 3.2.x

    philwebb authored
    * cleanup-3.2.x:
      Gradle 'api' task depends on 'jar' tasks
      Mark all IsFastEnough tests as performance tests
  10. @rstoyanchev

    Add support for placeholders in @RequestMapping

    rstoyanchev authored
    @RequestMapping annotations now support ${...} placeholders.
    
    Issue: SPR-9935
Commits on Jan 8, 2013
  1. @cbeams

    Add 3.1 migration section to reference docs

    cbeams authored
    Address error raised when using component-scan against the unqualified
    "org" base package.
    
    Issue: SPR-9843
  2. @cbeams

    Merge branch 'SPR-9843' into 3.2.x

    cbeams authored
    * SPR-9843:
      Add 3.1 migration section to reference docs
  3. @acogoluegnes @rstoyanchev

    Add support for HTTP OPTIONS in Spring MVC Test

    acogoluegnes authored rstoyanchev committed
    Issue: SPR-10093
  4. @rstoyanchev

    Fix issue in BufferedImageHttpMessageConverter

    rstoyanchev authored
    This change ensures BufferedImageHttpMessageConverter writes when
    "*/*" is requested.
    
    Issue: SPR-7763
  5. @rstoyanchev

    Add decoding matrix variable values

    rstoyanchev authored
    Issue: SPR-10140
  6. @rstoyanchev

    Update mvc chapter on annotations and proxies

    rstoyanchev authored
    Issue: SPR-10132
  7. @rstoyanchev

    Remove closing tag in form tag's extra hidden fields

    rstoyanchev authored
    The fields returned from a RequestDataValueProcessor are now
    written as hidden fields without a closing tag.
    
    Before:
    <input type="hidden" name="xxx" value="yyy"></input>
    
    After:
    <input type="hidden" name="xxx" value="yyy" />
    
    Issue: SPR-10103
  8. @rstoyanchev

    Merge pull request #205 from acogoluegnes/SPR-10093

    rstoyanchev authored
    * tmp:
      Add support for HTTP OPTIONS in Spring MVC Test
  9. @cbeams

    Update license header for recently modified files

    cbeams authored
    Issue: SPR-7763, SPR-10140, SPR-10132, SPR-10093, SPR-10103
  10. @rstoyanchev
  11. @rstoyanchev

    Add option to always append 'must-revalidate'

    rstoyanchev authored
    Issue: SPR-9248
  12. @rstoyanchev
Commits on Jan 9, 2013
  1. @rstoyanchev
Commits on Jan 10, 2013
  1. @philwebb

    Replace EasyMock with Mockito in spring-orm

    philwebb authored
    Issue: SPR-10126
  2. @philwebb

    Merge branch 'SPR-10126' into cleanup-3.2.x

    philwebb authored
    * SPR-10126:
      Replace EasyMock with Mockito in spring-orm
  3. @philwebb

    Merge branch 'cleanup-3.2.x' into 3.2.x

    philwebb authored
    * cleanup-3.2.x:
      Replace EasyMock with Mockito in spring-orm
  4. @sbrannen

    Ensure JUnit & TestNG tests run in spring-test

    sbrannen authored
    Prior to this commit, the Gradle build configuration only executed
    TestNG-based tests and effectively disabled all JUnit-based tests in the
    spring-test module. Furthermore, TestNG-based tests were not properly
    reported in Bamboo CI builds.
    
    This commit ensures that both JUnit and TestNG tests are executed in the
    Gradle build by defining a new testNG task within the spring-test
    configuration. The test task now depends on the new testNG task.
    Furthermore, the testNG task makes use of Gradle 1.3's support for
    generating test reports for TestNG tests alongside reports for JUnit
    tests. The net effect is that all tests are executed and reportedly
    properly in Bamboo builds on the CI server.
    
    - Enabled both JUnit and TestNG tests for the spring-test module.
    - Corrected bugs in FailingBeforeAndAfterMethodsTests introduced in
      commit 3d1b386.
    - Deleted the now obsolete SPR-9398.txt file.
    
    Issue: SPR-9398
  5. @jhoeller

    Marked LocalCacheProviderProxy as deprecated (following Hibernate 3.3…

    jhoeller authored unknown committed
    ….'s CacheProvider deprecation)
  6. @jhoeller

    MessageSourceResourceBundle overrides JDK 1.6 containsKey method, avo…

    jhoeller authored unknown committed
    …iding NPE in getKeys
    
    Issue: SPR-10136
  7. @jhoeller

    AbstractAdvisingBeanPostProcessor caches per bean target class, worki…

    jhoeller authored unknown committed
    …ng for null bean names as well
    
    Issue: SPR-10144
  8. @jhoeller

    MimeMessageHelper encodes attachment filename if not ASCII compliant

    jhoeller authored unknown committed
    Issue: SPR-9258
  9. @jhoeller

    FreeMarkerConfigurationFactory properly supports TemplateLoaders when…

    jhoeller authored unknown committed
    … recreating Configurations
    
    Issue: SPR-9389
  10. @jhoeller

    SpringContextResourceAdapter implements equals/hashCode according to …

    jhoeller authored unknown committed
    …the JCA 1.5 contract
    
    Issue: SPR-9162
  11. @jhoeller

    Added dedicated sort method to AnnotationAwareOrderComparator

    jhoeller authored unknown committed
    Issue: SPR-9625
  12. @jhoeller

    AnnotationAwareOrderComparator is able to sort Class objects as well

    jhoeller authored unknown committed
    Issue: SPR-10152
  13. @jhoeller
  14. @sbrannen
  15. @rwinch

    Use explicit JDK versions in aspects.gradle

    rwinch authored
    Previously aspects.gradle used the Gradle conventions for the source
    and target compatibility. This means that unless the conventions were
    updated the current JDK would be used for both source and target
    compatibilty. Since an update to build.gradle changed to configure the
    compileJava and compileTestJava tasks explicitly spring-aspects has
    been compiled with JDK 7 compatibility.
    
    This commit explicitly uses the source and target compatibility from
    spring-core to ensure that aspects.gradle is kept up to date.
    
    Issue: SPR-10161
  16. @sbrannen

    Update Javadoc for MockMvc

    sbrannen authored
    Deleted reference to the obsolete configureWarRootDir() method from the
    stand-alone spring-test-mvc project.
Commits on Jan 11, 2013
  1. @philwebb

    Exclude stax test dependency

    philwebb authored
    Exclude transitive stax 1.0 dependency to prevent compile time
    eclipse errors.
  2. @philwebb
  3. @cbeams

    Replace space indentation with tabs

    cbeams authored
    Issue: SPR-9990
  4. @cbeams

    Refactor detect-split-packages Gradle plugin

    cbeams authored
     - Use conventional plugin naming, i.e. "detect-split-packages" instead
       of applying plugin based on fully-qualified class name
    
     - Rename "diagnose" => "detect" consistently throughout plugin, task
       and method names and generally refactor naming throughout to follow
       "detect split packages" phrasing
    
     - Add Javadoc to DetectSplitPackagesPlugin
    
     - Improve error reporting when split packages are detected
    
       Upon detecting one or more split packages, `detectSplitPackages` now
       fails idiomatically, throwing a GradleException to signal task failure
       (as opposed to the previous approach of using an assert assertion), and
       the output reads as follows:
    
           $ gradle detectSplitPackages
           [...]
           :buildSrc:build UP-TO-DATE
           :detectSplitPackages FAILED
    
           FAILURE: Build failed with an exception.
    
           * What went wrong:
           Execution failed for task ':detectSplitPackages'.
           > The following split package(s) have been detected:
              - org.springframework.beans (split across spring-beans and spring-orm)
              - org.springframework.core.env (split across spring-context and spring-core)
    
     - DetectSplitPackagesTask now automatically attaches itself to `check`
       task lifecycle if the enclosing project contains a `check` task
    
     - DetectSplitPackagesTask adds itself to the 'Verification' task group,
       ensuring that it shows up correctly in `gradle tasks` task listings
    
     - packagesToScan now defaults to all subprojects; users may then
       customize this by removing individual subprojects from the collection
    
    Issue: SPR-9990
  5. @cbeams

    Merge pull request #214 from glyn/SPR-9990

    cbeams authored
    # By Chris Beams (2) and others
    * SPR-9990:
      Refactor detect-split-packages Gradle plugin
      Replace space indentation with tabs
      Rework split package detection code
      Example SplitPackageDetectorPlugin
      Detect split packages at build time
  6. @cbeams

    Polish changes from pull request #205

    cbeams authored
     - Replace space intendation with tabs
     - Remove leading tabs on otherwise empty lines
     - Remove illegal {@link ...} syntax in Javadoc @see reference
    
    Issue: SPR-10093
  7. @cbeams

    Merge branch 'SPR-10093' into 3.2.x

    cbeams authored
    * SPR-10093:
      Polish changes from pull request #205
  8. @philwebb

    Polish DetectSplitPackagesPlugin

    philwebb authored
    Polish DetectSplitPackagesPlugin to favor double-quoted strings.
  9. @philwebb

    Generate eclipse project settings from gradle

    philwebb authored
    Update gradle to generate the following project specific eclipse
    settings:
    
    - Java formatting
    - Cleanup options
    - Warning settings
    - Code template with copyright header
    - WTP module meta-data
    
    In addition this commit changes the eclipse project .classpath file
    to output test and main classes to different folders. This is required
    to prevent eclipse WTP from packaging test classes into /WEB-INF/lib
    jar files.
    
    Issue: SPR-9518
Something went wrong with that request. Please try again.