deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwellm...@apache.org
Subject deltaspike git commit: DELTASPIKE-933 Upgrade to Arquillian 1.1.8.Final
Date Tue, 16 Jun 2015 09:35:41 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 029435236 -> ff08daa87


DELTASPIKE-933 Upgrade to Arquillian 1.1.8.Final

Also excluded transitive xercesImpl dependency to suppress runtime error

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

Branch: refs/heads/master
Commit: ff08daa871b3d379481f82c2b02eccaa7f7e93d8
Parents: 0294352
Author: Harald Wellmann <hwellmann@apache.org>
Authored: Tue Jun 16 11:35:13 2015 +0200
Committer: Harald Wellmann <hwellmann@apache.org>
Committed: Tue Jun 16 11:35:13 2015 +0200

----------------------------------------------------------------------
 deltaspike/modules/jsf/impl/pom.xml | 6 +++++-
 deltaspike/parent/pom.xml           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff08daa8/deltaspike/modules/jsf/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/pom.xml b/deltaspike/modules/jsf/impl/pom.xml
index ceb77c0..e317d07 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -151,8 +151,12 @@
             <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>cdi-api</artifactId>
                     <groupId>javax.enterprise</groupId>
+                    <artifactId>cdi-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ff08daa8/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index d4ee386..1539b0e 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -58,7 +58,7 @@
 
         <!-- testing stuff -->
         <junit.version>4.10</junit.version>
-        <arquillian.version>1.1.4.Final</arquillian.version>
+        <arquillian.version>1.1.8.Final</arquillian.version>
         <tomee.version>1.7.0</tomee.version>
 
         <!-- JSF-2.0 implementations-->


Mime
View raw message