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 2014/12/08 22:28:13 UTC
deltaspike git commit: DELTASPIKE-660 added OSGi requirements and
capabilities for JPA and dependencies
Repository: deltaspike
Updated Branches:
refs/heads/master 7daf0a99e -> 15cabd2f1
DELTASPIKE-660 added OSGi requirements and capabilities for JPA and dependencies
Widened range of javax.persistence* imports to cover JPA 2.0 and JPA 2.1
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/15cabd2f
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/15cabd2f
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/15cabd2f
Branch: refs/heads/master
Commit: 15cabd2f1213268779868ed1ea9f8b23f4e79680
Parents: 7daf0a9
Author: Harald Wellmann <ha...@gmx.de>
Authored: Sun Nov 30 17:05:33 2014 +0100
Committer: Rafael Benevides <ra...@gmail.com>
Committed: Mon Dec 8 19:16:39 2014 -0200
----------------------------------------------------------------------
deltaspike/modules/data/api/pom.xml | 2 +-
deltaspike/modules/data/impl/pom.xml | 8 +++++++-
deltaspike/modules/jpa/api/pom.xml | 2 +-
deltaspike/modules/jpa/impl/pom.xml | 8 +++++++-
deltaspike/modules/partial-bean/impl/pom.xml | 7 ++++++-
5 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/15cabd2f/deltaspike/modules/data/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/api/pom.xml b/deltaspike/modules/data/api/pom.xml
index 1dab566..fcfe658 100755
--- a/deltaspike/modules/data/api/pom.xml
+++ b/deltaspike/modules/data/api/pom.xml
@@ -36,10 +36,10 @@
org.apache.deltaspike.data.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
+ javax.persistence*;version="[1.1,3)",
!org.apache.deltaspike.data.*,
*
</deltaspike.osgi.import>
- <cdi.osgi.beans-managed>META-INF/beans.xml</cdi.osgi.beans-managed>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/15cabd2f/deltaspike/modules/data/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index e340bda..2f9d061 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -36,10 +36,16 @@
org.apache.deltaspike.data.impl.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
+ javax.persistence*;version="[1.1,3)",
!org.apache.deltaspike.data.impl.*,
*
</deltaspike.osgi.import>
- <cdi.osgi.beans-managed>META-INF/beans.xml</cdi.osgi.beans-managed>
+ <deltaspike.osgi.require.capability>
+ org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension)"
+ </deltaspike.osgi.require.capability>
+ <deltaspike.osgi.provide.capability>
+ org.ops4j.pax.cdi.extension; extension=deltaspike-data-module-impl
+ </deltaspike.osgi.provide.capability>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/15cabd2f/deltaspike/modules/jpa/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/pom.xml b/deltaspike/modules/jpa/api/pom.xml
index e77c3d3..7f312a7 100644
--- a/deltaspike/modules/jpa/api/pom.xml
+++ b/deltaspike/modules/jpa/api/pom.xml
@@ -37,11 +37,11 @@
org.apache.deltaspike.jpa.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
+ javax.persistence*;version="[1.1,3)",
javax.enterprise.inject,
!org.apache.deltaspike.jpa.*,
*
</deltaspike.osgi.import>
- <cdi.osgi.beans-managed>META-INF/beans.xml</cdi.osgi.beans-managed>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/15cabd2f/deltaspike/modules/jpa/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/pom.xml b/deltaspike/modules/jpa/impl/pom.xml
index ace2dc4..a3bf612 100644
--- a/deltaspike/modules/jpa/impl/pom.xml
+++ b/deltaspike/modules/jpa/impl/pom.xml
@@ -37,10 +37,16 @@
org.apache.deltaspike.jpa.impl.*
</deltaspike.osgi.export.pkg>
<deltaspike.osgi.import>
+ javax.persistence*;version="[1.1,3)",
!org.apache.deltaspike.jpa.impl.*,
*
</deltaspike.osgi.import>
- <cdi.osgi.beans-managed>META-INF/beans.xml</cdi.osgi.beans-managed>
+ <deltaspike.osgi.require.capability>
+ org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension)"
+ </deltaspike.osgi.require.capability>
+ <deltaspike.osgi.provide.capability>
+ org.ops4j.pax.cdi.extension; extension=deltaspike-jpa-module-impl
+ </deltaspike.osgi.provide.capability>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/15cabd2f/deltaspike/modules/partial-bean/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/partial-bean/impl/pom.xml b/deltaspike/modules/partial-bean/impl/pom.xml
index fafd73f..39fe8cd 100644
--- a/deltaspike/modules/partial-bean/impl/pom.xml
+++ b/deltaspike/modules/partial-bean/impl/pom.xml
@@ -40,7 +40,12 @@
!org.apache.deltaspike.partialbean.impl.*,
*
</deltaspike.osgi.import>
- <cdi.osgi.beans-managed>META-INF/beans.xml</cdi.osgi.beans-managed>
+ <deltaspike.osgi.require.capability>
+ org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension)"
+ </deltaspike.osgi.require.capability>
+ <deltaspike.osgi.provide.capability>
+ org.ops4j.pax.cdi.extension; extension=deltaspike-partial-bean-module-impl
+ </deltaspike.osgi.provide.capability>
</properties>
<dependencies>