Commit Graph

21 Commits

Author SHA1 Message Date
Juergen Hoeller 03adc3b632 shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4502 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 09:58:15 +00:00
Chris Beams 45e5b46fc2 Merge 3.1.0 development branch into trunk
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:

    git merge -s recursive -Xtheirs --no-commit env

No merge conflicts, but did need to

    git rm spring-build

prior to committing.

With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch.  3.1.0 snapshots will be available
per the usual nightly CI build from trunk.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-25 19:48:20 +00:00
Ben Hale 82e5f5f5d6 Publishing license and notice files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 13:17:31 +00:00
Costin Leau 5e677feda0 + upgrade to AspectJ 1.6.8
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2918 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:46:21 +00:00
David Syer 2bad74c238 SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2579 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-04 18:25:31 +00:00
Juergen Hoeller c50391a921 updated to final versions of JSR-330 and JSR-303 APIs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2132 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-15 14:31:41 +00:00
Juergen Hoeller c032a53d71 consistent dependencies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1989 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 15:09:57 +00:00
Juergen Hoeller a65d974b14 initial JSR-330 injection support
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1894 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 12:00:55 +00:00
Juergen Hoeller 4354ffd683 updated to CGLIB 2.2 and EHCache 1.6.2
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1830 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 18:04:27 +00:00
Rob Harrop 17821d8d39 updated javax.el dependency to match the IDEA project file
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1819 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-04 18:17:38 +00:00
Juergen Hoeller a521abefcc updated dependencies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1791 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-31 11:25:54 +00:00
Sam Brannen aef72ba508 [SPR-5895] Upgraded to EasyMock 2.5.1.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1462 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-03 09:32:15 +00:00
Sam Brannen 887f8b3c10 [SPR-5887] Upgraded to JUnit 4.6.0.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1461 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-02 18:07:55 +00:00
Juergen Hoeller efa6b14250 XML constructor-arg element allows for specifying a constructor argument by name now, with target argument names read from the class file via ASM or from Java 6's @ConstructorProperties annotation (SPR-3313)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1305 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-03 10:21:57 +00:00
Chris Beams 58903fa010 + polishing .beans tests
+ removed unnecessary dependency on hibernate


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@503 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-24 19:14:15 +00:00
Juergen Hoeller f388e47598 consistent compilation against Servlet 2.5, JSP 2.1 and JUnit 4.5
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@345 50f2f4bb-b051-0410-bef5-90022cba6387
2008-11-27 21:49:10 +00:00
Arjen Poutsma c5a7344404 Moved tests over from testsuite to beans
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@193 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-29 17:32:01 +00:00
Arjen Poutsma 0d3a67f17e Moved tests over from testsuite to beans
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@182 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-29 12:43:13 +00:00
Arjen Poutsma 97bb06baa0 Upgraded ivy files to correspond to those in 2.5.5
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@137 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-27 13:41:44 +00:00
Arjen Poutsma 2f6e24794e Moved over initial version of beans bundle
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@111 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-22 16:13:37 +00:00
Arjen Poutsma 3a853157df Added more modules
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@106 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-21 08:04:24 +00:00