Updated version numbers for 3.0.1 release.

This commit is contained in:
Luke Taylor 2010-01-15 18:04:28 +00:00
parent e1d41177bb
commit 05634f97dc
31 changed files with 36 additions and 233 deletions

View File

@ -3,7 +3,7 @@
<parent>
<artifactId>spring-security-parent</artifactId>
<groupId>org.springframework.security</groupId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.security</groupId>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.0.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<packaging>jar</packaging>
<artifactId>spring-security-aspects</artifactId>
@ -22,7 +22,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>3.0.0.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</dependency>
</dependencies>
<build>

View File

@ -2,7 +2,7 @@ import java.util.jar.Manifest
import org.gradle.api.tasks.bundling.GradleManifest
allprojects {
version = '3.0.1.CI-SNAPSHOT'
version = '3.0.1.RELEASE'
group = 'org.springframework.security'
repositories {

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-cas-client</artifactId>
<name>Spring Security - CAS support</name>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<packaging>jar</packaging>
<artifactId>spring-security-config</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<packaging>jar</packaging>
<artifactId>spring-security-core</artifactId>

View File

@ -16,9 +16,9 @@
<para> Method security in enforced using a <classname>MethodSecurityInterceptor</classname>,
which secures <classname>MethodInvocation</classname>s. Depending on the configuration
approach, an interceptor may be specific to a single bean or shared between multiple beans.
The interceptor uses a <interfacename>MethodDefinitionSource</interfacename> instance to
The interceptor uses a <interfacename>MethodSecurityMetadataSource</interfacename> instance to
obtain the configuration attributes that apply to a particular method invocation.
<classname>MapBasedMethodDefinitionSource</classname> is used to store configuration
<classname>MapBasedMethodSecurityMetadataSource</classname> is used to store configuration
attributes keyed by method names (which can be wildcarded) and will be used internally when
the attributes are defined in the application context using the
<literal>&lt;intercept-methods&gt;</literal> or <literal>&lt;protect-point&gt;</literal>

View File

@ -10,7 +10,7 @@
</author>
</authorgroup>
<productname>Spring Security</productname>
<releaseinfo>3.0.0.RELEASE</releaseinfo>
<releaseinfo>3.0.1.RELEASE</releaseinfo>
</info>
<toc/>
<preface xml:id="preface">

View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-itest</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-itest-context</artifactId>
<name>Spring Security - Miscellaneous Application Context Integration Tests</name>

View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-itest</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-itest-misc</artifactId>
<name>Spring Security - Miscellaneous Integration Tests</name>

View File

@ -3,12 +3,12 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-itest</artifactId>
<name>Spring Security - Integration Tests</name>
<packaging>pom</packaging>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
<modules>
<module>web</module>
<!-- module>webflow</module-->

View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-itest</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-itest-web</artifactId>
<name>Spring Security - Web Integration Tests</name>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<packaging>jar</packaging>
<artifactId>spring-security-ldap</artifactId>

View File

@ -3,12 +3,12 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-openid</artifactId>
<name>Spring Security - OpenID support</name>
<description>Spring Security - Support for OpenID</description>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
<packaging>jar</packaging>
<dependencies>

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
<name>Spring Security</name>
<packaging>pom</packaging>

View File

@ -1,197 +0,0 @@
#! /bin/sh
# This script must be run from the project root directory
#
# Release Process.
#
# 1. Do clean check out of source from svn and note revision number.
# 2. Switch to JDK 1.4 and run "mvn compile" in core.
# 3. Set the version number in the pom.xml files of all the modules.
# 3a. If doing a release rather than snapshot build, run "find . -name pom.xml | xargs grep SNAPSHOT" and make sure
# there are no important snapshot dependencies.
# 3b. Set the same version number in this script.
# 4. Set the correct spring version number in the pom.xml.
# 4a. Make sure there are no snapshot dependencies in the release.
# 4b. Remove any references to external maven repositories in the parent pom.xml (remove <repositories> element).
# 4c. Check that all dependencies are downloadable from maven central repo.
# 5. Run this script to generate the artifacts and web site in the 'release' directory.
# 6. Copy the archives and unpack them to check the contents.
# 7. The archives are tar archives. Create zip versions from the contents and check the internal paths are Ok.
# 8. Check the site looks Ok.
# 9. Check the reference guide links in the site are valid and that images are shown and paths in HTML are relative.
# 10. Deploy the contacts and tutorial sample apps in Jetty and Tomcat and check they work.
# 11. Check there have been no further commits since checkout (svn update). If there have, go to 1.
# 12. Commit the source with the changed version numbers and note the revision number (should be 'build revision' + 1).
# 13. Label/tag the source tree with the release version number.
# 14. Update the pom file versions to the appropriate snapshot version, do a grep to make sure none have been missed
# and commit them.
# 15. Upload the site to acegisecurity.org (or wherever).
# 16. scp the release archives to shell.sf.net. Check md5 matches to make sure transfer was OK.
# 17. ftp them to the sourceforge upload server, uploads.sourceforge.net.
# 18. Put the jars, poms and signature files into the acegi repository for synchronization.
#
# (alternatively, the maven release plugin takes care of a lot of this stuff).
########################################################################################################################
#
# Edit this release number before running. It is used to check jar names etc.
#
########################################################################################################################
RELEASE_VERSION=2.0-SNAPSHOT
# Project Name. Used for creating the archives.
PROJECT_NAME=spring-security
PROJ_DIR=`pwd`;
RELEASE_DIR=$PROJ_DIR/$PROJECT_NAME-$RELEASE_VERSION
SITE_DIR=$RELEASE_DIR/docs
echo "** Project directory is $PROJ_DIR"
SVN_REV=`svn info $PROJ_DIR | grep Revision | sed "s/Revision: //"`
echo "** Building from revision $SVN_REV"
########################################################################################################################
#
# Create the release directory
#
########################################################################################################################
if [[ -e $RELEASE_DIR ]]
then
echo "Deleting $RELEASE_DIR."
rm -Rf $RELEASE_DIR
fi
mkdir $RELEASE_DIR
mkdir $SITE_DIR
########################################################################################################################
#
# run maven to generate jars
#
########################################################################################################################
mvn clean install -DcreateChecksum=true
if [ "$?" -ne 0 ]
then
echo "mvn install failed"
exit 1;
fi
########################################################################################################################
#
# Check the sandbox builds with the current configuration
#
########################################################################################################################
pushd sandbox
mvn clean test
if [ "$?" -ne 0 ]
then
echo "Failed to build sandbox with current configuration."
exit 1;
fi
popd
########################################################################################################################
#
# Generate Maven Web Site and Process Docbook Source.
#
########################################################################################################################
echo "** Generating site in $SITE_DIR".
mvn site site:deploy -DsiteDirectory=file://${SITE_DIR}
if [ "$?" -ne 0 ]
then
echo "mvn site generation failed"
exit 1;
fi
########################################################################################################################
#
# Patch the module site files to point to the root css files, change names of oversized menus,
# remove dodgy standard maven text etc.
#
########################################################################################################################
pushd $SITE_DIR
find . -maxdepth 2 -mindepth 2 -name "*.html" | xargs perl -i -p -e 's#"\./css/#"\.\./css/#;' \
-e 's/Maven Surefire Report/Unit Tests/;' \
-e 's/Cobertura Test Coverage/Test Coverage/;' \
-e 's/A successful project.*greatly appreciated\.//;'
find . -maxdepth 3 -mindepth 3 -name "*.html" | xargs perl -i -p -e 's#"\./css/#"\.\./\.\./css/#;'
popd
########################################################################################################################
#
# Assemble the required jar files, make sure there are the expected number and produce signatures.
#
########################################################################################################################
find . -name "*${RELEASE_VERSION}.jar" | grep -v WEB-INF | xargs -I % -n 1 cp % $RELEASE_DIR
find . -name "*${RELEASE_VERSION}.war" | xargs -I % -n 1 cp % $RELEASE_DIR
# Should be 10 archives - core, core-tiger, the adapters (cas, jboss, resin, jetty, catalina), ntlm, tutorial and contacts wars.
pushd $RELEASE_DIR
NUM_JARS=`ls *.jar *.war | wc -l`
if [ "$NUM_JARS" -ne 9 ]
then
echo "Expected 9 Jar files but found $NUM_JARS:"
ls *.jar *.war
exit 1
fi
# Create the signatures
for jar in $(ls *.jar *.war); do
openssl sha1 < $jar > $jar.sha1
openssl md5 < $jar > $jar.md5
done
popd
########################################################################################################################
#
# Build the release archives.
#
########################################################################################################################
# Get rid of mac DS_Store files.
find . -name .DS_Store -exec rm "{}" ";"
cp notice.txt readme.txt license.txt $RELEASE_DIR
# Create main archive
ls $RELEASE_DIR | grep -v sha | grep -v md5 | xargs tar -cjf $PROJECT_NAME-$RELEASE_VERSION.tar.bz2 -C $RELEASE_DIR
# Create source archive
tar --exclude='*/.svn' -cjf $PROJECT_NAME-$RELEASE_VERSION-src.tar.bz2 notice.txt src-readme.txt license.txt \
-C core/src/main/java/ org \
-C ${PROJ_DIR}/core-tiger/main/java org \
-C ${PROJ_DIR}/adapters/jetty/main/java org \
-C ${PROJ_DIR}/adapters/jboss/main/java org \
-C ${PROJ_DIR}/adapters/resin/main/java org \
-C ${PROJ_DIR}/adapters/cas/main/java org \
-C ${PROJ_DIR}/adapters/catalina/main/java org

View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.0.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-samples-aspectj</artifactId>
<packaging>jar</packaging>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas-client</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-cas-server</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-samples-contacts</artifactId>
<name>Spring Security - Contacts sample</name>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<artifactId>spring-security-samples-dms</artifactId>
<name>Spring Security - DMS sample</name>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-ldap</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-openid</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-preauth</artifactId>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-tutorial</artifactId>

View File

@ -4,7 +4,7 @@
<artifactId>spring-security-heavyduty</artifactId>
<name>Spring Security - Heavy Duty Sample</name>
<packaging>war</packaging>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
@ -205,7 +205,7 @@
</build>
<properties>
<spring.version>3.0.0.RELEASE</spring.version>
<spring.security.version>3.0.1.CI-SNAPSHOT</spring.security.version>
<spring.security.version>3.0.1.RELEASE</spring.security.version>
</properties>
</project>

View File

@ -3,7 +3,7 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-samples-webflow</artifactId>
<name>Spring Security - Webflow sample</name>
<version>3.0.0.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
<packaging>war</packaging>
<dependencies>
<dependency>

View File

@ -3,13 +3,13 @@
<parent>
<artifactId>spring-security-parent</artifactId>
<groupId>org.springframework.security</groupId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<name>Spring Security - JSP taglibs</name>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
<packaging>jar</packaging>
<dependencies>

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>3.0.1.CI-SNAPSHOT</version>
<version>3.0.1.RELEASE</version>
</parent>
<packaging>jar</packaging>
<artifactId>spring-security-web</artifactId>