cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to c8fd16c
Date Thu, 28 Mar 2013 14:01:42 GMT
Updated Branches:
  refs/heads/master c502b4670 -> c8fd16c03


Summary: Workaround for CLOUDSTACK-1831 and CLOUDSTACK-1672

Exclude the transient dependency on jaxb-impl 2.1.13 in cxf-bundle-jars.
VmWare code depends on the 2.0 version

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8fd16c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8fd16c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8fd16c0

Branch: refs/heads/master
Commit: c8fd16c03d9946e0591c3e0c67117372dee28a75
Parents: c502b46
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Thu Mar 28 15:00:04 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Thu Mar 28 15:00:04 2013 +0100

----------------------------------------------------------------------
 engine/api/pom.xml     |    4 ++++
 framework/rest/pom.xml |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8fd16c0/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 7fc612f..1e8e8c3 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -44,6 +44,10 @@
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-server</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8fd16c0/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index a783bc8..ab88405 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -71,6 +71,10 @@
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>        
       </exclusions>
     </dependency>
   </dependencies>


Mime
View raw message