You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ra...@apache.org on 2016/05/02 19:21:54 UTC
deltaspike git commit: DELTASPIKE-1091 created separate profiles for
Weld versions, changed docs accordingly.
Repository: deltaspike
Updated Branches:
refs/heads/master b610ffb14 -> 783f4d34e
DELTASPIKE-1091 created separate profiles for Weld versions, changed docs accordingly.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/783f4d34
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/783f4d34
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/783f4d34
Branch: refs/heads/master
Commit: 783f4d34e29554e47db5b49d7df702e94462e9d4
Parents: b610ffb
Author: Matej Novotny <ma...@redhat.com>
Authored: Mon May 2 10:32:55 2016 +0200
Committer: Matej Novotny <ma...@redhat.com>
Committed: Mon May 2 10:32:55 2016 +0200
----------------------------------------------------------------------
deltaspike/modules/test-control/impl/pom.xml | 12 +-
deltaspike/parent/code/pom.xml | 246 ++++++++++++++--------
documentation/src/main/asciidoc/build.adoc | 18 +-
3 files changed, 183 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/783f4d34/deltaspike/modules/test-control/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/test-control/impl/pom.xml b/deltaspike/modules/test-control/impl/pom.xml
index c716ea1..94c9c37 100644
--- a/deltaspike/modules/test-control/impl/pom.xml
+++ b/deltaspike/modules/test-control/impl/pom.xml
@@ -166,20 +166,16 @@
</dependencies>
</profile>
<profile>
- <id>Weld</id>
+ <id>Weld1</id>
<dependencies>
+ <!-- Adding a test dependency needed for Weld 1.x -->
<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>
+
+ <!-- The remaining bits of this profile are located under deltaspike/parent/code/pom.xml -->
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/783f4d34/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 490b944..6b494cc 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -306,14 +306,172 @@
</profile>
<profile>
- <!-- use this profile to compile and test DeltaSpike with JBoss Weld -->
- <id>Weld</id>
+ <!-- use this profile to compile and test DeltaSpike with JBoss Weld 1.x on an embedded container-->
+ <id>Weld1</id>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Weld Core BOM - used to fetch version of artifacts only -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <version>${weld.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se-core</artifactId>
+ </dependency>
+ <!-- needed for modules/test-control tests -->
+<!-- <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
+ <artifactId>deltaspike-cdictrl-weld</artifactId>
+ <scope>test</scope>
+ </dependency>-->
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- use this profile to compile and test DeltaSpike with JBoss Weld 2.x on an embedded container -->
+ <id>Weld2</id>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Weld Core BOM - used to fetch version of artifacts only -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <version>${weld.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- use this profile to compile and test DeltaSpike with JBoss Weld 3.x on an embedded container -->
+ <id>Weld3</id>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Weld Core BOM - used to fetch version of artifacts only -->
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <version>${weld.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-ejb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-jsf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-jta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se-shaded</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.se</groupId>
+ <artifactId>weld-se-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- This profile is automatically activated when using -Dweld.version=...
+ and contains common dependencies (e.g. test dependencies) and build setup -->
+ <id>Weld-common-setup</id>
+ <activation>
+ <property>
+ <name>weld.version</name>
+ </property>
+ </activation>
+
<properties>
<cdicontainer.version>weld-${weld.version}</cdicontainer.version>
</properties>
-
-
+
<build>
<plugins>
<plugin>
@@ -334,86 +492,8 @@
</plugins>
</build>
- <dependencyManagement>
- <dependencies><!-- org.jboss.weld -->
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <version>${weld.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
- <dependency>
- <!--
- This is a temporary workaround for WELD-1892
- We add a dependency on the bom directly. This is ugly but the only option right now to support Weld 1.1.x, 2.x and 3.x without
- requiring separate profiles.
- -->
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <type>pom</type>
- <version>${weld.version}</version>
- <scope>test</scope>
- <exclusions>
- <!-- Common -->
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject-tck</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <!-- Weld 1.x -->
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.atinject</groupId>
- <artifactId>inject-tck</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- <!-- Weld 2.x -->
- <exclusion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-jsf</artifactId>
- </exclusion>
- <!-- Weld 3.x -->
- <exclusion>
- <groupId>org.jboss.weld.module</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <!--Other than Weld dependencies-->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/783f4d34/documentation/src/main/asciidoc/build.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/build.adoc b/documentation/src/main/asciidoc/build.adoc
index c591f4e..779ef39 100644
--- a/documentation/src/main/asciidoc/build.adoc
+++ b/documentation/src/main/asciidoc/build.adoc
@@ -25,11 +25,25 @@ Tests can be executed with both the JBoss Weld and Apache OpenWebBeans CDI imple
|===
|Container |Command to Execute Arquillian Tests
-|JBoss Weld
+|JBoss Weld 1.x (CDI 1.0)
|
[source,shell]
----
-$ mvn clean install -PWeld
+$ mvn clean install -PWeld1 -Dweld.version=1.1.33.Final
+----
+
+|JBoss Weld 2.x (CDI 1.2)
+|
+[source,shell]
+----
+$ mvn clean install -PWeld2 -Dweld.version=2.3.4.Final
+----
+
+|JBoss Weld 3.x (CDI 2.0)
+|
+[source,shell]
+----
+$ mvn clean install -PWeld3 -Dweld.version=3.0.0.Alpha16
----
|Apache OpenWebBeans