deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject git commit: DELTASPIKE-447 updagring to tomee 1.6.0
Date Fri, 22 Nov 2013 13:37:24 GMT
Updated Branches:
  refs/heads/master 5f2e3a610 -> f899ad2e8


DELTASPIKE-447 updagring to tomee 1.6.0


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

Branch: refs/heads/master
Commit: f899ad2e85a04ec0975231ac55bc72629ec0ba02
Parents: 5f2e3a6
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Fri Nov 22 14:37:12 2013 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Fri Nov 22 14:37:12 2013 +0100

----------------------------------------------------------------------
 .../core/impl/src/test/resources/arquillian.xml       |  1 +
 .../impl/src/test/resources/arquillian.xml            |  1 +
 deltaspike/modules/data/impl/pom.xml                  |  8 ++++++++
 .../org/apache/deltaspike/data/test/domain/Tee2.java  |  4 ++--
 .../org/apache/deltaspike/data/test/domain/TeeId.java |  4 ++--
 .../deltaspike/data/test/util/TestDeployments.java    |  5 ++++-
 .../data/impl/src/test/resources/arquillian.xml       |  1 +
 .../jpa/impl/src/test/resources/arquillian.xml        |  1 +
 .../jsf/impl/src/test/resources/arquillian.xml        |  1 +
 .../security/impl/src/test/resources/arquillian.xml   |  1 +
 .../servlet/impl/src/test/resources/arquillian.xml    |  1 +
 deltaspike/parent/code/pom.xml                        | 14 +++++++++++++-
 deltaspike/parent/pom.xml                             |  2 +-
 deltaspike/test-utils/pom.xml                         |  5 ++++-
 14 files changed, 41 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/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 1d669d2..d818f86 100644
--- a/deltaspike/core/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/core/impl/src/test/resources/arquillian.xml
@@ -80,6 +80,7 @@
             <property name="stopPort">-1</property>
             <property name="appWorkingDir">target/arquillian-test-working-dir</property>
             <property name="catalina_opts">-Dcdicontainer.version=tomee-${tomee.version}</property>
+            <property name="simpleLog">true</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml b/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
index 973dbb4..d2ac604 100644
--- a/deltaspike/modules/bean-validation/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/bean-validation/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="simpleLog">true</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/data/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index 0eebd04..bc12b78 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -215,6 +215,14 @@
                     </testResource>
                 </testResources>
             </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                    <version>3.17.1-GA</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Tee2.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Tee2.java
b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Tee2.java
index 30f6de9..d2216db 100644
--- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Tee2.java
+++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Tee2.java
@@ -29,11 +29,11 @@ public class Tee2
 {
     @Column(nullable = false)
     @Id
-    private long teeSetId;
+    private Long teeSetId;
 
     @Column(nullable = false)
     @Id
-    private long holeId;
+    private Long holeId;
 
     public long getTeeSetId()
     {

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/TeeId.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/TeeId.java
b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/TeeId.java
index 453e389..aebbe1c 100644
--- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/TeeId.java
+++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/TeeId.java
@@ -29,10 +29,10 @@ public class TeeId implements Serializable
 {
 
     @Column(nullable = false)
-    private long teeSetId;
+    private Long teeSetId;
 
     @Column(nullable = false)
-    private long holeId;
+    private Long holeId;
 
     public TeeId()
     {

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/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 7d42d8c..c93ce26 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
@@ -143,7 +143,10 @@ public abstract class TestDeployments
         {
             JavaArchive javassistJar = ShrinkWrap.create(JavaArchive.class, "dsjavassist.jar")
                     .addPackages(true, "javassist");
-            webArchive.addAsLibrary(javassistJar);
+            if (!javassistJar.getContent().isEmpty())
+            {
+                webArchive.addAsLibrary(javassistJar);
+            }
         }
 
         return webArchive;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml b/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
index b33c5a1..e7c24a8 100644
--- a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/data/impl/src/test/resources/arquillian.xml
@@ -81,6 +81,7 @@
             <property name="ajpPort">-1</property>
             <property name="stopPort">-1</property>
             <property name="appWorkingDir">target/arquillian-test-working-dir</property>
+            <property name="simpleLog">true</property>
             <property name="properties">
                 testDatabase = new://Resource?type=DataSource
                 testDatabase.JdbcDriver = org.hsqldb.jdbcDriver

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml b/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
index 973dbb4..d2ac604 100644
--- a/deltaspike/modules/jpa/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/jpa/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="simpleLog">true</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml b/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
index 973dbb4..d2ac604 100644
--- a/deltaspike/modules/jsf/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/jsf/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="simpleLog">true</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml b/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
index d6165ac..30869ae 100644
--- a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
@@ -77,6 +77,7 @@
             <property name="ajpPort">-1</property>
             <property name="stopPort">-1</property>
             <property name="appWorkingDir">target/arquillian-test-working-dir</property>
+            <property name="simpleLog">true</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml b/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
index 973dbb4..d2ac604 100644
--- a/deltaspike/modules/servlet/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/servlet/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="simpleLog">true</property>
         </configuration>
     </container>
 </arquillian>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 75d1a78..a9ad46e 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -333,19 +333,31 @@
 
             <properties>
                 <cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
+                <arquillian.version>1.1.1.Final</arquillian.version>
+                <shrinkwrap.version>1.1.2</shrinkwrap.version>
             </properties>
 
             <dependencies>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
-                    <artifactId>tomee-embedded</artifactId>
+                    <artifactId>javaee-api</artifactId>
+                    <version>6.0-5</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>apache-tomee</artifactId>
+                    <classifier>webprofile</classifier>
                     <version>${tomee.version}</version>
+                    <scope>test</scope>
+                    <type>zip</type>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>arquillian-tomee-remote</artifactId>
                 </dependency>
 
+
                 <!-- needed by arquillian-tomee-remote -->
                 <dependency>
                     <groupId>commons-logging</groupId>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 6d1a6b8..702b65d 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -53,7 +53,7 @@
         <!-- testing stuff -->
         <junit.version>4.10</junit.version>
         <arquillian.version>1.0.2.Final</arquillian.version>
-        <tomee.version>1.5.2</tomee.version>
+        <tomee.version>1.6.0</tomee.version>
 
         <!-- JSF-2.0 implementations-->
         <myfaces2.version>2.0.14</myfaces2.version>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f899ad2e/deltaspike/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/test-utils/pom.xml b/deltaspike/test-utils/pom.xml
index eaefef4..a28e8fe 100644
--- a/deltaspike/test-utils/pom.xml
+++ b/deltaspike/test-utils/pom.xml
@@ -40,9 +40,12 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
             <artifactId>shrinkwrap-api</artifactId>
-            <version>1.0.1</version>
+            <version>${shrinkwrap.version}</version>
         </dependency>
     </dependencies>
 
+    <properties>
+        <shrinkwrap.version>1.0.1</shrinkwrap.version>
+    </properties>
 </project>
 


Mime
View raw message