You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jh...@apache.org on 2015/06/04 15:19:55 UTC
deltaspike git commit: DELTASPIKE-916 Weld 2.3 and 3.x support
Repository: deltaspike
Updated Branches:
refs/heads/master b19d1b62a -> 7545ab8e9
DELTASPIKE-916 Weld 2.3 and 3.x support
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7545ab8e
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7545ab8e
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7545ab8e
Branch: refs/heads/master
Commit: 7545ab8e9678d71239f8875534d21032d3033e36
Parents: b19d1b6
Author: Jozef Hartinger <jh...@redhat.com>
Authored: Thu Jun 4 10:11:39 2015 +0200
Committer: Jozef Hartinger <jh...@redhat.com>
Committed: Thu Jun 4 15:19:24 2015 +0200
----------------------------------------------------------------------
deltaspike/core/impl/pom.xml | 6 ++----
deltaspike/parent/code/pom.xml | 9 ++-------
deltaspike/parent/pom.xml | 7 +++++++
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7545ab8e/deltaspike/core/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/pom.xml b/deltaspike/core/impl/pom.xml
index 61e5841..3eb2076 100644
--- a/deltaspike/core/impl/pom.xml
+++ b/deltaspike/core/impl/pom.xml
@@ -47,7 +47,6 @@
<deltaspike.osgi.provide.capability>
org.ops4j.pax.cdi.extension; extension=deltaspike-core-impl
</deltaspike.osgi.provide.capability>
- <ejb.spec.version>3.0</ejb.spec.version>
</properties>
<dependencies>
@@ -63,9 +62,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>${ejb.spec.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7545ab8e/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index f989b7d..112be35 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -367,8 +367,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -377,11 +377,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7545ab8e/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 5d020ce..c702f64 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -73,6 +73,7 @@
<!-- Geronimo specs -->
<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-interceptor-1.1-spec.version>1.0</geronimo-interceptor-1.1-spec.version>
@@ -394,6 +395,12 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <version>${geronimo-ejb-3.1-spec.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
<version>${geronimo-jcdi-1.0-spec.version}</version>
<scope>provided</scope>