GitHub-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated poms to Spring 2.5 and fixed up sandbox to work with latest build

3.0.x
Luke Taylor 17 years ago
parent
a62eae4587
commit
6c8a82fa13
22 changed files with 52 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      acl/pom.xml
  2. 12
      cas/pom.xml
  3. 12
      core/pom.xml
  4. 13
      itest/pom.xml
  5. 2
      openid/pom.xml
  6. 12
      pom.xml
  7. 8
      portlet/pom.xml
  8. 2
      samples/cas/client/pom.xml
  9. 2
      samples/cas/server/pom.xml
  10. 9
      samples/contacts/pom.xml
  11. 2
      samples/dms/pom.xml
  12. 2
      samples/ldap/pom.xml
  13. 10
      samples/openid/pom.xml
  14. 2
      samples/portlet/pom.xml
  15. 10
      samples/preauth/pom.xml
  16. 10
      samples/tutorial/pom.xml
  17. 4
      sandbox/captcha/pom.xml
  18. 4
      sandbox/heavyduty/pom.xml
  19. 13
      sandbox/other/pom.xml
  20. 16
      sandbox/pom.xml
  21. 2
      sandbox/webwork/pom.xml
  22. 2
      taglibs/pom.xml

6
acl/pom.xml
Unescape View File

@ -31,13 +31,17 @@ @@ -31,13 +31,17 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>

12
cas/pom.xml
Unescape View File

@ -22,17 +22,17 @@ @@ -22,17 +22,17 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<optional>true</optional>
</dependency>
<dependency>

12
core/pom.xml
Unescape View File

@ -22,21 +22,11 @@ @@ -22,21 +22,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@ -44,7 +34,7 @@ @@ -44,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<optional>true</optional>
</dependency>
<dependency>

13
itest/pom.xml
Unescape View File

@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.security</groupId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>spring-security-itest</artifactId>
<name>Spring Security - Integration Tests</name>
<packaging>pom</packaging>
@ -25,7 +29,6 @@ @@ -25,7 +29,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>2.5.5</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@ -50,10 +53,6 @@ @@ -50,10 +53,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>

2
openid/pom.xml
Unescape View File

@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<optional>true</optional>
</dependency>
<dependency>

12
pom.xml
Unescape View File

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
<module>cas</module>
<module>acl</module>
<module>taglibs</module>
<module>itest</module>
</modules>
<description>Spring Security</description>
@ -608,24 +609,24 @@ @@ -608,24 +609,24 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
@ -711,6 +712,7 @@ @@ -711,6 +712,7 @@
<spring.version>2.5.5</spring.version>
<spring.version.osgi>[2.5.5, 3.1.0)</spring.version.osgi>
<jstl.version>1.1.2</jstl.version>
<jetty.version>6.1.11</jetty.version>
<docbook.source>${basedir}/src/docbkx</docbook.source>
<docbook.target>${basedir}/target/site/guide</docbook.target>

8
portlet/pom.xml
Unescape View File

@ -32,18 +32,14 @@ @@ -32,18 +32,14 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-portlet</artifactId>
<version>${spring.version}</version>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

2
samples/cas/client/pom.xml
Unescape View File

@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/cas-sample</contextPath>
<connectors>

2
samples/cas/server/pom.xml
Unescape View File

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/cas</contextPath>
<webApp>${basedir}/cas-server-webapp-3.2.1.war</webApp>

9
samples/contacts/pom.xml
Unescape View File

@ -42,12 +42,7 @@ @@ -42,12 +42,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@ -92,7 +87,7 @@ @@ -92,7 +87,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/contacts</contextPath>
<!--jettyConfig>${basedir}/src/test/resources/jetty.xml</jettyConfig-->

2
samples/dms/pom.xml
Unescape View File

@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>

2
samples/ldap/pom.xml
Unescape View File

@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/ldap</contextPath>
</configuration>

10
samples/openid/pom.xml
Unescape View File

@ -52,18 +52,10 @@ @@ -52,18 +52,10 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/openid</contextPath>
</configuration>

2
samples/portlet/pom.xml
Unescape View File

@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

10
samples/preauth/pom.xml
Unescape View File

@ -42,18 +42,10 @@ @@ -42,18 +42,10 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/preauth</contextPath>
<userRealms>

10
samples/tutorial/pom.xml
Unescape View File

@ -62,18 +62,10 @@ @@ -62,18 +62,10 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>${jetty.version}</version>
<configuration>
<contextPath>/tutorial</contextPath>
<connectors>

4
sandbox/captcha/pom.xml
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<parent>
<artifactId>spring-security-parent</artifactId>
<groupId>org.springframework.security</groupId>
<version>2.0.4-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.security</groupId>
@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

4
sandbox/heavyduty/pom.xml
Unescape View File

@ -159,7 +159,7 @@ @@ -159,7 +159,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.7</version>
<version>6.1.11</version>
<configuration>
<contextPath>/heavyduty</contextPath>
<!--jettyConfig>jetty-jmx.xml</jettyConfig-->
@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
</build>
<properties>
<spring.version>2.5.5</spring.version>
<spring.security.version>2.0.4-SNAPSHOT</spring.security.version>
<spring.security.version>2.5.0-SNAPSHOT</spring.security.version>
</properties>
</project>

13
sandbox/other/pom.xml
Unescape View File

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-sandbox</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>spring-security-sandbox-other</artifactId>
<name>Spring Security - Other Sandbox Code</name>
@ -25,20 +25,19 @@ @@ -25,20 +25,19 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>1.2.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>

16
sandbox/pom.xml
Unescape View File

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-parent</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>spring-security-sandbox</artifactId>
<name>Spring Security - Sandbox</name>
@ -23,17 +23,5 @@ @@ -23,17 +23,5 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
sandbox/webwork/pom.xml
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-sandbox</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>spring-security-webwork</artifactId>
<name>Spring Security - Webwork support</name>

2
taglibs/pom.xml
Unescape View File

@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>

Write Preview
Loading…
Cancel
Save