1. 13 5月, 2015 1 次提交
    • S
      Document search scope in Ann*[Element]Utils · 52153bd4
      Sam Brannen 提交于
      This commit improves the documentation for AnnotationUtils and
      AnnotatedElementUtils by explaining that the scope of most annotation
      searches is limited to finding the first such annotation, resulting in
      additional such annotations being silently ignored.
      
      Issue: SPR-13015
      52153bd4
  2. 12 5月, 2015 4 次提交
    • J
      Polishing · 00147379
      Juergen Hoeller 提交于
      (cherry picked from commit 9e925aa8)
      00147379
    • J
      Javadoc fixes · 0d2859c9
      Juergen Hoeller 提交于
      (cherry picked from commit a8f75399)
      0d2859c9
    • B
      Fix maven dependency scope conflicts in MergePlugin · 58d8a81b
      Brian Clozel 提交于
      Spring Framework's build is using a custom MergePlugin in order to merge
      a project into another one and share/override configuration and
      dependencies.
      
      Prior to this commit, two projects merged into a third one could trigger
      dependency conflicts when exporting the project definition into a POM.
      When trying to define the scope for a given dependency, those two
      projects would compete for this with the same priority, resulting in a
      Gradle exception.
      
      One could trigger this issue by running:
      
          ./gradlew :spring-orm:install -x javadoc
      
      Because `spring-orm-hibernate4` and `spring-orm-hibernate5` get merged
      into `spring-orm` and both define optional/test dependencies to
      spring-mvc, etc.
      
      This commit makes sure that two projects, when defining dependency
      scopes, don't use the same priority value; the MergePlugin now adds the
      index of the current subproject to the priority value. So when two
      projects compete for this, the one defined in last will define the
      dependency scope.
      
      Issue: SPR-13013
      58d8a81b
    • S
      Add TODO re: FailOnTimeout.builder() & JUnit 4.12 · 6422f7a0
      Sam Brannen 提交于
      6422f7a0
  3. 11 5月, 2015 4 次提交
  4. 10 5月, 2015 8 次提交
  5. 09 5月, 2015 7 次提交
  6. 08 5月, 2015 11 次提交
  7. 07 5月, 2015 5 次提交