diff --git a/acl/pom.xml b/acl/pom.xml index ffb6f7804a..6b5eb0e449 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -3,7 +3,7 @@ spring-security-parent org.springframework.security - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE 4.0.0 org.springframework.security diff --git a/aspects/pom.xml b/aspects/pom.xml index 16c616ba92..a6ba23ff94 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -5,7 +5,7 @@ org.springframework.security spring-security-parent - 3.0.0.CI-SNAPSHOT + 3.0.1.RELEASE jar spring-security-aspects @@ -22,7 +22,7 @@ org.springframework.security spring-security-core - 3.0.0.CI-SNAPSHOT + 3.0.1.RELEASE diff --git a/build.gradle b/build.gradle index 8b80ef4136..4e0f358fbc 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { diff --git a/cas/pom.xml b/cas/pom.xml index 93582a30af..41bb32b1c5 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-cas-client Spring Security - CAS support diff --git a/config/pom.xml b/config/pom.xml index 279bb0bb5f..f7892431dd 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE jar spring-security-config diff --git a/core/pom.xml b/core/pom.xml index bfeae23716..2f134b63ee 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE jar spring-security-core diff --git a/docs/manual/src/docbook/secured-objects.xml b/docs/manual/src/docbook/secured-objects.xml index a65794a629..3ae40c5389 100644 --- a/docs/manual/src/docbook/secured-objects.xml +++ b/docs/manual/src/docbook/secured-objects.xml @@ -16,9 +16,9 @@ Method security in enforced using a MethodSecurityInterceptor, which secures MethodInvocations. Depending on the configuration approach, an interceptor may be specific to a single bean or shared between multiple beans. - The interceptor uses a MethodDefinitionSource instance to + The interceptor uses a MethodSecurityMetadataSource instance to obtain the configuration attributes that apply to a particular method invocation. - MapBasedMethodDefinitionSource is used to store configuration + MapBasedMethodSecurityMetadataSource 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 <intercept-methods> or <protect-point> diff --git a/docs/manual/src/docbook/springsecurity.xml b/docs/manual/src/docbook/springsecurity.xml index 34a05eb143..0d1c0b10a4 100644 --- a/docs/manual/src/docbook/springsecurity.xml +++ b/docs/manual/src/docbook/springsecurity.xml @@ -10,7 +10,7 @@ Spring Security - 3.0.0.RELEASE + 3.0.1.RELEASE diff --git a/itest/context/pom.xml b/itest/context/pom.xml index 8408add574..11ec89d38a 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -4,7 +4,7 @@ org.springframework.security spring-security-itest - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-itest-context Spring Security - Miscellaneous Application Context Integration Tests diff --git a/itest/misc/pom.xml b/itest/misc/pom.xml index fbda2da788..fc6f0ecd25 100644 --- a/itest/misc/pom.xml +++ b/itest/misc/pom.xml @@ -5,7 +5,7 @@ org.springframework.security spring-security-itest - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-itest-misc Spring Security - Miscellaneous Integration Tests diff --git a/itest/pom.xml b/itest/pom.xml index 64dc216a48..1351c3ec9a 100644 --- a/itest/pom.xml +++ b/itest/pom.xml @@ -3,12 +3,12 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-itest Spring Security - Integration Tests pom - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE web diff --git a/itest/web/pom.xml b/itest/web/pom.xml index 2eb1adca69..5373a07acb 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -4,7 +4,7 @@ org.springframework.security spring-security-itest - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-itest-web Spring Security - Web Integration Tests diff --git a/ldap/pom.xml b/ldap/pom.xml index 6706827010..d1286c6cce 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE jar spring-security-ldap diff --git a/openid/pom.xml b/openid/pom.xml index 5c26a3520f..de20936f0e 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -3,12 +3,12 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-openid Spring Security - OpenID support Spring Security - Support for OpenID - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE jar diff --git a/pom.xml b/pom.xml index 62bf5e531e..fa409dbfd5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE Spring Security pom diff --git a/releasebuild.sh b/releasebuild.sh deleted file mode 100644 index 0702796db4..0000000000 --- a/releasebuild.sh +++ /dev/null @@ -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 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 - - - diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml index 267123f035..ec391cc53f 100644 --- a/samples/aspectj/pom.xml +++ b/samples/aspectj/pom.xml @@ -5,7 +5,7 @@ org.springframework.security spring-security-parent - 3.0.0.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-samples-aspectj jar diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml index c3fec73016..c653521cab 100644 --- a/samples/cas/client/pom.xml +++ b/samples/cas/client/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-cas - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-cas-client diff --git a/samples/cas/pom.xml b/samples/cas/pom.xml index 36cd1a030d..04c9f69158 100644 --- a/samples/cas/pom.xml +++ b/samples/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-cas diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index b3c5bb7e1c..263fa71e2a 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-cas - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-cas-server diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml index 5e3a945055..5b2b3b74ec 100644 --- a/samples/contacts/pom.xml +++ b/samples/contacts/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-samples-contacts Spring Security - Contacts sample diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml index d1a1a83318..b474abd85e 100644 --- a/samples/dms/pom.xml +++ b/samples/dms/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE spring-security-samples-dms Spring Security - DMS sample diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml index ae8034a545..a0a8bb3eaa 100644 --- a/samples/ldap/pom.xml +++ b/samples/ldap/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-ldap diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml index d2302e8aa6..2c1f8f5622 100644 --- a/samples/openid/pom.xml +++ b/samples/openid/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-openid diff --git a/samples/pom.xml b/samples/pom.xml index 354581c7bd..2c4a650384 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml index 41f930b06e..a8a45cb93b 100644 --- a/samples/preauth/pom.xml +++ b/samples/preauth/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-preauth diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml index aa69de81d9..9afc34532a 100644 --- a/samples/tutorial/pom.xml +++ b/samples/tutorial/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security spring-security-samples-tutorial diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml index bb4fdc6983..74ca1393f1 100755 --- a/sandbox/heavyduty/pom.xml +++ b/sandbox/heavyduty/pom.xml @@ -4,7 +4,7 @@ spring-security-heavyduty Spring Security - Heavy Duty Sample war - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE org.springframework.security @@ -205,7 +205,7 @@ 3.0.0.RELEASE - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE diff --git a/sandbox/webflow/pom.xml b/sandbox/webflow/pom.xml index 2aefda7be4..cea5e7f613 100644 --- a/sandbox/webflow/pom.xml +++ b/sandbox/webflow/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-samples-webflow Spring Security - Webflow sample - 3.0.0.CI-SNAPSHOT + 3.0.1.RELEASE war diff --git a/taglibs/pom.xml b/taglibs/pom.xml index 106600f322..06d7386043 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -3,13 +3,13 @@ spring-security-parent org.springframework.security - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE 4.0.0 org.springframework.security spring-security-taglibs Spring Security - JSP taglibs - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE jar diff --git a/web/pom.xml b/web/pom.xml index ad4dce5595..384627e358 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 3.0.1.CI-SNAPSHOT + 3.0.1.RELEASE jar spring-security-web