You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2017/06/18 12:13:37 UTC
deltaspike git commit: DELTASPIKE-1273 - Add testing against OWB2,
minor fix for the weld3 profile to use latest stable by default.
Repository: deltaspike
Updated Branches:
refs/heads/master bdcbd2098 -> 82cd29fba
DELTASPIKE-1273 - Add testing against OWB2, minor fix for the weld3 profile to use latest stable by default.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/82cd29fb
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/82cd29fb
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/82cd29fb
Branch: refs/heads/master
Commit: 82cd29fba2368363ad23f97288fd1e2235d3730a
Parents: bdcbd20
Author: John D. Ament <jo...@apache.org>
Authored: Sun Jun 18 08:13:31 2017 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Sun Jun 18 08:13:31 2017 -0400
----------------------------------------------------------------------
deltaspike/parent/code/pom.xml | 109 +++++++++++++++++++++++++++++++++++-
deltaspike/parent/pom.xml | 5 +-
2 files changed, 109 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82cd29fb/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 5961161..59ec60e 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -218,7 +218,7 @@
</profile>
<profile>
- <!-- use this profile to compile and test DeltaSpike with Apache OpenWebBeans 2.x -->
+ <!-- use this profile to compile and test DeltaSpike with Apache OpenWebBeans [1.5,2.0) -->
<id>OWB15</id>
<properties>
@@ -269,7 +269,110 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>1.0.MR2-SNAPSHOT</version>
+ <version>${geronimo-annotation_1.2_spec.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans.arquillian</groupId>
+ <artifactId>owb-arquillian-standalone</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <!-- use this profile to compile and test DeltaSpike with Apache OpenWebBeans [2.0,..) -->
+ <id>OWB2</id>
+
+ <properties>
+ <owb.version>2.0.0-SNAPSHOT</owb.version>
+ <cdicontainer.version>owb-${owb.version}</cdicontainer.version>
+ <java.version>1.8</java.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>apache-snapshot-repository</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
+ </systemProperties>
+
+ <!-- Ignore these groups because they don't work with embedded OWB -->
+ <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>
+ <!-- OWB specific dependencies-->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>${geronimo-jcdi-2.0-spec.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>${geronimo-jcdi-2.0-spec.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>${geronimo-interceptor-1.2-spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -523,7 +626,7 @@
<properties>
<!-- Actual Weld version used with this profile -->
- <weld.version>3.0.0.Beta1</weld.version>
+ <weld.version>3.0.0.Final</weld.version>
<cdicontainer.version>weld-${weld.version}</cdicontainer.version>
<java.version>1.8</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/82cd29fb/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 9d395e4..1ddf26a 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -73,10 +73,13 @@
<mojarra1.version>1.2_14</mojarra1.version>
<!-- Geronimo specs -->
+ <geronimo-annotation_1.2_spec.version>1.0.MR2-SNAPSHOT</geronimo-annotation_1.2_spec.version>
+ <geronimo-annotation_1.3_spec.version>1.0-SNAPSHOT</geronimo-annotation_1.3_spec.version>
<geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
<geronimo-ejb-3.1-spec.version>1.0.2</geronimo-ejb-3.1-spec.version>
<geronimo-jcdi-1.0-spec.version>1.0</geronimo-jcdi-1.0-spec.version>
<geronimo-jcdi-1.1-spec.version>1.0-alpha-1</geronimo-jcdi-1.1-spec.version>
+ <geronimo-jcdi-2.0-spec.version>1.0-SNAPSHOT</geronimo-jcdi-2.0-spec.version>
<geronimo-interceptor-1.1-spec.version>1.0</geronimo-interceptor-1.1-spec.version>
<geronimo-interceptor-1.2-spec.version>1.0-alpha-1</geronimo-interceptor-1.2-spec.version>
<geronimo-servlet-2.5-spec.version>1.2</geronimo-servlet-2.5-spec.version>
@@ -86,7 +89,6 @@
<geronimo-jpa-2.0-spec.version>1.1</geronimo-jpa-2.0-spec.version>
<geronimo-jta-1.1-spec.version>1.1.1</geronimo-jta-1.1-spec.version>
-
<maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
<maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version>
<maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
@@ -140,7 +142,6 @@
<!-- Versions of common dependencies within Weld profiles -->
<weld.el.api>2.2</weld.el.api>
<weld.sfl4j>1.7.2</weld.sfl4j>
-
</properties>
<repositories>