1. 02 1月, 2013 1 次提交
  2. 29 12月, 2012 39 次提交
    • C
      Merge branch '3.2.x' into master · d5c6d797
      Chris Beams 提交于
      * 3.2.x:
        Add aop target source test to TestGroup.PERFORMANCE
      d5c6d797
    • C
      Merge branch 'SPR-9984' into 3.2.x · 55a05744
      Chris Beams 提交于
      * SPR-9984:
        Add aop target source test to TestGroup.PERFORMANCE
      55a05744
    • C
      Add aop target source test to TestGroup.PERFORMANCE · 90d1886c
      Chris Beams 提交于
      Issue: SPR-9984
      90d1886c
    • C
      Merge branch '3.2.x' into master · f87b1936
      Chris Beams 提交于
      * 3.2.x:
        Add quartz scheduling test to TestGroup.PERFORMANCE
      f87b1936
    • C
      Merge branch 'SPR-9984' into 3.2.x · 1220611f
      Chris Beams 提交于
      * SPR-9984:
        Add quartz scheduling test to TestGroup.PERFORMANCE
      1220611f
    • C
      Add quartz scheduling test to TestGroup.PERFORMANCE · c0057577
      Chris Beams 提交于
      Issue: SPR-9984
      c0057577
    • C
      Merge branch '3.2.x' into master · 30112369
      Chris Beams 提交于
      * 3.2.x:
        Remove extra URL prefix in the MVC chapter
        Polish contributor guidelines
      30112369
    • C
      Merge branch 'cleanup-master' into master · 08c2d2b1
      Chris Beams 提交于
      * cleanup-master: (36 commits)
        Update Apache license headers for affected sources
        Add @Override annotations to main sources
        Update main source and target JDK compatibility
        Update Apache license headers for affected sources
        Ignore performance-sensitive tests by default
        Introduce 'spring-build-junit' subproject
        Replace EasyMock with Mockito in test sources
        Add @Override annotations to test sources
        Update test source and target JDK compatibility
        Update -Xlint compiler warning output
        Fix various compiler warnings in spring-context
        Fix "unnecessary @SuppressWarnings" warnings
        Fix [rawtypes] compiler warnings
        Fix [dep-ann] warnings with @Deprecated
        Fix [cast] compiler warnings
        Fix [serial] compiler warnings
        Fix [varargs] compiler warnings
        Fix warnings due to unused import statements
        Replace <code> with {@code} throughout Javadoc
        Fix various Javadoc warnings
        ...
      08c2d2b1
    • C
      Update Apache license headers for affected sources · b2a048b6
      Chris Beams 提交于
      b2a048b6
    • C
      Merge branch 'SPR-10130' into cleanup-master · 45fa5082
      Chris Beams 提交于
      * SPR-10130:
        Add @Override annotations to main sources
        Update main source and target JDK compatibility
      45fa5082
    • C
      Add @Override annotations to main sources · 3b40ce76
      Chris Beams 提交于
      Issue: SPR-10130
      3b40ce76
    • C
      Update main source and target JDK compatibility · 9c2046c3
      Chris Beams 提交于
      Update source and target compatibility from 1.5 to 1.6, meaning that
      @Override is now allowed on implementations of interface methods within
      main classes.
      
      Issue: SPR-10130
      9c2046c3
    • C
      Merge branch 'cleanup-3.2.x' into cleanup-master · a312d900
      Chris Beams 提交于
      * cleanup-3.2.x: (33 commits)
        Update Apache license headers for affected sources
        Ignore performance-sensitive tests by default
        Introduce 'spring-build-junit' subproject
        Replace EasyMock with Mockito in test sources
        Add @Override annotations to test sources
        Update test source and target JDK compatibility
        Update -Xlint compiler warning output
        Fix various compiler warnings in spring-context
        Fix "unnecessary @SuppressWarnings" warnings
        Fix [rawtypes] compiler warnings
        Fix [dep-ann] warnings with @Deprecated
        Fix [cast] compiler warnings
        Fix [serial] compiler warnings
        Fix [varargs] compiler warnings
        Fix warnings due to unused import statements
        Replace <code> with {@code} throughout Javadoc
        Fix various Javadoc warnings
        Replace space indentation with tabs
        Remove trailing whitespace in source files
        Various updates to support IDEA
        ...
      
      Conflicts:
      	gradle.properties
      a312d900
    • C
      Merge pull request #208 from tommack/typo-fix · b83e2617
      Chris Beams 提交于
      # By Tom Mack
      * typo-fix:
        Remove extra URL prefix in the MVC chapter
      b83e2617
    • T
      Remove extra URL prefix in the MVC chapter · 005ee738
      Tom Mack 提交于
      A link in the MVC chapter of the reference manual contained an extra
      "http://" URL prefix.
      
      This commit removes the extra "http://" URL prefix.
      005ee738
    • S
      Polish contributor guidelines · 11d975bf
      Sam Brannen 提交于
      11d975bf
    • C
      Merge branch 'cleanup-3.2.x' into 3.2.x · 7736dc31
      Chris Beams 提交于
      * cleanup-3.2.x: (21 commits)
        Update Apache license headers for affected sources
        Ignore performance-sensitive tests by default
        Introduce 'spring-build-junit' subproject
        Replace EasyMock with Mockito in test sources
        Add @Override annotations to test sources
        Update test source and target JDK compatibility
        Update -Xlint compiler warning output
        Fix various compiler warnings in spring-context
        Fix "unnecessary @SuppressWarnings" warnings
        Fix [rawtypes] compiler warnings
        Fix [dep-ann] warnings with @Deprecated
        Fix [cast] compiler warnings
        Fix [serial] compiler warnings
        Fix [varargs] compiler warnings
        Fix warnings due to unused import statements
        Replace <code> with {@code} throughout Javadoc
        Fix various Javadoc warnings
        Replace space indentation with tabs
        Remove trailing whitespace in source files
        Various updates to support IDEA
        ...
      7736dc31
    • C
      Update Apache license headers for affected sources · 8472a2b2
      Chris Beams 提交于
      8472a2b2
    • C
      Merge branch 'SPR-9984' into cleanup-3.2.x · e7155616
      Chris Beams 提交于
      * SPR-9984:
        Ignore performance-sensitive tests by default
        Introduce 'spring-build-junit' subproject
      e7155616
    • P
      Ignore performance-sensitive tests by default · 60032e00
      Phillip Webb 提交于
      Make use of the new JUnit functionality introduced in the previous
      commit to 'Assume' that perfomance- and timing-sensitive tests should
      run only when TestGroup.PERFORMANCE is selected, i.e. when
      -PtestGroups="performance" has been provided at the Gradle command line.
      
      The net effect is that these tests are now ignored by default, which
      will result in far fewer false-negative CI build failures due to
      resource contention and other external factors that cause slowdowns.
      
      We will set up a dedicated performance CI build to run these tests on
      an isolated machine, etc.
      
      Issue: SPR-9984
      60032e00
    • P
      Introduce 'spring-build-junit' subproject · b083bbde
      Phillip Webb 提交于
      Introduce new 'spring-build-junit' subproject containing shared
      JUnit utilities and classes to be used by other test cases. This
      project is for internal use within the framework, and therefore
      creates no artifacts to be published to any repository.
      
      The initial code includes support for JUnit Assumptions that can
      be used to determine when a test should run. Tests can be skipped
      based on the running JDK version, logging level or based on specific
      'groups' that have activated via a Gradle property.
      
      It is intended that sources within the spring-build-junit project be
      folded into spring-core/src/test/java, pending some Gradle work that
      will facilitate sharing test output across subprojects; therefore this
      commit should be seen as a temporary solution.
      
      Issue: SPR-9984
      b083bbde
    • C
      Merge branch 'SPR-10126' into cleanup-3.2.x · 330457be
      Chris Beams 提交于
      * SPR-10126:
        Replace EasyMock with Mockito in test sources
      330457be
    • P
      Replace EasyMock with Mockito in test sources · d66c733e
      Phillip Webb 提交于
      Issue: SPR-10126
      d66c733e
    • C
      Merge branch 'SPR-10129' into cleanup-3.2.x · cbf6991d
      Chris Beams 提交于
      * SPR-10129:
        Add @Override annotations to test sources
        Update test source and target JDK compatibility
      cbf6991d
    • C
      Add @Override annotations to test sources · 4c8cd7b0
      Chris Beams 提交于
      Issue: SPR-10129
      4c8cd7b0
    • C
      Update test source and target JDK compatibility · 6f0c7eb8
      Chris Beams 提交于
      "test" source and target compatibility has been upgraded to 1.7 except
      where noted, allowing us to use 1.7 language features such as
      diamond-style (<>) generics declarations, automatic resource management
      and multi-catch. More importantly, we will be able to upgrade to 1.8
      once it is available in order to make use of lambda expressions, etc in
      our test cases.
      
      IDE configurations must be relaxed to allow 1.7 across the board, as
      neither Eclipse nor IDEA are clever enough to allow for different
      language levels across production and test resources. See [1] for a
      feature request on that front.
      
      spring-oxm is a special case here, and has been pinned at 1.6
      compatibility even for its test sources in order to avoid a class
      verification error that JibX throws when encountering 1.7-level
      bytecode [2].
      
      Likewise with spring-orm, toplink encounters a similar class
      verification error, so has been pinned to 1.6 for the time being.
      When we remove the (already deprecated since 3.2) Toplink support
      we can restore compatibility to 1.7.
      
      [1]: http://youtrack.jetbrains.com/issue/IDEA-97814
      [2]: http://jira.codehaus.org/browse/JIBX-465
      
      Issue: SPR-10129
      6f0c7eb8
    • C
      Merge branch 'SPR-9431' into cleanup-3.2.x · aa824641
      Chris Beams 提交于
      * SPR-9431:
        Update -Xlint compiler warning output
        Fix various compiler warnings in spring-context
        Fix "unnecessary @SuppressWarnings" warnings
        Fix [rawtypes] compiler warnings
        Fix [dep-ann] warnings with @Deprecated
        Fix [cast] compiler warnings
        Fix [serial] compiler warnings
        Fix [varargs] compiler warnings
        Fix warnings due to unused import statements
      aa824641
    • P
      Update -Xlint compiler warning output · 3ac45547
      Phillip Webb 提交于
      Enable output for the compiler warnings that have been eliminated so
      far. 'rawtypes', 'deprecation', and 'unchecked' remain suppressed until
      these warnings can be fully eliminated as well.
      3ac45547
    • C
      Fix various compiler warnings in spring-context · 40357be7
      Chris Beams 提交于
      All warning types other than [deprecation] and [unchecked] are now
      fixed in spring-context/src/test
      40357be7
    • C
      Fix "unnecessary @SuppressWarnings" warnings · 4c7cafbd
      Chris Beams 提交于
      4c7cafbd
    • C
      Fix [rawtypes] compiler warnings · 8d2e125e
      Chris Beams 提交于
       - Suppress rawtypes warnings for src/main
       - Enable rawtypes warnings for src/test
      
      This commit attempts to to resolve all rawtypes problems across tests as
      aggressively as possible, i.e. without regard for binary compatibility,
      whereas main sources must be treated much more cautiously with an eye
      toward compatibility.
      8d2e125e
    • C
      Fix [dep-ann] warnings with @Deprecated · 4d97ff24
      Chris Beams 提交于
      4d97ff24
    • P
      Fix [cast] compiler warnings · 6c14eaad
      Phillip Webb 提交于
      6c14eaad
    • P
      Fix [serial] compiler warnings · b0986049
      Phillip Webb 提交于
      Fix serialization warnings by applying @SuppressWarnings("serial")
      when appropriate.
      
      In certain cases and for unknown reasons, a correctly-placed
      @SuppressWarnings("serial") annotation will fix the warning at the
      javac level (i.e. the Gradle command-line), but will produce an
      "unnecessary @SuppressWarnings" warning within Eclipse. In these
      cases, a private static final serialVersionUID field has been added
      with the default value of 1L.
      b0986049
    • P
      Fix [varargs] compiler warnings · 7f0aa5cf
      Phillip Webb 提交于
      Remove unnecessary 'null' argument from calls to vararg supported
      methods and fix cast in ValidationUtils.invokeValidator().
      7f0aa5cf
    • P
      Fix warnings due to unused import statements · 731d5be6
      Phillip Webb 提交于
      731d5be6
    • C
      Merge branch 'SPR-10128' into cleanup-3.2.x · fe039030
      Chris Beams 提交于
      * SPR-10128:
        Replace <code> with {@code} throughout Javadoc
        Fix various Javadoc warnings
      fe039030
    • C
      Replace <code> with {@code} throughout Javadoc · 9540d2c8
      Chris Beams 提交于
      Issue: SPR-10128
      9540d2c8
    • C
      Fix various Javadoc warnings · 8597ec25
      Chris Beams 提交于
      Issue: SPR-10128
      8597ec25