diff --git a/adapters/cas/pom.xml b/adapters/cas/pom.xml index 99d576de8d..85b30aee44 100644 --- a/adapters/cas/pom.xml +++ b/adapters/cas/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0-SNAPSHOT + 2.0-M1 spring-security-cas Spring Security - CAS adapter diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml index a68be23ea3..cd6a48d561 100644 --- a/adapters/catalina/pom.xml +++ b/adapters/catalina/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0-SNAPSHOT + 2.0-M1 spring-security-catalina Spring Security - Catalina adapter diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml index e27ad8720d..00ba63270b 100644 --- a/adapters/jboss/pom.xml +++ b/adapters/jboss/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0-SNAPSHOT + 2.0-M1 spring-security-jboss Spring Security - JBoss adapter diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml index e221bc287b..3ea1eeede3 100644 --- a/adapters/jetty/pom.xml +++ b/adapters/jetty/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0-SNAPSHOT + 2.0-M1 spring-security-jetty Spring Security - Jetty adapter diff --git a/adapters/pom.xml b/adapters/pom.xml index f71eaf88e2..c6e4e6ce26 100644 --- a/adapters/pom.xml +++ b/adapters/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0-SNAPSHOT + 2.0-M1 spring-security-adapters Spring Security - Adapters diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml index 7b525b7a85..e91c0de4b4 100644 --- a/adapters/resin/pom.xml +++ b/adapters/resin/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-adapters - 2.0-SNAPSHOT + 2.0-M1 spring-security-resin Spring Security - Resin adapter diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml index e0ae44d42e..2560667e3b 100644 --- a/core-tiger/pom.xml +++ b/core-tiger/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0-SNAPSHOT + 2.0-M1 spring-security-core-tiger Spring Security - Java 5 (Tiger) diff --git a/core/pom.xml b/core/pom.xml index a09774eb13..6879c7fb22 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 org.springframework.security spring-security-parent - 2.0-SNAPSHOT + 2.0-M1 jar spring-security-core diff --git a/ntlm/pom.xml b/ntlm/pom.xml index 0f146ccfb3..95c76ed11e 100755 --- a/ntlm/pom.xml +++ b/ntlm/pom.xml @@ -1,65 +1,65 @@ - - 4.0.0 - - org.springframework.security - spring-security-parent - 2.0-SNAPSHOT - - jar - spring-security-ntlm - Spring Security - NTLM support - - - - org.springframework.security - spring-security-core - ${project.version} - - - - org.samba.jcifs - jcifs - 1.2.15 - - - javax.servlet - jsp-api - 2.0 - true - - - javax.servlet - servlet-api - 2.4 - true - - - org.springframework.ldap - spring-ldap - 1.2.1 - true - - - - - - - ${basedir}/../ - META-INF - - notice.txt - - false - - - ${basedir}/src/main/resources - / - - **/* - - false - - - - - + + 4.0.0 + + org.springframework.security + spring-security-parent + 2.0-M1 + + jar + spring-security-ntlm + Spring Security - NTLM support + + + + org.springframework.security + spring-security-core + ${project.version} + + + + org.samba.jcifs + jcifs + 1.2.15 + + + javax.servlet + jsp-api + 2.0 + true + + + javax.servlet + servlet-api + 2.4 + true + + + org.springframework.ldap + spring-ldap + 1.2.1 + true + + + + + + + ${basedir}/../ + META-INF + + notice.txt + + false + + + ${basedir}/src/main/resources + / + + **/* + + false + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5b2982899d..dd69d3872c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,8 @@ - + 4.0.0 org.springframework.security spring-security-parent - 2.0-SNAPSHOT + 2.0-M1 Spring Security pom @@ -35,12 +34,9 @@ - scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk - - - scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk - - http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/trunk/ + scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/tags/release_2_0_M1 + scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/tags/release_2_0_M1 + http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/tags/release_2_0_M1 @@ -423,9 +419,9 @@ - - - + + + diff --git a/portlet/pom.xml b/portlet/pom.xml index 0175082721..291d3c1af7 100644 --- a/portlet/pom.xml +++ b/portlet/pom.xml @@ -1,55 +1,54 @@ - - 4.0.0 - - org.springframework.security - spring-security-parent - 2.0-SNAPSHOT - - spring-security-portlet - Spring Security - Portlet support - Spring Security - Support for JSR 168 Portlets - 2.0-SNAPSHOT - - - - org.springframework.security - spring-security-core - 2.0-SNAPSHOT - - - javax.servlet - servlet-api - 2.4 - provided - - - javax.portlet - portlet-api - 1.0 - provided - - - org.springframework - spring-dao - ${spring.version} - - - org.springframework - spring-portlet - ${spring.version} - - - org.springframework - spring-mock - ${spring.version} - true - - - net.sf.ehcache - ehcache - 1.2.4 - - - - + + 4.0.0 + + org.springframework.security + spring-security-parent + 2.0-M1 + + spring-security-portlet + Spring Security - Portlet support + Spring Security - Support for JSR 168 Portlets + 2.0-M1 + + + + org.springframework.security + spring-security-core + 2.0-M1 + + + javax.servlet + servlet-api + 2.4 + provided + + + javax.portlet + portlet-api + 1.0 + provided + + + org.springframework + spring-dao + ${spring.version} + + + org.springframework + spring-portlet + ${spring.version} + + + org.springframework + spring-mock + ${spring.version} + true + + + net.sf.ehcache + ehcache + 1.2.4 + + + + \ No newline at end of file diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml index 0ca0690fc9..7aa79e00c7 100644 --- a/samples/contacts/pom.xml +++ b/samples/contacts/pom.xml @@ -1,12 +1,9 @@ - - + 4.0.0 org.springframework.security spring-security-samples - 2.0-SNAPSHOT + 2.0-M1 spring-security-samples-contacts Spring Security - Contacts sample @@ -105,4 +102,4 @@ - + \ No newline at end of file diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml index 83a823f657..53f67b4f21 100644 --- a/samples/dms/pom.xml +++ b/samples/dms/pom.xml @@ -1,12 +1,9 @@ - - + 4.0.0 org.springframework.security spring-security-samples - 2.0-SNAPSHOT + 2.0-M1 spring-security-samples-dms Spring Security - DMS sample @@ -42,4 +39,4 @@ runtime - + \ No newline at end of file diff --git a/samples/pom.xml b/samples/pom.xml index 7c9e01d1a7..edc9495294 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ org.springframework.security spring-security-parent - 2.0-SNAPSHOT + 2.0-M1 org.springframework.security spring-security-samples diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml index 46c0fd2055..7a8bae3619 100644 --- a/samples/tutorial/pom.xml +++ b/samples/tutorial/pom.xml @@ -1,105 +1,104 @@ - - 4.0.0 - - org.springframework.security - spring-security-samples - 2.0-SNAPSHOT - - org.springframework.security - spring-security-samples-tutorial - Spring Security - Tutorial sample - war - - - org.springframework.security - spring-security-core - ${project.version} - - - org.springframework.security - spring-security-core-tiger - ${project.version} - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-jdbc - runtime - - - org.springframework - spring-aop - runtime - - - javax.servlet - jstl - 1.0 - runtime - - - taglibs - standard - 1.0.6 - runtime - - - org.apache.directory.server - apacheds-core - 1.0.2 - compile - true - - - org.apache.directory.server - apacheds-server-jndi - 1.0.2 - compile - true - - - org.slf4j - slf4j-log4j12 - 1.4.3 - runtime - true - - - org.springframework.ldap - spring-ldap - 1.2.1 - true - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.5 - - /tutorial - - - - - - + + 4.0.0 + + org.springframework.security + spring-security-samples + 2.0-M1 + + org.springframework.security + spring-security-samples-tutorial + Spring Security - Tutorial sample + war + + + org.springframework.security + spring-security-core + ${project.version} + + + org.springframework.security + spring-security-core-tiger + ${project.version} + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-jdbc + runtime + + + org.springframework + spring-aop + runtime + + + javax.servlet + jstl + 1.0 + runtime + + + taglibs + standard + 1.0.6 + runtime + + + org.apache.directory.server + apacheds-core + 1.0.2 + compile + true + + + org.apache.directory.server + apacheds-server-jndi + 1.0.2 + compile + true + + + org.slf4j + slf4j-log4j12 + 1.4.3 + runtime + true + + + org.springframework.ldap + spring-ldap + 1.2.1 + true + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.5 + + /tutorial + + + + + + \ No newline at end of file