Skip to content

Commit

Permalink
SPR-5976 - Upgrade POMS to JUnit 4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@markpollack
markpollack committed Aug 5, 2009
1 parent f9016fd commit 97e3b5c
Show file tree
Hide file tree
Showing 16 changed files with 71 additions and 16 deletions.
2 changes: 1 addition & 1 deletion org.springframework.aop/pom.xml
View file
Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
30 changes: 30 additions & 0 deletions org.springframework.aspects/pom.xml
View file
Expand Up @@ -37,6 +37,36 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<pluginManagement>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.beans/pom.xml
View file
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.context/pom.xml
View file
Expand Up @@ -178,7 +178,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.core/pom.xml
View file
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.expression/pom.xml
View file
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
14 changes: 13 additions & 1 deletion org.springframework.integration-tests/pom.xml
View file
Expand Up @@ -149,6 +149,12 @@
<artifactId>net.sf.jasperreports</artifactId>
<version>2.0.5</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
Expand Down Expand Up @@ -281,6 +287,12 @@
<artifactId>org.dom4j</artifactId>
<version>1.6.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand Down Expand Up @@ -459,7 +471,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
17 changes: 15 additions & 2 deletions org.springframework.jdbc/pom.xml
View file
Expand Up @@ -75,11 +75,11 @@
<version>10.4.2.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -95,4 +95,17 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<testResources>
<testResource>
<directory>${pom.build.sourceDirectory}</directory>
<includes>
<include>**/*.sql</include>
<include>**/*.xml</include>
</includes>
</testResource>
</testResources>
</build>

</project>
2 changes: 1 addition & 1 deletion .../test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
View file
Expand Up @@ -30,7 +30,7 @@ public void testBuildH2() {
assertDatabaseCreatedAndShutdown(db);
}

@Test

public void testBuildDerby() {
EmbeddedDatabaseBuilder builder = EmbeddedDatabaseBuilder.relativeTo(getClass());
EmbeddedDatabase db = builder.type(DERBY).script("db-schema-derby.sql").script("db-test-data.sql").build();
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.jms/pom.xml
View file
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.orm/pom.xml
View file
Expand Up @@ -207,7 +207,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.oxm/pom.xml
View file
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.spring-parent/pom.xml
View file
Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.test/pom.xml
View file
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.transaction/pom.xml
View file
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.web.portlet/pom.xml
View file
Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 97e3b5c

Please sign in to comment.