You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2009/03/28 23:09:36 UTC
svn commit: r759606 - in /synapse/trunk/java: modules/distribution/pom.xml
modules/distribution/src/main/assembly/bin.xml modules/transports/pom.xml
pom.xml
Author: veithen
Date: Sat Mar 28 22:09:35 2009
New Revision: 759606
URL: http://svn.apache.org/viewvc?rev=759606&view=rev
Log:
Dependency cleanup:
* The Synapse code doesn't depend on the wrapper JARs -> moved the dependency to synapse-distribution.
* Moved transport module dependencies to the transport module.
* Removed unnecessary excludes from the distribution assembly.
Modified:
synapse/trunk/java/modules/distribution/pom.xml
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=759606&r1=759605&r2=759606&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (original)
+++ synapse/trunk/java/modules/distribution/pom.xml Sat Mar 28 22:09:35 2009
@@ -52,6 +52,13 @@
<version>${pom.version}</version>
</dependency>
+ <!-- Wrapper jars -->
+ <dependency>
+ <groupId>wrapper</groupId>
+ <artifactId>wrapper</artifactId>
+ <version>${wrapper.version}</version>
+ </dependency>
+
<!-- Modules -->
<dependency>
<groupId>org.apache.rampart</groupId>
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=759606&r1=759605&r2=759606&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Sat Mar 28 22:09:35 2009
@@ -243,10 +243,8 @@
<exclude>org.apache.rampart:rampart:mar</exclude>
<exclude>org.apache.sandesha2:sandesha2:mar</exclude>
<exclude>org.apache.ant:ant:jar</exclude>
- <exclude>org.apache.ant:ant-nodeps:jar</exclude>
<exclude>org.apache.ant:ant-launcher:jar</exclude>
<exclude>javax.servlet:servlet-api:jar</exclude>
- <exclude>commons-discovery:commons-discovery:jar</exclude>
<!--<exclude>commons-cli:commons-cli:jar</exclude>-->
<exclude>xml-apis:xml-apis:jar</exclude>
<exclude>xerces:xercesImpl:jar</exclude>
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=759606&r1=759605&r2=759606&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Sat Mar 28 22:09:35 2009
@@ -230,6 +230,70 @@
<artifactId>quickfixj-msg-fix44</artifactId>
<version>${qfj.version}</version>
</dependency>
+
+ <!-- Other dependencies -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <version>${commons.vfs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${mina.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-common</artifactId>
+ <version>${qpid.version}</version>
+ <exclusions>
+ <!-- Exclude commons-configuration because the transitive
+ depedency on DOM4J causes problems. Anyway it is not
+ really used and has disappeared in recent snapshots. -->
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>${qpid.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>de.schlichtherle.io</groupId>
+ <artifactId>truezip</artifactId>
+ <version>${truezip.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons.net.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>${oro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons_io.version}</version>
+ </dependency>
</dependencies>
<properties>
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=759606&r1=759605&r2=759606&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sat Mar 28 22:09:35 2009
@@ -550,6 +550,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -569,11 +574,6 @@
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
@@ -594,75 +594,6 @@
<version>${commons.pool.version}</version>
</dependency>
- <!-- dependencies for transports module -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs</artifactId>
- <version>${commons.vfs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-common</artifactId>
- <version>${qpid.version}</version>
- <exclusions>
- <!-- Exclude commons-configuration because the transitive
- depedency on DOM4J causes problems. Anyway it is not
- really used and has disappeared in recent snapshots. -->
- <exclusion>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-client</artifactId>
- <version>${qpid.version}</version>
- </dependency>
-
- <dependency>
- <groupId>de.schlichtherle.io</groupId>
- <artifactId>truezip</artifactId>
- <version>${truezip.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons.net.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>${oro.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons_io.version}</version>
- </dependency>
-
<!-- dependencies for Rampart -->
<dependency>
<groupId>bouncycastle</groupId>
@@ -713,12 +644,6 @@
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
- <!-- Wrapper jars -->
- <dependency>
- <groupId>wrapper</groupId>
- <artifactId>wrapper</artifactId>
- <version>${wrapper.version}</version>
- </dependency>
<!-- Saxon Dependency -->
<dependency>
@@ -924,7 +849,6 @@
<xmlsec.version>1.4.2</xmlsec.version>
<bcprov.jdk15.version>140</bcprov.jdk15.version>
- <xerces.version>2.9.1</xerces.version>
<xalan.version>2.7.1</xalan.version>
<js.version>1.6R5</js.version>