deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject git commit: DELTASPIKE-402 cdicontainer.version for tomee via arquillian
Date Mon, 26 Aug 2013 07:44:47 GMT
Updated Branches:
  refs/heads/master 258afc8c8 -> b33e61cf7


DELTASPIKE-402 cdicontainer.version for tomee via arquillian


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

Branch: refs/heads/master
Commit: b33e61cf7b3e2b2913062d7ff3c978ffadaca3c4
Parents: 258afc8
Author: Mark Struberg <struberg@localhost.localdomain>
Authored: Mon Aug 26 09:40:06 2013 +0200
Committer: Mark Struberg <struberg@localhost.localdomain>
Committed: Mon Aug 26 09:40:06 2013 +0200

----------------------------------------------------------------------
 .../apache/deltaspike/test/core/api/provider/BeanProviderTest.java | 2 ++
 deltaspike/core/impl/src/test/resources/arquillian.xml             | 1 +
 deltaspike/parent/code/pom.xml                                     | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b33e61cf/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
index d9c9feb..94fecbc 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/BeanProviderTest.java
@@ -42,6 +42,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class BeanProviderTest
 {
     private static final String CONTAINER_OWB_1_1_x = "owb-1\\.1\\..*";
+    private static final String CONTAINER_TOMEE_1_5_x = "tomee-1\\.5\\..*";
 
 
     /**
@@ -221,6 +222,7 @@ public class BeanProviderTest
     {
         // this test is known to not work under owb-1.1.x as ManagedBean for Dependent scoped
classes did not implement PassivationCapable.
         Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_OWB_1_1_x));
+        Assume.assumeTrue(!CdiContainerUnderTest.is(CONTAINER_TOMEE_1_5_x));
 
         DependentProvider<DependentTestBean> dependentTestBeanProvider = BeanProvider.getDependent(DependentTestBean.class);
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b33e61cf/deltaspike/core/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/resources/arquillian.xml b/deltaspike/core/impl/src/test/resources/arquillian.xml
index 973dbb4..1d669d2 100644
--- a/deltaspike/core/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/core/impl/src/test/resources/arquillian.xml
@@ -79,6 +79,7 @@
             <property name="ajpPort">-1</property>
             <property name="stopPort">-1</property>
             <property name="appWorkingDir">target/arquillian-test-working-dir</property>
+            <property name="catalina_opts">-Dcdicontainer.version=tomee-${tomee.version}</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b33e61cf/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 97ecb03..0368bff 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -330,7 +330,7 @@
             <id>tomee-build-managed</id>
 
             <properties>
-                <cdicontainer.version>owb-${owb.version}</cdicontainer.version>
+                <cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
             </properties>
 
             <dependencies>


Mime
View raw message