1. 05 6月, 2013 2 次提交
    • P
      Do not consider all @Components as configuration · 2ecc51f0
      Phillip Webb 提交于
      Update ConfigurationClassUtils to only consider beans with @Bean
      methods as 'lite' configuration candidates.
      
      Prior to this commit all @Component beans were considered 'lite'
      configuration candidates which could result in a large number of
      ConfigurationClass instance being created that would ultimately be
      ignored.
      
      Issue: SPR-10609
      2ecc51f0
    • P
      Support meta @Component with non-string value · a8fd8328
      Phillip Webb 提交于
      Update AnnotationBeanNameGenerator to only use the value attribute of
      a @Component meta-annotated annotation when it is a String.
      
      Issue: SPR-10580
      a8fd8328
  2. 04 6月, 2013 7 次提交
    • P
      Remove duplicate Javadoc line from PathResource · 5377fae7
      Phillip Webb 提交于
      Remove duplicate Javadoc comment from PathResource that was
      accidentally introduced during the merge.
      
      Issue: SPR-10608
      5377fae7
    • P
      Merge pull request #295 from marschall/SPR-10608 · 5006dcd0
      Phillip Webb 提交于
      # By Philippe Marschall
      * SPR-10608-rebase:
        Introduce java.nio.file.Path based Resource
      5006dcd0
    • P
      Introduce java.nio.file.Path based Resource · 2313c9a0
      Philippe Marschall 提交于
      Develop new org.springframework.core.io.Resource implementation
      backed by java.nio.file.Path. Primarily developed to allow custom
      file system implementations to be used with Spring.
      
      Since the minimum requirement for Spring is still Java 6 the
      existing FileSystemResource can't be retrofitted (and no #getPath
      method can be added to the Resource interface).
      
      Unlike FileSystemResource, PathResource delegates to the underlying
      file system instead of StringUtils. It has therefore slightly
      different semantics. First, when building relative resources via
      createRelative the relative path will apply to this path (like URL or
      Unix). Second, equality is delegated to the underlying file system
      provider so it's case-insensitive on Windows.
      
      Issue: SPR-10608
      2313c9a0
    • P
      Merge pull request #286 from sslavic/SPR-10571 · 1f5467a2
      Phillip Webb 提交于
      # By Stevo Slavic
      * SPR-10571:
        Replace MaxPermSize use in build scripts
      1f5467a2
    • S
      Replace MaxPermSize use in build scripts · ecf8464d
      Stevo Slavic 提交于
      Since JDK 8 is required to build Spring framework 4, and permanent
      generation is gone from Java 8, to eliminate warnings about no longer
      available MaxPermSize switch, it should be removed or replaced with new
      MaxMetaspaceSize switch.
      
      This fix replaces old with new switch to limit the amount of native
      memory used for class metadata.
      
      Issue: SPR-10571
      ecf8464d
    • P
      Support EnvironmentAware ImportSelector/Registrar · 4d338324
      Phillip Webb 提交于
      Add support for the EnvironmentAware interface with ImportSelector
      and ImportBeanDefinitionRegistrar implementations.
      
      Issue: SPR-10602
      4d338324
    • P
      Test for property placeholder with defaults · d7ec20a2
      Phillip Webb 提交于
      Test property placeholder with multiple locations and default values.
      
      Issue: SPR-10619
      d7ec20a2
  3. 31 5月, 2013 2 次提交
  4. 29 5月, 2013 1 次提交
  5. 28 5月, 2013 4 次提交
  6. 26 5月, 2013 1 次提交
  7. 23 5月, 2013 2 次提交
    • R
      Fix MergePlugin · 07b75533
      Rob Winch 提交于
      The submitted pull requests for SPR-10572 did not build.
      
      This commit fixes the MergePlugin to create from configurations rather
      than the project. It also removes unnecessarily added code that was
      commented out.
      
      Issue: SPR-10572
      07b75533
    • S
      Eliminate Gradle 1.6 deprecation warnings · bf205bfe
      Stevo Slavic 提交于
      Recently Spring framework build has been updated to use Gradle 1.6.
      With the new version some of the Gradle APIs have been deprecated.
      These deprecated APIs have been used by Spring build specific Gradle
      plugins, which resulted in deprecation warnings in build output.
      
      This patch changes Spring build specific Gradle plugins to use new
      Gradle APIs instead of deprecated ones.
      
      Even after this change build still produces warnings about Gradle
      deprecated APIs being used. These come from Spring shared Gradle
      plugins and other 3rd party Gradle plugins in use, like Gradle
      Artifactory Plugin (GAP), which are still not updated to Gradle 1.6.
      Related tickets for updating of these plugins to Gradle 1.6 are
      GRADLE-53 and GAP-144, and once they get resolved Spring framework
      build should further be updated.
      
      Issue: SPR-10572
      bf205bfe
  8. 22 5月, 2013 5 次提交
  9. 18 5月, 2013 1 次提交
  10. 17 5月, 2013 5 次提交
  11. 16 5月, 2013 7 次提交
  12. 15 5月, 2013 3 次提交