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

pom maintenance

pull/23217/head
Mark Pollack 16 years ago
parent
fe525f5100
commit
4f94f45ec4
18 changed files with 99 additions and 81 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
      org.springframework.aop/pom.xml
  2. 2
      org.springframework.aspects/pom.xml
  3. 13
      org.springframework.beans/pom.xml
  4. 3
      org.springframework.context.support/pom.xml
  5. 61
      org.springframework.context/pom.xml
  6. 4
      org.springframework.core/pom.xml
  7. 2
      org.springframework.expression/pom.xml
  8. 10
      org.springframework.integration-tests/pom.xml
  9. 2
      org.springframework.jdbc/pom.xml
  10. 2
      org.springframework.jms/pom.xml
  11. 5
      org.springframework.orm/pom.xml
  12. 2
      org.springframework.oxm/pom.xml
  13. 48
      org.springframework.spring-parent/pom.xml
  14. 4
      org.springframework.test/pom.xml
  15. 5
      org.springframework.transaction/pom.xml
  16. 2
      org.springframework.web.portlet/pom.xml
  17. 4
      org.springframework.web.servlet/pom.xml
  18. 5
      org.springframework.web/pom.xml

6
org.springframework.aop/pom.xml
Unescape View File

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -46,7 +46,6 @@ @@ -46,7 +46,6 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -70,19 +69,16 @@ @@ -70,19 +69,16 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
</dependencies>

2
org.springframework.aspects/pom.xml
Unescape View File

@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -58,7 +57,6 @@ @@ -58,7 +57,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>

13
org.springframework.beans/pom.xml
Unescape View File

@ -17,12 +17,18 @@ @@ -17,12 +17,18 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>com.springsource.javax.inject</artifactId>
<version>0.9.0.PFD</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -40,19 +46,16 @@ @@ -40,19 +46,16 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
</dependencies>

3
org.springframework.context.support/pom.xml
Unescape View File

@ -119,13 +119,11 @@ @@ -119,13 +119,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
@ -137,7 +135,6 @@ @@ -137,7 +135,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
</dependencies>

61
org.springframework.context/pom.xml
Unescape View File

@ -43,6 +43,11 @@ @@ -43,6 +43,11 @@
<version>3.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>com.springsource.javax.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
@ -55,6 +60,12 @@ @@ -55,6 +60,12 @@
<version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.CR3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
@ -64,15 +75,9 @@ @@ -64,15 +75,9 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
@ -88,7 +93,6 @@ @@ -88,7 +93,6 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -100,15 +104,21 @@ @@ -100,15 +104,21 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>1.5.1</version>
<version>1.7-beta-1</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.1.1</version>
<version>1.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
@ -145,6 +155,12 @@ @@ -145,6 +155,12 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
@ -172,27 +188,30 @@ @@ -172,27 +188,30 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.Beta2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>1.5.3</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>

4
org.springframework.core/pom.xml
Unescape View File

@ -34,13 +34,11 @@ @@ -34,13 +34,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -58,13 +56,11 @@ @@ -58,13 +56,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>

2
org.springframework.expression/pom.xml
Unescape View File

@ -28,13 +28,11 @@ @@ -28,13 +28,11 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
</dependencies>

10
org.springframework.integration-tests/pom.xml
Unescape View File

@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -273,13 +273,12 @@ @@ -273,13 +273,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>org.codehaus.groovy</artifactId>
<version>1.5.1</version>
<version>1.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
@ -297,7 +296,6 @@ @@ -297,7 +296,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
@ -357,7 +355,7 @@ @@ -357,7 +355,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>org.jruby</artifactId>
<version>1.1</version>
<version>1.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -453,7 +451,6 @@ @@ -453,7 +451,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
<dependency>
@ -471,7 +468,6 @@ @@ -471,7 +468,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>

2
org.springframework.jdbc/pom.xml
Unescape View File

@ -85,13 +85,11 @@ @@ -85,13 +85,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>

2
org.springframework.jms/pom.xml
Unescape View File

@ -52,13 +52,11 @@ @@ -52,13 +52,11 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>

5
org.springframework.orm/pom.xml
Unescape View File

@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
@ -183,7 +183,6 @@ @@ -183,7 +183,6 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
@ -195,7 +194,6 @@ @@ -195,7 +194,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
@ -207,7 +205,6 @@ @@ -207,7 +205,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>

2
org.springframework.oxm/pom.xml
Unescape View File

@ -78,13 +78,11 @@ @@ -78,13 +78,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>

48
org.springframework.spring-parent/pom.xml
Unescape View File

@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
<layout>legacy</layout>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1-->
<!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1, javax.el/el-api 2.1 -->
<repository>
<id>jboss</id>
<name>JBoss Repository</name>
@ -76,17 +76,53 @@ @@ -76,17 +76,53 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>com.springsource.javax.inject</artifactId>
<version>0.9.0.PFD</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

4
org.springframework.test/pom.xml
Unescape View File

@ -58,7 +58,6 @@ @@ -58,7 +58,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@ -75,7 +74,6 @@ @@ -75,7 +74,6 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<optional>true</optional>
</dependency>
<dependency>
@ -161,7 +159,7 @@ @@ -161,7 +159,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-cglib-repack</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
</dependencies>

5
org.springframework.transaction/pom.xml
Unescape View File

@ -78,19 +78,16 @@ @@ -78,19 +78,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
@ -108,7 +105,7 @@ @@ -108,7 +105,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
</dependencies>

2
org.springframework.web.portlet/pom.xml
Unescape View File

@ -100,13 +100,11 @@ @@ -100,13 +100,11 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
</dependencies>

4
org.springframework.web.servlet/pom.xml
Unescape View File

@ -188,13 +188,11 @@ @@ -188,13 +188,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
@ -244,7 +242,7 @@ @@ -244,7 +242,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>

5
org.springframework.web/pom.xml
Unescape View File

@ -106,7 +106,6 @@ @@ -106,7 +106,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<optional>true</optional>
</dependency>
<dependency>
@ -154,19 +153,17 @@ @@ -154,19 +153,17 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>

Write Preview
Loading…
Cancel
Save