Make as many dependencies as possible optional (it's not inherited from parent apparently).

This commit is contained in:
dsyer
2008-12-03 21:21:01 +00:00
parent 1f8499ee4b
commit 708364f1cc
6 changed files with 58 additions and 23 deletions

View File

@@ -28,6 +28,7 @@
<dependency>
<groupId>org.objectweb.asm</groupId>
<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
@@ -38,6 +39,10 @@
<artifactId>com.springsource.org.apache.commons.io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.lang</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>com.springsource.org.easymock</artifactId>
@@ -70,6 +75,7 @@
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<optional>true</optional>
</dependency>
<!-- Spring Dependencies -->
<dependency>
@@ -96,6 +102,7 @@
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -110,6 +117,12 @@
<groupId>javax.annotation</groupId>
<artifactId>com.springsource.javax.annotation</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<!-- optional for Java 6 -->
<optional>true</optional>
</dependency>
</dependencies>
<build>

View File

@@ -73,6 +73,11 @@
<artifactId>com.springsource.org.apache.commons.io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.lang</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>com.springsource.org.apache.derby</artifactId>

View File

@@ -74,10 +74,12 @@
<dependency>
<groupId>net.sourceforge.cglib</groupId>
<artifactId>com.springsource.net.sf.cglib</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>com.springsource.javax.jms</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -86,6 +88,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.lang</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -100,44 +103,26 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate.ejb</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>com.springsource.org.hibernate.annotations</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>com.springsource.javax.transaction</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.cglib</groupId>
<artifactId>com.springsource.net.sf.cglib</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>com.springsource.com.ibatis</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>com.springsource.javax.persistence</artifactId>
</dependency>
<dependency>
<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
<groupId>stax</groupId>
<artifactId>stax</artifactId>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>org.springframework.oxm</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aop</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -145,6 +130,23 @@
<artifactId>com.springsource.javax.persistence</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<!-- TODO: remove this or find a replacement in Java 5 / BRITS -->
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<optional>true</optional>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>org.springframework.oxm</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aop</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.core</artifactId>

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<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">
<parent>
<artifactId>org.springframework.batch
</artifactId>
@@ -55,6 +56,7 @@
<groupId>javax.jms</groupId>
<artifactId>com.springsource.javax.jms
</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -110,6 +112,7 @@
<groupId>org.springframework</groupId>
<artifactId>org.springframework.jms
</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

View File

@@ -165,6 +165,12 @@
<artifactId>db2jcc</artifactId> <version>9.5.0</version>
<scope>test</scope> </dependency>
-->
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<!-- optional for Java 6 -->
<optional>true</optional>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>

View File

@@ -55,6 +55,12 @@
<artifactId>com.springsource.org.apache.commons.collections
</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<!-- optional for Java 6 -->
<optional>true</optional>
</dependency>
</dependencies>
<reporting>
<plugins>