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/03 16:05:49 UTC
deltaspike git commit: DELTASPIKE-1091 add default values to Weld
profiles.
Repository: deltaspike
Updated Branches:
refs/heads/master 783f4d34e -> a05d9baaa
DELTASPIKE-1091 add default values to Weld profiles.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a05d9baa
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a05d9baa
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a05d9baa
Branch: refs/heads/master
Commit: a05d9baaaf28f67a364682bc550a296ddcdb7c87
Parents: 783f4d3
Author: Matej Novotny <ma...@redhat.com>
Authored: Tue May 3 15:15:17 2016 +0200
Committer: Matej Novotny <ma...@redhat.com>
Committed: Tue May 3 15:15:17 2016 +0200
----------------------------------------------------------------------
deltaspike/parent/code/pom.xml | 197 ++++++++++++++++++++++++++++--------
deltaspike/parent/pom.xml | 7 +-
2 files changed, 158 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a05d9baa/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 6b494cc..45df72b 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -309,6 +309,12 @@
<!-- use this profile to compile and test DeltaSpike with JBoss Weld 1.x on an embedded container-->
<id>Weld1</id>
+ <properties>
+ <!-- Actual Weld version used with this profile -->
+ <weld.version>1.1.33.Final</weld.version>
+ <cdicontainer.version>weld-${weld.version}</cdicontainer.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<!-- Weld Core BOM - used to fetch version of artifacts only -->
@@ -343,19 +349,75 @@
<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>
+
+ <!--Other than Weld dependencies-->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${weld.el.api}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
- </dependency>-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${weld.sfl4j}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+ <version>${arquillian-weld.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+ </systemProperties>
+ <!-- Ignore these groups because they don't work with embedded Weld -->
+ <excludedGroups>
+ org.apache.deltaspike.test.category.WebProfileCategory,
+ org.apache.deltaspike.test.category.WebEE7ProfileCategory,
+ org.apache.deltaspike.test.category.FullProfileCategory,
+ org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory
+ </excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<!-- use this profile to compile and test DeltaSpike with JBoss Weld 2.x on an embedded container -->
<id>Weld2</id>
+ <properties>
+ <!-- Actual Weld version used with this profile -->
+ <weld.version>2.3.4.Final</weld.version>
+ <cdicontainer.version>weld-${weld.version}</cdicontainer.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<!-- Weld Core BOM - used to fetch version of artifacts only -->
@@ -394,13 +456,75 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
</dependency>
+
+ <!--Other than Weld dependencies-->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${weld.el.api}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${weld.sfl4j}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+ <version>${arquillian-weld.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+ </systemProperties>
+ <!-- Ignore these groups because they don't work with embedded Weld -->
+ <excludedGroups>
+ org.apache.deltaspike.test.category.WebProfileCategory,
+ org.apache.deltaspike.test.category.WebEE7ProfileCategory,
+ org.apache.deltaspike.test.category.FullProfileCategory,
+ org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory
+ </excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<!-- use this profile to compile and test DeltaSpike with JBoss Weld 3.x on an embedded container -->
<id>Weld3</id>
+ <properties>
+ <!-- Actual Weld version used with this profile -->
+ <weld.version>3.0.0.Alpha16</weld.version>
+ <cdicontainer.version>weld-${weld.version}</cdicontainer.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<!-- Weld Core BOM - used to fetch version of artifacts only -->
@@ -455,49 +579,12 @@
<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>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
- </systemProperties>
- <!-- Ignore these groups because they don't work with embedded Weld -->
- <excludedGroups>
- org.apache.deltaspike.test.category.WebProfileCategory,
- org.apache.deltaspike.test.category.WebEE7ProfileCategory,
- org.apache.deltaspike.test.category.FullProfileCategory,
- org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory
- </excludedGroups>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
+
<!--Other than Weld dependencies-->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>2.2</version>
+ <version>${weld.el.api}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -514,7 +601,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.2</version>
+ <version>${weld.sfl4j}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -529,6 +616,26 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+ </systemProperties>
+ <!-- Ignore these groups because they don't work with embedded Weld -->
+ <excludedGroups>
+ org.apache.deltaspike.test.category.WebProfileCategory,
+ org.apache.deltaspike.test.category.WebEE7ProfileCategory,
+ org.apache.deltaspike.test.category.FullProfileCategory,
+ org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory
+ </excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a05d9baa/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 6924679..d61d829 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -49,7 +49,8 @@
<properties>
<java.version>1.6</java.version>
<owb.version>1.2.7</owb.version>
- <weld.version>1.1.28.Final</weld.version>
+ <!-- Weld profiles (in parent/code/pom.xml) override this version -->
+ <weld.version>1.1.9.Final</weld.version>
<!-- for cdictrl-openejb -->
<openejb.version>4.7.0</openejb.version>
@@ -135,6 +136,10 @@
<!-- validator related -->
<hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
<bval.version>0.5</bval.version>
+
+ <!-- Versions of common dependencies within Weld profiles -->
+ <weld.el.api>2.2</weld.el.api>
+ <weld.sfl4j>1.7.2</weld.sfl4j>
</properties>