deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject deltaspike git commit: fix broken OWB build due to OpenEJB groupId rename
Date Tue, 02 Jun 2015 07:06:33 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 54d37558c -> 9637c618e


fix broken OWB build due to OpenEJB groupId rename

To start the test use
$> mvn clean install -POWB15 -Dowb.version=1.6.0 -Dopenejb.version=7.0.0-SNAPSHOT -POpenEJB-TomEE
I've introduced 2 small profiles in cdictrl-openejb. One for 'legacy' TomEE, the other one
for TomEE-7.0.0 and later. This was necessary due to the fact that the OpenEJB groupId got
changed from org.apache.openejb to org.apache.tomee.


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

Branch: refs/heads/master
Commit: 9637c618ed51d41c0f31d8aef98285aa3be05ba5
Parents: 54d3755
Author: Mark Struberg <struberg@apache.org>
Authored: Tue Jun 2 09:02:52 2015 +0200
Committer: Mark Struberg <struberg@apache.org>
Committed: Tue Jun 2 09:02:52 2015 +0200

----------------------------------------------------------------------
 deltaspike/cdictrl/impl-openejb/pom.xml | 40 +++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9637c618/deltaspike/cdictrl/impl-openejb/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml b/deltaspike/cdictrl/impl-openejb/pom.xml
index 7a1a8ed..70f9094 100644
--- a/deltaspike/cdictrl/impl-openejb/pom.xml
+++ b/deltaspike/cdictrl/impl-openejb/pom.xml
@@ -45,12 +45,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>${openejb.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -94,6 +88,37 @@
         </dependencies>
     </dependencyManagement>
 
+    <profiles>
+        <profile>
+            <id>OpenEJB-Legacy</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-core</artifactId>
+                <version>${openejb.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+        </profile>
+
+        <profile>
+            <!-- from TomEE-7.0.0 on openejb resides under the tomee group and not openejb
anymore -->
+            <id>OpenEJB-TomEE</id>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.tomee</groupId>
+                <artifactId>openejb-core</artifactId>
+                <version>${openejb.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+        </profile>
+
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
@@ -137,9 +162,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-
-
         </plugins>
     </build>
 


Mime
View raw message