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

SPR-5803 and additional POM maintenance/development

pull/23217/head
Mark Pollack 17 years ago
parent
c9a87de141
commit
0c16554e23
15 changed files with 73 additions and 74 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. 10
      org.springframework.aop/pom.xml
  2. 7
      org.springframework.context.support/pom.xml
  3. 6
      org.springframework.context/pom.xml
  4. 6
      org.springframework.core/pom.xml
  5. 8
      org.springframework.expression/pom.xml
  6. 11
      org.springframework.jdbc/pom.xml
  7. 4
      org.springframework.jms/pom.xml
  8. 4
      org.springframework.orm/pom.xml
  9. 4
      org.springframework.oxm/pom.xml
  10. 18
      org.springframework.spring-parent/pom.xml
  11. 2
      org.springframework.test/pom.xml
  12. 4
      org.springframework.transaction/pom.xml
  13. 12
      org.springframework.web.portlet/pom.xml
  14. 39
      org.springframework.web.servlet/pom.xml
  15. 4
      org.springframework.web/pom.xml

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

@ -70,19 +70,15 @@ @@ -70,19 +70,15 @@
<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.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<groupId>org.objectweb.asm</groupId>
<artifactId>org.springframework.asm</artifactId>
<version>2.2.3</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@ -20,14 +20,9 @@ @@ -20,14 +20,9 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>quartz</groupId>
<groupId>opensymphony</groupId>
<artifactId>quartz</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>quartz-all</artifactId>
<version>1.6.0</version>
<optional>true</optional>
</dependency>
<dependency>

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

@ -182,9 +182,9 @@ @@ -182,9 +182,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<groupId>org.objectweb.asm</groupId>
<artifactId>org.springframework.asm</artifactId>
<version>2.2.3</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<groupId>org.objectweb.asm</groupId>
<artifactId>org.springframework.asm</artifactId>
<version>2.2.3</version>
<scope>compile</scope>
</dependency>
<dependency>

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

@ -25,12 +25,6 @@ @@ -25,12 +25,6 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@ -40,8 +34,6 @@ @@ -40,8 +34,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>

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

@ -69,17 +69,20 @@ @@ -69,17 +69,20 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.4.2.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>

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

@ -52,14 +52,10 @@ @@ -52,14 +52,10 @@
<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.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

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

@ -195,8 +195,6 @@ @@ -195,8 +195,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@ -207,8 +205,6 @@ @@ -207,8 +205,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

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

@ -76,14 +76,10 @@ @@ -76,14 +76,10 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>

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

@ -39,6 +39,11 @@ @@ -39,6 +39,11 @@
<id>EclipseLink Repo</id>
<url>http://mirror.cc.vt.edu/pub/eclipse/rt/eclipselink/maven.repo/</url>
</repository>
<!-- for rome 1.0 -->
<repository>
<id>sun-repo-2</id>
<url>http://download.java.net/maven/2/</url>
</repository>
<!-- fallback to S2 bundle repo for com.ibm.websphere.uow, oracle.classloader, com.sun.enterprise.loader -->
<repository>
<id>com.springsource.repository.bundles.release</id>
@ -65,6 +70,18 @@ @@ -65,6 +70,18 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
@ -161,6 +178,7 @@ @@ -161,6 +178,7 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<junitArtifactName>junit:junit</junitArtifactName>
<argLine>-Xmx512m</argLine>
</configuration>
</plugin>
</plugins>

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

@ -58,8 +58,6 @@ @@ -58,8 +58,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-logging</groupId>

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

@ -78,8 +78,6 @@ @@ -78,8 +78,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@ -90,8 +88,6 @@ @@ -90,8 +88,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>

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

@ -86,22 +86,18 @@ @@ -86,22 +86,18 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<groupId>org.objectweb.asm</groupId>
<artifactId>org.springframework.asm</artifactId>
<version>2.2.3</version>
<scope>compile</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.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>

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

@ -55,6 +55,11 @@ @@ -55,6 +55,11 @@
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
@ -111,7 +116,7 @@ @@ -111,7 +116,7 @@
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools-generic</artifactId>
<artifactId>velocity-tools-view</artifactId>
<version>1.4</version>
<optional>true</optional>
</dependency>
@ -145,6 +150,12 @@ @@ -145,6 +150,12 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@ -154,20 +165,16 @@ @@ -154,20 +165,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<groupId>org.objectweb.asm</groupId>
<artifactId>org.springframework.asm</artifactId>
<version>2.2.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
@ -193,5 +200,19 @@ @@ -193,5 +200,19 @@
<version>2.1_3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.3.1.GA</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
</project>

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

@ -136,8 +136,6 @@ @@ -136,8 +136,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
@ -148,8 +146,6 @@ @@ -148,8 +146,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>

Write Preview
Loading…
Cancel
Save