Author: slaws
Date: Tue Jan 1 10:05:16 2008
New Revision: 607884
URL: http://svn.apache.org/viewvc?rev=607884&view=rev
Log:
A start at fixing some of the multi version dependencies in the build. Got
stuck on the saxon dependency that is required at different versions by ODE and
by the XML demo
Modified:
incubator/tuscany/java/sca/modules/binding-ejb/pom.xml
incubator/tuscany/java/sca/modules/binding-feed/pom.xml
incubator/tuscany/java/sca/modules/binding-jms/pom.xml
incubator/tuscany/java/sca/modules/binding-jsonrpc/pom.xml
incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
incubator/tuscany/java/sca/modules/databinding-json/pom.xml
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml
incubator/tuscany/java/sca/modules/host-jms-activemq/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-script/pom.xml
incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
incubator/tuscany/java/sca/modules/policy-security/pom.xml
incubator/tuscany/java/sca/modules/policy-xml/pom.xml
incubator/tuscany/java/sca/modules/runtime/pom.xml
incubator/tuscany/java/sca/modules/saxon/build-saxon.xml
Modified: incubator/tuscany/java/sca/modules/binding-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ejb/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ejb/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ejb/pom.xml Tue Jan 1 10:05:16
2008
@@ -137,6 +137,18 @@
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/binding-feed/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/pom.xml Tue Jan 1 10:05:16
2008
@@ -106,6 +106,31 @@
<version>4.2</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/binding-jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/pom.xml Tue Jan 1 10:05:16
2008
@@ -111,6 +111,82 @@
<version>4.2</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/pom.xml Tue Jan 1
10:05:16 2008
@@ -92,6 +92,22 @@
<version>2.4</version> <!-- to keep compatible with older servlet
containers -->
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- Test Dependencies -->
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Tue Jan 1
10:05:16 2008
@@ -192,6 +192,12 @@
<artifactId>servlet-api</artifactId>
<version>2.4</version><!-- to keep compatible with older servlet
containers -->
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
Modified: incubator/tuscany/java/sca/modules/databinding-json/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-json/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-json/pom.xml Tue Jan 1
10:05:16 2008
@@ -63,6 +63,14 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -78,6 +86,22 @@
<artifactId>junit</artifactId>
<version>4.2</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml Tue Jan 1
10:05:16 2008
@@ -50,6 +50,14 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -66,6 +74,22 @@
<version>2.8.1</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: incubator/tuscany/java/sca/modules/host-jms-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-jms-activemq/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-jms-activemq/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/host-jms-activemq/pom.xml Tue Jan 1
10:05:16 2008
@@ -81,6 +81,18 @@
<version>4.2</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Tue Jan 1
10:05:16 2008
@@ -321,17 +321,32 @@
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
<version>8.7</version>
+ <!--version>9.0.0.2</version-->
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-dom</artifactId>
- <version>8.7</version>
+ <version>8.7</version>
+ <!--version>9.0.0.2</version-->
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-xpath</artifactId>
- <version>8.7</version>
+ <version>8.7</version>
+ <!--version>9.0.0.2</version-->
</dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: incubator/tuscany/java/sca/modules/implementation-script/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/pom.xml Tue Jan 1
10:05:16 2008
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.bsf</groupId>
<artifactId>bsf-all</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-beta2</version>
</dependency>
<dependency>
@@ -65,6 +65,14 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
<version>1.2.5</version>
</dependency>
@@ -103,6 +111,22 @@
<version>1.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- TODO: big hack to add script engine dependencies till extension
dependencies fixed -->
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
(original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml Tue Jan
1 10:05:16 2008
@@ -62,6 +62,18 @@
<version>4.2</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/policy-security/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-security/pom.xml Tue Jan 1
10:05:16 2008
@@ -37,6 +37,14 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
<version>1.2.5</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/policy-xml/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/pom.xml Tue Jan 1 10:05:16
2008
@@ -60,6 +60,10 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -87,13 +91,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -101,5 +98,18 @@
<version>3.2.1</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime/pom.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/runtime/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/runtime/pom.xml Tue Jan 1 10:05:16 2008
@@ -340,7 +340,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/saxon/build-saxon.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/saxon/build-saxon.xml?rev=607884&r1=607883&r2=607884&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/saxon/build-saxon.xml (original)
+++ incubator/tuscany/java/sca/modules/saxon/build-saxon.xml Tue Jan 1
10:05:16 2008
@@ -30,6 +30,7 @@
<available
file="${localRepository}/net/sf/saxon/saxon/${saxon.version}/saxon-${saxon.version}.jar"
/>
<available
file="${localRepository}/net/sf/saxon/saxon-dom/${saxon.version}/saxon-dom-${saxon.version}.jar"
/>
<available
file="${localRepository}/net/sf/saxon/saxon-api/${saxon.version}/saxon-api-${saxon.version}.jar"
/>
+ <available
file="${localRepository}/net/sf/saxon/saxon-xpath/${saxon.version}/saxon-xpath-${saxon.version}.jar"
/>
</and>
</condition>
<condition property="maven.suffix" value="">
@@ -61,6 +62,9 @@
<exec executable="mvn${maven.suffix}" dir="${basedir}"
failonerror="false">
<arg line="install:install-file -DgroupId=net.sf.saxon
-DartifactId=saxon-api -Dversion=${saxon.version} -Dpackaging=jar
-DgeneratePom=true -Dfile=${saxon.dir}/saxon9-s9api.jar" />
</exec>
+ <exec executable="mvn${maven.suffix}" dir="${basedir}"
failonerror="false">
+ <arg line="install:install-file -DgroupId=net.sf.saxon
-DartifactId=saxon-xpath -Dversion=${saxon.version} -Dpackaging=jar
-DgeneratePom=true -Dfile=${saxon.dir}/saxon9-xpath.jar" />
+ </exec>
</target>
<target name="install-saxon-nomaven" depends="check-saxon-installed"
unless="already.installed">
@@ -71,7 +75,7 @@
<copy file="${saxon.dir}/saxon9.jar"
tofile="${localRepository}/net/sf/saxon/saxon/${saxon.version}/saxon-${saxon.version}.jar"
/>
<copy file="${saxon.dir}/saxon9-dom.jar"
tofile="${localRepository}/net/sf/saxon/saxon-dom/${saxon.version}/saxon-dom-${saxon.version}.jar"
/>
<copy file="${saxon.dir}/saxon9-s9api.jar"
tofile="${localRepository}/net/sf/saxon/saxon-api/${saxon.version}/saxon-api-${saxon.version}.jar"
/>
-
+ <copy file="${saxon.dir}/saxon9-xpath.jar"
tofile="${localRepository}/net/sf/saxon/saxon-xpath/${saxon.version}/saxon-xpath-${saxon.version}.jar"
/>
</target>
<target name="clean-saxon-files">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
