deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rafab...@apache.org
Subject deltaspike git commit: DELTASPIKE-854 - update related artifacts version to fix jacoco profile + introduce real coverage in container
Date Mon, 16 Mar 2015 15:39:23 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master fcf4d77d6 -> 920f68c80


DELTASPIKE-854 - update related artifacts version to fix jacoco profile
+ introduce real coverage in container


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

Branch: refs/heads/master
Commit: 920f68c808859f1a417175e312acd1324ce85ea9
Parents: fcf4d77
Author: Tomas Remes <tremes@redhat.com>
Authored: Mon Mar 16 10:02:43 2015 +0100
Committer: Tomas Remes <tremes@redhat.com>
Committed: Mon Mar 16 10:06:40 2015 +0100

----------------------------------------------------------------------
 .../apache/deltaspike/data/test/util/TestDeployments.java   | 2 +-
 deltaspike/modules/jsf/impl/pom.xml                         | 2 +-
 deltaspike/parent/code/pom.xml                              | 1 +
 deltaspike/parent/pom.xml                                   | 9 ++++++---
 .../test-utils/src/main/resources/arquillian-jboss.xml      | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/920f68c8/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
index 3e34d34..99db6d7 100755
--- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
+++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/util/TestDeployments.java
@@ -97,7 +97,7 @@ public abstract class TestDeployments
         Logging.reconfigure();
         String descriptor = Descriptors.create(BeansDescriptor.class)
                 .addDefaultNamespaces()
-                .createAlternatives()
+                .getOrCreateAlternatives()
                     .clazz(EnvironmentAwareTransactionStrategy.class.getName())
                     .up()
                 .exportAsString();

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/920f68c8/deltaspike/modules/jsf/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/pom.xml b/deltaspike/modules/jsf/impl/pom.xml
index b31dba3..07d8ea4 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -137,7 +137,7 @@
         <dependency>
             <groupId>org.jboss.arquillian.graphene</groupId>
             <artifactId>graphene-webdriver</artifactId>
-            <version>2.0.0.Alpha2</version>
+            <version>2.0.3.Final</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/920f68c8/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 7821961..e964de2 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -565,6 +565,7 @@
                                 <arquillian.xml>arquillian-jboss.xml</arquillian.xml>
                                 <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
                                 <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+                                <jacoco.agent>${jacoco.agent}</jacoco.agent>
                             </systemProperties>
                             <!-- we just use groups to mark that a test should be executed
only
                             with specific environments. even though a java-ee6 application
server has to be able to run

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/920f68c8/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 83c70d3..0f1dad9 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.0.2.Final</arquillian.version>
+        <arquillian.version>1.1.4.Final</arquillian.version>
         <tomee.version>1.7.0</tomee.version>
 
         <!-- JSF-2.0 implementations-->
@@ -97,7 +97,7 @@
 
         <hamcrest.version>1.3</hamcrest.version>
 
-        <jacoco.version>0.5.7.201204190339</jacoco.version>
+        <jacoco.version>0.7.4.201502262128</jacoco.version>
 
         <arquillian-weld.version>1.0.0.CR7</arquillian-weld.version>
 
@@ -185,7 +185,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha3</version>
+                    <version>1.0.0.Alpha7</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -202,6 +202,9 @@
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
                         <version>${jacoco.version}</version>
+                        <configuration>
+                            <propertyName>jacoco.agent</propertyName>
+                        </configuration>
                         <executions>
                             <execution>
                                 <goals>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/920f68c8/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
index 668cdea..3eb63a6 100644
--- a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
+++ b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
@@ -32,7 +32,7 @@
 
     <container qualifier="jbossas-managed-7">
         <configuration>
-            <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m
-Dcdicontainer.version=${cdicontainer.version}</property>
+            <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m
-Dcdicontainer.version=${cdicontainer.version} ${jacoco.agent}</property>
             <property name="outputToConsole">false</property>
             <property name="allowConnectingToRunningServer">true</property>
             <property name="cdicontainer.version">${cdicontainer.version}</property>


Mime
View raw message