You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2014/12/20 17:09:46 UTC
deltaspike git commit: DELTASPIKE-802 use latest CDI-1.0 compatible
containers by default
Repository: deltaspike
Updated Branches:
refs/heads/master 65c9a3bde -> 8578242ef
DELTASPIKE-802 use latest CDI-1.0 compatible containers by default
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8578242e
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8578242e
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8578242e
Branch: refs/heads/master
Commit: 8578242efd0f6070dbfc7ead252dc1cfce481312
Parents: 65c9a3b
Author: Mark Struberg <st...@apache.org>
Authored: Sat Dec 20 17:08:39 2014 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Dec 20 17:09:14 2014 +0100
----------------------------------------------------------------------
deltaspike/buildall.sh | 6 +++---
deltaspike/cdictrl/impl-openejb/pom.xml | 6 ------
deltaspike/cdictrl/impl-owb/pom.xml | 2 +-
deltaspike/cdictrl/servlet/pom.xml | 2 +-
deltaspike/parent/code/pom.xml | 2 +-
deltaspike/parent/pom.xml | 15 ++++++++++-----
6 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8578242e/deltaspike/buildall.sh
----------------------------------------------------------------------
diff --git a/deltaspike/buildall.sh b/deltaspike/buildall.sh
index 4eab7ca..cd9b727 100755
--- a/deltaspike/buildall.sh
+++ b/deltaspike/buildall.sh
@@ -26,11 +26,11 @@
rm mvn-*log
mvn clean install -POWB -Dowb.version=1.1.8 | tee mvn-owb1_1_8.log
mvn clean install -POWB -Dowb.version=1.2.6 -Dopenejb.owb.version=1.1.8 | tee mvn-owb1_2_6.log
-mvn clean install -POWB -Dowb.version=1.2.7-SNAPSHOT -Dopenejb.owb.version=1.1.8 | tee mvn-owb1_2_7.log
-mvn clean install -POWB2 -Dowb.version=2.0.0-SNAPSHOT -Dopenejb.owb.version=1.1.8 | tee mvn-owb2.0.0.log
+mvn clean install -POWB -Dowb.version=1.2.7 -Dopenejb.owb.version=1.1.8 | tee mvn-owb1_2_7.log
+mvn clean install -POWB15 -Dowb.version=1.5.0-SNAPSHOT -Dopenejb.owb.version=1.2.7 | 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.6.0 -Dopenejb.version=4.6.0 -Dopenejb.owb.version=1.2.1 | tee mvn-tomee_1_6_0.log
-mvn clean install -Ptomee-build-managed -Dtomee.version=1.5.2 -Dopenejb.version=4.5.2 -Dopenejb.owb.version=1.1.8 | tee mvn-tomee_1_5_2.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/8578242e/deltaspike/cdictrl/impl-openejb/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml b/deltaspike/cdictrl/impl-openejb/pom.xml
index dafed45..f261d3d 100644
--- a/deltaspike/cdictrl/impl-openejb/pom.xml
+++ b/deltaspike/cdictrl/impl-openejb/pom.xml
@@ -32,11 +32,6 @@
<name>Apache DeltaSpike CDI OpenEJB-ContainerControl</name>
- <properties>
- <openejb.version>4.5.1</openejb.version>
- <openejb.owb.version>${owb.version}</openejb.owb.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -56,7 +51,6 @@
<version>${openejb.version}</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8578242e/deltaspike/cdictrl/impl-owb/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/pom.xml b/deltaspike/cdictrl/impl-owb/pom.xml
index 3852610..e4946e9 100644
--- a/deltaspike/cdictrl/impl-owb/pom.xml
+++ b/deltaspike/cdictrl/impl-owb/pom.xml
@@ -121,7 +121,7 @@
<profile>
<!-- use this profile to compile and test DeltaSpike with Apache OpenWebBeans 2.x -->
- <id>OWB2</id>
+ <id>OWB15</id>
<dependencies>
<!-- OWB specific dependencies-->
<dependency>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8578242e/deltaspike/cdictrl/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml
index f8396ed..cc69283 100644
--- a/deltaspike/cdictrl/servlet/pom.xml
+++ b/deltaspike/cdictrl/servlet/pom.xml
@@ -162,7 +162,7 @@
<profile>
<!-- use this profile to compile and test DeltaSpike with Apache OpenWebBeans 2.x -->
- <id>OWB2</id>
+ <id>OWB15</id>
<dependencies>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8578242e/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 5eceddb..b3515b2 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -215,7 +215,7 @@
<profile>
<!-- use this profile to compile and test DeltaSpike with Apache OpenWebBeans 2.x -->
- <id>OWB2</id>
+ <id>OWB15</id>
<properties>
<cdicontainer.version>owb-${owb.version}</cdicontainer.version>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8578242e/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index fc7a81e..495f775 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -48,13 +48,18 @@
<properties>
<java.version>1.6</java.version>
- <owb.version>1.1.8</owb.version>
- <weld.version>1.1.19.Final</weld.version>
+ <owb.version>1.2.7</owb.version>
+ <weld.version>1.1.28.Final</weld.version>
+
+ <!-- for cdictrl-openejb -->
+ <openejb.version>4.7.1</openejb.version>
+ <openejb.owb.version>${owb.version}</openejb.owb.version>
+
<!-- testing stuff -->
<junit.version>4.10</junit.version>
<arquillian.version>1.0.2.Final</arquillian.version>
- <tomee.version>1.7.0</tomee.version>
+ <tomee.version>1.7.1</tomee.version>
<!-- JSF-2.0 implementations-->
<myfaces2.version>2.0.14</myfaces2.version>
@@ -69,9 +74,9 @@
<!-- Geronimo specs -->
<geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
<geronimo-jcdi-1.0-spec.version>1.0</geronimo-jcdi-1.0-spec.version>
- <geronimo-jcdi-1.1-spec.version>1.0-SNAPSHOT</geronimo-jcdi-1.1-spec.version>
+ <geronimo-jcdi-1.1-spec.version>1.0-alpha-1</geronimo-jcdi-1.1-spec.version>
<geronimo-interceptor-1.1-spec.version>1.0</geronimo-interceptor-1.1-spec.version>
- <geronimo-interceptor-1.2-spec.version>1.0-SNAPSHOT</geronimo-interceptor-1.2-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>
<geronimo-servlet-3.0-spec.version>1.0</geronimo-servlet-3.0-spec.version>
<geronimo-el-2.2-spec.version>1.0.3</geronimo-el-2.2-spec.version>