You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/08/19 01:01:37 UTC
svn commit: r805621 - in /tuscany/java/sca:
distribution/all/src/main/release/bin/
distribution/tomcat/tomcat-war/src/main/webapp/ modules/binding-ws-axis2/
modules/contribution/ modules/implementation-bpel-runtime/
modules/node-launcher/ samples/hello...
Author: rfeng
Date: Tue Aug 18 23:01:37 2009
New Revision: 805621
URL: http://svn.apache.org/viewvc?rev=805621&view=rev
Log:
Make the 3rd party jar dependencies consistent in version to avoid conflicts
Modified:
tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE
tuscany/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
tuscany/java/sca/modules/binding-ws-axis2/pom.xml
tuscany/java/sca/modules/contribution/pom.xml
tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml
tuscany/java/sca/modules/node-launcher/pom.xml
tuscany/java/sca/samples/helloworld-bpel/pom.xml
Modified: tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/java/sca/distribution/all/src/main/release/bin/LICENSE Tue Aug 18 23:01:37 2009
@@ -228,11 +228,11 @@
axis-ant-1.4.jar
cglib-2.2.jar
commons-beanutils-1.7.0.jar
- commons-cli-1.1.jar
- commons-collections-3.1.jar
+ commons-cli-1.2.jar
+ commons-collections-3.2.jar
commons-codec-1.3.jar
commons-digester-1.8.jar
- commons-discovery-0.2.jar
+ commons-discovery-0.4.jar
commons-fileupload-1.2.jar
commons-httpclient-3.1.jar
commons-io-1.4.jar
@@ -254,14 +254,14 @@
geronimo-stax-api_1.0_spec-1.0.1.jar
geronimo-transaction-2.0.1.jar
httpclient-4.0.jar
- httpcore-4.0-beta1.jar
- httpcore-nio-4.0-beta1.jar
+ httpcore-4.0.1.jar
+ httpcore-nio-4.0.1.jar
jackson-core-asl-1.0.1.jar
jackson-mapper-asl-1.0.1.jar
jetty-6.1.19.jar
jetty-util-6.1.19.jar
juli-6.0.18.jar
- log4j-1.2.13.jar
+ log4j-1.2.15.jar
mex-1.41-impl.jar
myfaces-api-1.2.2.jar
myfaces-impl-1.2.2.jar
Modified: tuscany/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE (original)
+++ tuscany/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE Tue Aug 18 23:01:37 2009
@@ -226,9 +226,9 @@
axis2-mtompolicy-1.4.1.jar
axis-ant-1.4.jar
cglib-2.2.jar
- commons-collections-3.1.jar
+ commons-collections-3.2.jar
commons-codec-1.3.jar,
- commons-discovery-0.2.jar
+ commons-discovery-0.4.jar
commons-fileupload-1.2.jar
commons-httpclient-3.1.jar
commons-io-1.4.jar
@@ -239,7 +239,7 @@
geronimo-stax-api_1.0_spec-1.0.1.jar
httpclient-4.0.jar,
httpcore-4.0.1.jar
- httpcore-nio-4.0-beta1.jar
+ httpcore-nio-4.0.1.jar
jackson-core-asl-1.0.1.jar
jackson-mapper-asl-1.0.1.jar
log4j-1.2.15.jar
Modified: tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/pom.xml Tue Aug 18 23:01:37 2009
@@ -206,12 +206,36 @@
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>4.0.1</version>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.4</version>
+ </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: tuscany/java/sca/modules/contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/pom.xml?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/pom.xml (original)
+++ tuscany/java/sca/modules/contribution/pom.xml Tue Aug 18 23:01:37 2009
@@ -34,7 +34,13 @@
<artifactId>tuscany-assembly</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xsd</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extensibility</artifactId>
Modified: tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-bpel-runtime/pom.xml Tue Aug 18 23:01:37 2009
@@ -184,7 +184,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -362,7 +362,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.0</version>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
@@ -412,10 +412,29 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: tuscany/java/sca/modules/node-launcher/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher/pom.xml?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-launcher/pom.xml (original)
+++ tuscany/java/sca/modules/node-launcher/pom.xml Tue Aug 18 23:01:37 2009
@@ -40,7 +40,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</dependency>
</dependencies>
Modified: tuscany/java/sca/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/helloworld-bpel/pom.xml?rev=805621&r1=805620&r2=805621&view=diff
==============================================================================
--- tuscany/java/sca/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/java/sca/samples/helloworld-bpel/pom.xml Tue Aug 18 23:01:37 2009
@@ -85,6 +85,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.maven.plugins</groupId>
+ <artifactId>maven-osgi-junit-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>osgi-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration></configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>