Chris Beams f480333d31 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.

2010-10-25 19:48:20 +00:00

build-spring-framework

prepared for 3.0.5 release

2010-10-20 05:48:25 +00:00

org.springframework.aop

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.asm

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.aspects

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.beans

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.context

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.context.support

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.core

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.expression

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.instrument

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.instrument.tomcat

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.integration-tests

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.jdbc

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.jms

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.orm

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.oxm

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.spring-library

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.spring-parent

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.test

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.transaction

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.web

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.web.portlet

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.web.servlet

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.springframework.web.struts

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

spring-framework-reference

Docs

2010-10-13 14:19:48 +00:00

src/test/java/org/springframework/core/env

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

.gitignore

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

build.properties

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

build.versions

+ downgraded slf4j to 1.5.6 to solve IllegalAcessError with Hibernate 3.3

2010-02-04 17:10:31 +00:00

ci-build.properties

adding properties file to simplify ant use in Bamboo CI build

2008-12-17 15:47:14 +00:00

eclipse-code-formatter.xml

h2 embedded db support; updated formatting conventions not to auto-format javadoc; added hsqldb and h2 to jdbc maven pom as optional deps

2009-05-09 22:27:05 +00:00

spring-framework.ipr

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

spring-framework.psf

Renamed org.springframework.instrument.classloading module to org.springframework.instrument.tomcat

2009-09-25 12:51:58 +00:00

Description

No description provided

248 MiB

Languages

Java 99.4%

XSLT 0.2%

AspectJ 0.2%