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
5871cb4f35
Add @Ignored repro test for SPR-7538
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3677 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-10 16:32:20 +00:00
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
750dc01862
Prepping for 3.0.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 11:04:04 +00:00
7f54fe732f
Upgrading version to 3.0.4
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3428 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 14:18:29 +00:00
faa0f29f0f
Update version in POMs to 3.0.3
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3246 50f2f4bb-b051-0410-bef5-90022cba6387
2010-04-15 10:26:14 +00:00
9a188fd461
SPR-7071
...
+ fix some Eclipse classpath entries
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3234 50f2f4bb-b051-0410-bef5-90022cba6387
2010-04-08 06:39:41 +00:00
9cc8d7ef91
SPR-7009, SPR-6972: backed out unintentionally committed tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3145 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 15:29:35 +00:00
0041848f1b
SPR-7009: TransactionInterceptor now extracts ultimate target class before evaluating @Transactional metadata to accommodate double-proxying cases
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3144 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 12:06:30 +00:00
25ef81476d
Update Central POMs to 3.0.2
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3022 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-21 15:32:18 +00:00
b77d06e903
+ fix test by disabling autowiring
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2979 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-15 13:23:47 +00:00
f86e3bcfd2
Updated Eclipse .classpath to aspectj 1.6.8
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2920 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 13:45:14 +00:00
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
0ade90451c
+ add explicit dependency on commons-pool to prevent version 1.3 from being used (since it contains a memory leak)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2914 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:05:54 +00:00
4ae829da56
component-scan's scoped-proxy attribute applies to scope-annotated singleton beans as well (SPR-6683)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2895 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 16:51:46 +00:00
d5bdca4f23
Fixed up POM bug
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2858 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-23 12:01:54 +00:00
e6d2f9428c
SPR-6678: fix poms for 3.0.1
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2809 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-13 11:07:08 +00:00
5560f45f35
fixed dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2562 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-03 13:15:33 +00:00
4a60c50104
updated to Groovy 1.6.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2521 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-27 01:37:43 +00:00
5b2a0f422e
Updated Eclipse classpath regarding javax.inject and javax.validation.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2136 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-16 10:16:25 +00:00
688111c4dd
SPR-6183 - integration-tests should not be included in the packaged distribution
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2107 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-14 10:31:59 +00:00
b987b115ca
Updated Groovy version for Eclipse project to mathc ivy.xml
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2029 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-28 20:56:13 +00:00
b5e25453d2
pom maintenance
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1952 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 07:37:30 +00:00
e94bf69c1a
@Scope annotations not sufficient for scanning anymore
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1895 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 12:36:45 +00:00
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
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
2422565f07
fixed broken classpaths for ehcache and junit
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1796 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-02 16:29:43 +00:00
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
2f66da5293
SPR-5976 - Upgrade POMS to JUnit 4.6
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1696 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-05 17:48:53 +00:00
d7b321e413
updated aspectj weaver version in .classpath files to match ivy.xml configuration
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1609 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-24 20:09:01 +00:00
b33d28d6cf
updated .jms dependency on junit 4.6.0 from test->runtime to test->compile. touched all org.eclipse.jdt.core.prefs (during the process of importing the projects). only the date comments within each have changed.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1541 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-15 07:26:31 +00:00
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
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
ae464e40c6
[SPR-5888] Upgrading to TestNG 5.9.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1458 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-02 16:03:31 +00:00
5705ad0305
Repairing Eclipse classpaths and Ivy config:
...
- org.apache.openjpa -> 1.1.0
- com.sun.syndication -> 1.0.0
- javax.el -> 1.0.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1395 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-18 11:36:04 +00:00
1d1dba1693
Servlet/Portlet ApplicationContexts use a specific id based on servlet/portlet name; DefaultListableBeanFactory references are serializable now when initialized with an id; scoped proxies are serializable now, for web scopes as well as for singleton beans; injected request/session references are serializable proxies for the current request now
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1127 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-07 22:29:55 +00:00
a7784bf36d
updating Eclipse .classpath settings for Freemarker 2.3.15 upgrade
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1058 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-23 14:13:03 +00:00
b5e0328914
updated to FreeMarker 2.3.15 (SPR-4962)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1031 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 22:22:56 +00:00
b1ecb0de45
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1030 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 20:36:33 +00:00
8fe2a89d43
switched to use XInclude
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1001 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-14 21:37:40 +00:00
9ae9763ab4
forgot to update eclipse project when updating hibernate versions
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@984 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-13 05:25:57 +00:00
acce93e0b3
updte hibernate dependencies in integration-test project to same as
...
those in orm project
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@982 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-13 05:03:55 +00:00
5f3ac321cb
Change version from 3.0.0.M3 to 3.0.0.BUILD-SNAPSHOT (again)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@959 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-09 14:38:35 +00:00
2bd40484cf
include missing package component
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@926 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-04 00:06:01 +00:00
e90e1d0ff6
Change antlr version to be 3.0.1 so that is consistent across the project
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@920 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-03 14:31:25 +00:00
89af3cf91d
updating eclipse classpath settings
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@845 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-27 14:21:04 +00:00
a3eeadf1bb
updated to JRuby 1.2 and Hessian 3.2.1
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@836 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-27 00:02:20 +00:00
f39cb005f6
SPR-5385, SPR-5301 - initial pass completed of POMs for maven central repository upload. N.B. Can not build spring with these POMs.
...
Cleanup remains to meet maven central metadata requirements
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@816 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-25 08:06:34 +00:00
7f82764cb2
+ Updated all projects to use the re-introduced org.springframework.asm instead of org.objectweb.asm (.java, template.mf, ivy.xml, and .classpath files have been updated)
...
+ Finished support for @Import, including detection of circular imports
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@775 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-21 19:00:57 +00:00
b53b6be61a
+ Removed old testsuite.iml (favor integration-testsuite.iml)
...
+ Updated integration-tests/.classpath to point to javax.jdo 2.1.0 instead of 2.0.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@717 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-03 00:02:18 +00:00
Chris Beams
Ben Hale
Arjen Poutsma
David Syer
Costin Leau
Juergen Hoeller
Sam Brannen
Ramnivas Laddad
Mark Pollack
Keith Donald
Mark Fisher
Scott Andrews
Thomas Risberg
Colin Sampaleanu
Andy Clement