Commit Graph

24 Commits

Author SHA1 Message Date
David Syer 65d303feaa Add missing JPA dependency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3798 50f2f4bb-b051-0410-bef5-90022cba6387
2010-11-15 16:54:12 +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
Juergen Hoeller e7e39577ed declared JPA API as optional (SPR-6819)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3776 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-20 05:37:25 +00:00
Costin Leau 1c156cce92 SPR-6819
+ change jpa Maven dependency from provided to compile

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3691 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-21 23:14:22 +00:00
Arjen Poutsma 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
Arjen Poutsma 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
Costin Leau c04935fc26 SPR-6819
changed JPA dependency to provided

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3425 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 06:33:20 +00:00
Costin Leau 9ed4edfbfd SPR-6819
+ made JPA dependency implicit since the aspect will always require the JPA classes during the weaving process


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3300 50f2f4bb-b051-0410-bef5-90022cba6387
2010-04-28 10:41:03 +00:00
David Syer 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
Costin Leau dcf748d4cc SPR-6819
+ changed jpa dependency scope from optional to provided

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3235 50f2f4bb-b051-0410-bef5-90022cba6387
2010-04-08 07:04:40 +00:00
Chris Beams e1d7251ef3 SPR-6538: context-support is no longer marked as an optional dependency within aspects and webmvc POMs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3138 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 08:15:57 +00:00
David Syer 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
Juergen Hoeller 46d4f3127b added optional JPA dependency to spring-aspects POM (SPR-6819)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2948 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 23:02:31 +00:00
David Syer 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
Ramnivas Laddad c2c8150a35 Modified staticmethod mocking to remove compile-time dependency on JUnit (see ROO-314 and related issues)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2243 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-03 00:51:22 +00:00
Ramnivas Laddad d096a1c428 Mark junit dependency as compile, since aspects depend on it at compile-time
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2226 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-29 17:18:49 +00:00
Mark Pollack 4e2aaf7934 SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2001 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 05:16:55 +00:00
Mark Pollack 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
Mark Pollack 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
Mark Pollack 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
Mark Pollack 9feacc0375 Change version from 3.0.0.M3 to 3.0.0.BUILD-SNAPSHOT
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@919 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-03 14:03:48 +00:00
Mark Pollack f17f9ef0f5 POM maintenance
Place parent pom in publicly accessible directory (org.sf.spring-parent).  
Create a component list pom in org.sf.spring-library.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@868 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-29 09:56:38 +00:00
Mark Pollack 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
Arjen Poutsma e37be8fcc6 Initial import of the aspects module
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@162 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-28 11:42:01 +00:00