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

SEC-729: Organization of pom dependencies, particularly for servlet-api and jstl. Some other adjustments, removal of unrequired deps etc

2.0.x
Luke Taylor 18 years ago
parent
3d0e0fcea5
commit
b54e3978dc
17 changed files with 74 additions and 90 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. 2
      captcha/pom.xml
  2. 3
      cas/cas-client/pom.xml
  3. 1
      core/pom.xml
  4. 2
      ntlm/pom.xml
  5. 24
      pom.xml
  6. 5
      portlet/pom.xml
  7. 8
      samples/cas/client/pom.xml
  8. 30
      samples/contacts/pom.xml
  9. 4
      samples/dms/pom.xml
  10. 31
      samples/openid/pom.xml
  11. 22
      samples/pom.xml
  12. 4
      samples/portlet/pom.xml
  13. 3
      samples/preauth/pom.xml
  14. 16
      samples/tutorial/pom.xml
  15. 2
      sandbox/other/pom.xml
  16. 2
      sandbox/webwork/pom.xml
  17. 5
      taglibs/pom.xml

2
captcha/pom.xml
Unescape View File

@ -27,8 +27,6 @@ @@ -27,8 +27,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

3
cas/cas-client/pom.xml
Unescape View File

@ -20,8 +20,6 @@ @@ -20,8 +20,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -32,7 +30,6 @@ @@ -32,7 +30,6 @@
<groupId>org.jasig.cas</groupId>
<artifactId>cas-client-core</artifactId>
<version>3.1.1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>

1
core/pom.xml
Unescape View File

@ -89,7 +89,6 @@ @@ -89,7 +89,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
</dependency>
<dependency>

2
ntlm/pom.xml
Unescape View File

@ -30,8 +30,6 @@ @@ -30,8 +30,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>

24
pom.xml
Unescape View File

@ -654,6 +654,11 @@ @@ -654,6 +654,11 @@
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@ -661,12 +666,31 @@ @@ -661,12 +666,31 @@
<optional>true</optional>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${jstl.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<spring.version>2.0.8</spring.version>
<felix.version>1.4.0</felix.version>
<jstl.version>1.1.2</jstl.version>
<docbook.source>${basedir}/src/docbkx</docbook.source>
<docbook.target>${basedir}/target/site/guide</docbook.target>
</properties>

5
portlet/pom.xml
Unescape View File

@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
@ -31,7 +29,6 @@ @@ -31,7 +29,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -42,7 +39,7 @@ @@ -42,7 +39,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>${spring.version}</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>

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

@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -39,11 +38,6 @@ @@ -39,11 +38,6 @@
<artifactId>spring-aop</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>cas</groupId>
<artifactId>casclient</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
@ -94,4 +88,4 @@ @@ -94,4 +88,4 @@
</plugins>
</build>
</project>
</project>

30
samples/contacts/pom.xml
Unescape View File

@ -28,7 +28,6 @@ @@ -28,7 +28,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -46,23 +45,27 @@ @@ -46,23 +45,27 @@
<artifactId>spring-remoting</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.3.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>hessian</groupId>
<artifactId>hessian</artifactId>
<version>3.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@ -71,10 +74,9 @@ @@ -71,10 +74,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
<groupId>hessian</groupId>
<artifactId>hessian</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies>

4
samples/dms/pom.xml
Unescape View File

@ -22,6 +22,10 @@ @@ -22,6 +22,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>

31
samples/openid/pom.xml
Unescape View File

@ -23,11 +23,12 @@ @@ -23,11 +23,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -39,26 +40,14 @@ @@ -39,26 +40,14 @@
<artifactId>spring-aop</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
<!--
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.1</version>
<optional>true</optional>
</dependency>
-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
</dependencies>
<build>

22
samples/pom.xml
Unescape View File

@ -18,26 +18,4 @@ @@ -18,26 +18,4 @@
<module>ldap</module>
<module>portlet</module>
</modules>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.1.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

4
samples/portlet/pom.xml
Unescape View File

@ -33,8 +33,6 @@ @@ -33,8 +33,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -63,12 +61,10 @@ @@ -63,12 +61,10 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${jstl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

3
samples/preauth/pom.xml
Unescape View File

@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -74,4 +73,4 @@ @@ -74,4 +73,4 @@
</plugins>
</build>
</project>
</project>

16
samples/tutorial/pom.xml
Unescape View File

@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@ -44,6 +43,21 @@ @@ -44,6 +43,21 @@
<artifactId>spring-aop</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>

2
sandbox/other/pom.xml
Unescape View File

@ -31,13 +31,11 @@ @@ -31,13 +31,11 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
<version>${spring.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
</dependency>
<dependency>

2
sandbox/webwork/pom.xml
Unescape View File

@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

5
taglibs/pom.xml
Unescape View File

@ -41,8 +41,7 @@ @@ -41,8 +41,7 @@
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.0.6</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@ -59,4 +58,4 @@ @@ -59,4 +58,4 @@
</resource>
</resources>
</build>
</project>
</project>

Write Preview
Loading…
Cancel
Save