deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwellm...@apache.org
Subject deltaspike git commit: DELTASPIKE-936 OSGi capability cleanup
Date Fri, 19 Jun 2015 10:41:55 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 687e57e89 -> 61830c63d


DELTASPIKE-936 OSGi capability cleanup

Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/61830c63
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/61830c63
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/61830c63

Branch: refs/heads/master
Commit: 61830c63d576a72965b984071611511d9bbcbaa3
Parents: 687e57e
Author: Harald Wellmann <hwellmann@apache.org>
Authored: Fri Jun 19 12:40:44 2015 +0200
Committer: Harald Wellmann <hwellmann@apache.org>
Committed: Fri Jun 19 12:40:44 2015 +0200

----------------------------------------------------------------------
 deltaspike/core/api/pom.xml                  | 3 +++
 deltaspike/core/impl/pom.xml                 | 1 +
 deltaspike/modules/data/impl/pom.xml         | 3 ++-
 deltaspike/modules/jpa/api/pom.xml           | 3 +++
 deltaspike/modules/jpa/impl/pom.xml          | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml | 3 +--
 deltaspike/modules/security/api/pom.xml      | 3 +++
 deltaspike/modules/security/impl/pom.xml     | 3 +--
 8 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/core/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/pom.xml b/deltaspike/core/api/pom.xml
index bc5b6f3..886efb1 100644
--- a/deltaspike/core/api/pom.xml
+++ b/deltaspike/core/api/pom.xml
@@ -41,6 +41,9 @@
             !org.apache.deltaspike.core.*,
             *
         </deltaspike.osgi.import>
+        <deltaspike.osgi.require.capability>
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
+        </deltaspike.osgi.require.capability>
         <deltaspike.osgi.provide.capability>
             org.ops4j.pax.cdi.extension; extension=deltaspike-core-api
         </deltaspike.osgi.provide.capability>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/core/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/pom.xml b/deltaspike/core/impl/pom.xml
index ab777c0..1747075 100644
--- a/deltaspike/core/impl/pom.xml
+++ b/deltaspike/core/impl/pom.xml
@@ -42,6 +42,7 @@
             *
         </deltaspike.osgi.import>
         <deltaspike.osgi.require.capability>
+            osgi.extender; filter:="(osgi.extender=pax.cdi)",
             org.ops4j.pax.cdi.extension; filter:="(extension=deltaspike-core-api)"
         </deltaspike.osgi.require.capability>
         <deltaspike.osgi.provide.capability>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/modules/data/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml
index 88d239d..84be55a 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -37,11 +37,12 @@
         </deltaspike.osgi.export.pkg>
         <deltaspike.osgi.import>
             javax.persistence*;version="[1.1,3)",
+            org.apache.deltaspike.jpa.impl.transaction,
             !org.apache.deltaspike.data.impl.*,
             *
         </deltaspike.osgi.import>
         <deltaspike.osgi.require.capability>
-            org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension)"
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
         </deltaspike.osgi.require.capability>
         <deltaspike.osgi.provide.capability>
             org.ops4j.pax.cdi.extension; extension=deltaspike-data-module-impl

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/modules/jpa/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/api/pom.xml b/deltaspike/modules/jpa/api/pom.xml
index b2f95e3..3aec963 100644
--- a/deltaspike/modules/jpa/api/pom.xml
+++ b/deltaspike/modules/jpa/api/pom.xml
@@ -42,6 +42,9 @@
             !org.apache.deltaspike.jpa.*,
             *
         </deltaspike.osgi.import>
+        <deltaspike.osgi.require.capability>
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
+        </deltaspike.osgi.require.capability>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/modules/jpa/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/pom.xml b/deltaspike/modules/jpa/impl/pom.xml
index 2246365..e84f7c2 100644
--- a/deltaspike/modules/jpa/impl/pom.xml
+++ b/deltaspike/modules/jpa/impl/pom.xml
@@ -42,7 +42,7 @@
             *
         </deltaspike.osgi.import>
         <deltaspike.osgi.require.capability>
-            org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension)"
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
         </deltaspike.osgi.require.capability>
         <deltaspike.osgi.provide.capability>
             org.ops4j.pax.cdi.extension; extension=deltaspike-jpa-module-impl

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/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 d4124e4..ff57869 100644
--- a/deltaspike/modules/partial-bean/impl/pom.xml
+++ b/deltaspike/modules/partial-bean/impl/pom.xml
@@ -41,8 +41,7 @@
             *
         </deltaspike.osgi.import>
         <deltaspike.osgi.require.capability>
-            org.ops4j.pax.cdi.extension;
-            filter:="(extension=pax-cdi-extension)"
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
         </deltaspike.osgi.require.capability>
         <deltaspike.osgi.provide.capability>
             org.ops4j.pax.cdi.extension;

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/modules/security/api/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/api/pom.xml b/deltaspike/modules/security/api/pom.xml
index 5f4b44b..428eb83 100644
--- a/deltaspike/modules/security/api/pom.xml
+++ b/deltaspike/modules/security/api/pom.xml
@@ -39,6 +39,9 @@
         <deltaspike.osgi.import>
             *
         </deltaspike.osgi.import>
+        <deltaspike.osgi.require.capability>
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
+        </deltaspike.osgi.require.capability>
     </properties>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/61830c63/deltaspike/modules/security/impl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/pom.xml b/deltaspike/modules/security/impl/pom.xml
index b1759e7..ca8de42 100644
--- a/deltaspike/modules/security/impl/pom.xml
+++ b/deltaspike/modules/security/impl/pom.xml
@@ -40,8 +40,7 @@
             *
         </deltaspike.osgi.import>
         <deltaspike.osgi.require.capability>
-            org.ops4j.pax.cdi.extension;
-            filter:="(extension=pax-cdi-extension)"
+            osgi.extender; filter:="(osgi.extender=pax.cdi)"
         </deltaspike.osgi.require.capability>
         <deltaspike.osgi.provide.capability>
             org.ops4j.pax.cdi.extension;


Mime
View raw message