tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r644501 - in /incubator/tuscany/branches/sca-java-1.2: demos/alert-aggregator-webapp/ distribution/ modules/binding-atom-abdera/ modules/binding-jsonrpc/ samples/helloworld-reference-jms/ samples/helloworld-service-jms/
Date Thu, 03 Apr 2008 21:06:34 GMT
Author: lresende
Date: Thu Apr  3 14:06:33 2008
New Revision: 644501

URL: http://svn.apache.org/viewvc?rev=644501&view=rev
Log:
Fixing xerces and backport-util jar versions on the distribution

Modified:
    incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml
    incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml
    incubator/tuscany/branches/sca-java-1.2/modules/binding-atom-abdera/pom.xml
    incubator/tuscany/branches/sca-java-1.2/modules/binding-jsonrpc/pom.xml
    incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml
    incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml

Modified: incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml?rev=644501&r1=644500&r2=644501&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml Thu Apr
 3 14:06:33 2008
@@ -37,18 +37,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-api-r2.1</artifactId>
             <version>1.0-incubating</version>
@@ -134,7 +122,26 @@
             <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>  
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.6.1</version>
+            <scope>test</scope>
+			<exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>			
+        </dependency>
     </dependencies>
+
 
     <build>
         <finalName>demo-alert-aggregator-webapp</finalName>

Modified: incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml?rev=644501&r1=644500&r2=644501&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/distribution/pom.xml Thu Apr  3 14:06:33 2008
@@ -153,6 +153,14 @@
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>servlet-api-2.5</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>  
     </dependencies>

Modified: incubator/tuscany/branches/sca-java-1.2/modules/binding-atom-abdera/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/binding-atom-abdera/pom.xml?rev=644501&r1=644500&r2=644501&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/binding-atom-abdera/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/binding-atom-abdera/pom.xml Thu Apr  3
14:06:33 2008
@@ -104,6 +104,10 @@
                     <artifactId>xmlParserAPIs</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>uk.org.mygrid.resources</groupId>
                     <artifactId>icu4j</artifactId>
                 </exclusion>

Modified: incubator/tuscany/branches/sca-java-1.2/modules/binding-jsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/binding-jsonrpc/pom.xml?rev=644501&r1=644500&r2=644501&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/binding-jsonrpc/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/binding-jsonrpc/pom.xml Thu Apr  3 14:06:33
2008
@@ -137,6 +137,16 @@
 	        <artifactId>httpunit</artifactId>
 	        <version>1.6.1</version>
 	        <scope>test</scope>
+			<exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xmlParserAPIs</artifactId>
+                </exclusion>				
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>				
         </dependency>
 
     </dependencies>

Modified: incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml?rev=644501&r1=644500&r2=644501&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/helloworld-reference-jms/pom.xml Thu Apr
 3 14:06:33 2008
@@ -115,6 +115,10 @@
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>servlet-api-2.5</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>				
             </exclusions>			
         </dependency>     
         

Modified: incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml?rev=644501&r1=644500&r2=644501&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/helloworld-service-jms/pom.xml Thu Apr
 3 14:06:33 2008
@@ -109,6 +109,10 @@
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>servlet-api-2.5</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>				
             </exclusions>			
         </dependency>
 		



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message