deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject deltaspike git commit: DELTASPIKE-1175 Update weld profiles to match dependency structure.
Date Sat, 18 Jun 2016 17:31:29 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 2418bf4a8 -> 03347f02f


DELTASPIKE-1175 Update weld profiles to match dependency structure.


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

Branch: refs/heads/master
Commit: 03347f02faf5fff9bd5ea75a3d35263bed22cdc7
Parents: 2418bf4
Author: John D. Ament <johndament@apache.org>
Authored: Sat Jun 18 13:31:12 2016 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Sat Jun 18 13:31:12 2016 -0400

----------------------------------------------------------------------
 deltaspike/buildall.sh                    |  6 ++---
 deltaspike/cdictrl/pom.xml                | 28 +++++++++++++++++---
 deltaspike/cdictrl/servlet/pom.xml        | 34 +++++++++++++++++++++++-
 deltaspike/modules/scheduler/impl/pom.xml | 36 +++++++++++++++++++++++++-
 deltaspike/parent/code/pom.xml            |  3 ++-
 5 files changed, 98 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/03347f02/deltaspike/buildall.sh
----------------------------------------------------------------------
diff --git a/deltaspike/buildall.sh b/deltaspike/buildall.sh
index d116f9f..f98b786 100755
--- a/deltaspike/buildall.sh
+++ b/deltaspike/buildall.sh
@@ -28,9 +28,9 @@ mvn clean install -POWB -Dowb.version=1.1.8 -Dopenejb.owb.version=1.2.6
| tee mv
 mvn clean install -POWB -Dowb.version=1.2.6 -Dopenejb.owb.version=1.2.6 | tee mvn-owb1_2_6.log
 mvn clean install -POWB -Dowb.version=1.2.7 -Dopenejb.owb.version=1.2.6 | tee mvn-owb1_2_7.log
 mvn clean install -POWB15 -Dowb.version=1.5.0-SNAPSHOT -Dopenejb.owb.version=1.2.6 | tee
mvn-owb1.5.0.log
-mvn clean install -PWeld -Dweld.version=1.1.10.Final | tee mvn-weld1_1_10.log
-mvn clean install -PWeld -Dweld.version=1.1.28.Final | tee mvn-weld1_1_28.log
-mvn clean install  -Ptomee-build-managed -Dtomee.version=1.7.0 -Dopenejb.version=4.7.0 -Dopenejb.owb.version=1.2.6
| tee mvn-tomee_1_7_0.log
+mvn clean install -PWeld1 -Dweld.version=1.1.10.Final | tee mvn-weld1_1_10.log
+mvn clean install -PWeld1 -Dweld.version=1.1.28.Final | tee mvn-weld1_1_28.log
+mvn clean install -Ptomee-build-managed -Dtomee.version=1.7.0 -Dopenejb.version=4.7.0 -Dopenejb.owb.version=1.2.6
| tee mvn-tomee_1_7_0.log
 mvn clean install -Pjbossas-build-managed-7 | tee mvn-jbossas_7.log
 
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/03347f02/deltaspike/cdictrl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index b15c813..1586569 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -22,9 +22,9 @@
 
     <parent>
         <groupId>org.apache.deltaspike</groupId>
-        <artifactId>parent</artifactId>
+        <artifactId>parent-code</artifactId>
         <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <relativePath>../parent/code/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -60,7 +60,29 @@
         </profile>
 
         <profile>
-            <id>Weld</id>
+            <id>Weld1</id>
+
+            <modules>
+                <module>api</module>
+                <module>impl-weld</module>
+                <module>servlet</module>
+                <module>tck</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>Weld2</id>
+
+            <modules>
+                <module>api</module>
+                <module>impl-weld</module>
+                <module>servlet</module>
+                <module>tck</module>
+            </modules>
+        </profile>
+
+        <profile>
+            <id>Weld3</id>
 
             <modules>
                 <module>api</module>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/03347f02/deltaspike/cdictrl/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml
index 801c714..edce3fe 100644
--- a/deltaspike/cdictrl/servlet/pom.xml
+++ b/deltaspike/cdictrl/servlet/pom.xml
@@ -109,7 +109,39 @@
     <profiles>
 
         <profile>
-            <id>Weld</id>
+            <id>Weld1</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.deltaspike.cdictrl</groupId>
+                    <artifactId>deltaspike-cdictrl-weld</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.weld.se</groupId>
+                    <artifactId>weld-se-core</artifactId>
+                    <version>${weld.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>Weld2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.deltaspike.cdictrl</groupId>
+                    <artifactId>deltaspike-cdictrl-weld</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.weld.se</groupId>
+                    <artifactId>weld-se-core</artifactId>
+                    <version>${weld.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>Weld3</id>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.deltaspike.cdictrl</groupId>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/03347f02/deltaspike/modules/scheduler/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/pom.xml b/deltaspike/modules/scheduler/impl/pom.xml
index 5da1b64..34edca9 100644
--- a/deltaspike/modules/scheduler/impl/pom.xml
+++ b/deltaspike/modules/scheduler/impl/pom.xml
@@ -152,7 +152,41 @@
             </dependencies>
         </profile>
         <profile>
-            <id>Weld</id>
+            <id>Weld1</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.deltaspike.cdictrl</groupId>
+                    <artifactId>deltaspike-cdictrl-weld</artifactId>
+                    <scope>test</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.jboss.weld.se</groupId>
+                    <artifactId>weld-se-core</artifactId>
+                    <version>${weld.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>Weld2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.deltaspike.cdictrl</groupId>
+                    <artifactId>deltaspike-cdictrl-weld</artifactId>
+                    <scope>test</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.jboss.weld.se</groupId>
+                    <artifactId>weld-se-core</artifactId>
+                    <version>${weld.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>Weld3</id>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.deltaspike.cdictrl</groupId>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/03347f02/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 8f24474..c60741b 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -304,7 +304,8 @@
                 </dependency>
             </dependencies>
         </profile>
-
+        <!-- please note that when changing any of these weld profiles, they are also
used in some projects.
+        Make sure to update all pom's, if required -->
         <profile>
             <!-- use this profile to compile and test DeltaSpike with JBoss Weld 1.x on
an embedded container-->
             <id>Weld1</id>


Mime
View raw message