mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-05-02 20:09:31 +01:00
Chris Beams
45e5b46fc2
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
31 lines
825 B
Properties
31 lines
825 B
Properties
version=3.1.0
|
|
# osgi ranges
|
|
spring.osgi.range.nq=${version:[=.=.=, =.=.+1)}
|
|
spring.osgi.range="${spring.osgi.range.nq}"
|
|
aj.osgi.range="[1.5.4, 2.0.0)"
|
|
|
|
#
|
|
release.type=integration
|
|
natural.name=spring-framework
|
|
project.name=Spring Framework
|
|
project.key=SPR
|
|
ivy.cache.dir=${basedir}/../ivy-cache
|
|
integration.repo.dir=${basedir}/../integration-repo
|
|
license.dir=${basedir}/../build-spring-framework/resources
|
|
javadoc.exclude.package.names=org/springframework/samples/**
|
|
javadoc.max.memory=256M
|
|
test.vm.args=-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
|
|
compiler.args=-enableJavadoc -warn:none
|
|
|
|
# For when releasing
|
|
#release.type=release
|
|
#build.stamp=RELEASE
|
|
|
|
# For when releasing milestones
|
|
#release.type=milestone
|
|
#build.stamp=M1
|
|
|
|
# For development in trunk
|
|
#release.type=integration
|
|
#build.stamp=BUILD-SNAPSHOT
|