Flagging providers of APIs (gosh, what a lot of work)
git-svn-id: https://svn.apache.org/repos/asf/aries/branches/1.0-prototype@1335227 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/application/application-api/pom.xml b/application/application-api/pom.xml
index 8c06a89..34a8c7d 100644
--- a/application/application-api/pom.xml
+++ b/application/application-api/pom.xml
@@ -46,10 +46,10 @@
<aries.osgi.export.pkg>
org.apache.aries.application;
org.apache.aries.application.filesystem;
- org.apache.aries.application.management;
+ org.apache.aries.application.management,
org.apache.aries.application.management.spi.*;
org.apache.aries.application.modelling;
- org.apache.aries.application.modelling.utils;
+ org.apache.aries.application.modelling.utils,
</aries.osgi.export.pkg>
<aries.osgi.private.pkg />
diff --git a/application/application-converters/pom.xml b/application/application-converters/pom.xml
index 408110d..16c038c 100644
--- a/application/application-converters/pom.xml
+++ b/application/application-converters/pom.xml
@@ -40,6 +40,11 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.convert;provide:=true,
+ org.apache.aries.web.converter;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.converters;
</aries.osgi.private.pkg>
diff --git a/application/application-default-local-platform/pom.xml b/application/application-default-local-platform/pom.xml
index d954197..133657c 100644
--- a/application/application-default-local-platform/pom.xml
+++ b/application/application-default-local-platform/pom.xml
@@ -41,6 +41,10 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.runtime;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.local.platform.impl
</aries.osgi.private.pkg>
diff --git a/application/application-deployment-management/pom.xml b/application/application-deployment-management/pom.xml
index e393ef5..380e436 100644
--- a/application/application-deployment-management/pom.xml
+++ b/application/application-deployment-management/pom.xml
@@ -42,6 +42,10 @@
<properties>
<aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.resolve;provide:=true,
+ *
+ </aries.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/application/application-management/pom.xml b/application/application-management/pom.xml
index 919f506..deebdd1 100644
--- a/application/application-management/pom.xml
+++ b/application/application-management/pom.xml
@@ -43,6 +43,12 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management;provide:=true,
+ org.apache.aries.application.management.spi.repository;provide:=true,
+ org.apache.aries.application.management.spi.resolve;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.management.impl;
org.apache.aries.application.management.internal;
diff --git a/application/application-modeller/pom.xml b/application/application-modeller/pom.xml
index a1488f8..a563692 100644
--- a/application/application-modeller/pom.xml
+++ b/application/application-modeller/pom.xml
@@ -46,7 +46,12 @@
org.apache.aries.application.modelling.internal;
org.apache.aries.application.modelling.utils.impl
</aries.osgi.private.pkg>
- <aries.osgi.export.pkg />
+ <aries.osgi.export.pkg/>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.modelling;provide:=true,
+ org.apache.aries.application.modelling.utils;provide:=true,
+ *
+ </aries.osgi.import.pkg>
</properties>
diff --git a/application/application-noop-resolver/pom.xml b/application/application-noop-resolver/pom.xml
index cce5688..119663a 100644
--- a/application/application-noop-resolver/pom.xml
+++ b/application/application-noop-resolver/pom.xml
@@ -41,6 +41,10 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.resolve;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.resolver.noop.impl
</aries.osgi.private.pkg>
diff --git a/application/application-obr-resolver/pom.xml b/application/application-obr-resolver/pom.xml
index 5ed04d7..3277318 100644
--- a/application/application-obr-resolver/pom.xml
+++ b/application/application-obr-resolver/pom.xml
@@ -43,6 +43,12 @@
<aries.osgi.export.pkg>
org.apache.aries.application.resolver.obr.ext;
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.modelling;provide:=true,
+ org.apache.aries.application.management.spi.repository;provide:=true,
+ org.apache.aries.application.management.spi.resolve;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.resolver.obr;
org.apache.aries.application.resolver.obr.impl;
diff --git a/application/application-resolve-transform-cm/pom.xml b/application/application-resolve-transform-cm/pom.xml
index 33156f1..3f27cf4 100644
--- a/application/application-resolve-transform-cm/pom.xml
+++ b/application/application-resolve-transform-cm/pom.xml
@@ -36,6 +36,10 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.resolve;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.resolve.transform.cm
</aries.osgi.private.pkg>
diff --git a/application/application-runtime-framework-management/pom.xml b/application/application-runtime-framework-management/pom.xml
index 42facc1..f2020c7 100644
--- a/application/application-runtime-framework-management/pom.xml
+++ b/application/application-runtime-framework-management/pom.xml
@@ -44,6 +44,11 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management;provide:=true,
+ org.apache.aries.application.management.spi.framework;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.framework.management
</aries.osgi.private.pkg>
diff --git a/application/application-runtime-framework/pom.xml b/application/application-runtime-framework/pom.xml
index 63f7216..7016c68 100644
--- a/application/application-runtime-framework/pom.xml
+++ b/application/application-runtime-framework/pom.xml
@@ -47,6 +47,10 @@
<aries.osgi.export.pkg>
org.apache.aries.application.runtime.framework.utils
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.framework;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.framework;
org.apache.aries.application.runtime.framework.config
diff --git a/application/application-runtime-isolated/pom.xml b/application/application-runtime-isolated/pom.xml
index 19c7be6..610f3f5 100644
--- a/application/application-runtime-isolated/pom.xml
+++ b/application/application-runtime-isolated/pom.xml
@@ -44,6 +44,12 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management;provide:=true,
+ org.apache.aries.application.management.spi.framework;provide:=true,
+ org.apache.aries.application.management.spi.runtime;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.isolated.impl
</aries.osgi.private.pkg>
diff --git a/application/application-runtime-repository/pom.xml b/application/application-runtime-repository/pom.xml
index db82cd2..6c90167 100644
--- a/application/application-runtime-repository/pom.xml
+++ b/application/application-runtime-repository/pom.xml
@@ -44,6 +44,10 @@
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management.spi.repository;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.repository
</aries.osgi.private.pkg>
diff --git a/application/application-runtime/pom.xml b/application/application-runtime/pom.xml
index 1506746..4f28ed3 100644
--- a/application/application-runtime/pom.xml
+++ b/application/application-runtime/pom.xml
@@ -44,6 +44,11 @@
<properties>
<aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management;provide:=true,
+ org.apache.aries.application.management.spi.runtime;provide:=true,
+ *
+ </aries.osgi.import.pkg>
</properties>
<dependencies>
diff --git a/application/application-utils/pom.xml b/application/application-utils/pom.xml
index 2cd13f9..81a789b 100644
--- a/application/application-utils/pom.xml
+++ b/application/application-utils/pom.xml
@@ -53,6 +53,7 @@
</aries.osgi.export.pkg>
<aries.osgi.import.pkg>
org.osgi.service.blueprint;resolution:=optional,
+ org.apache.aries.application;provide:=true,
*
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
diff --git a/blueprint/blueprint-annotation-impl/pom.xml b/blueprint/blueprint-annotation-impl/pom.xml
index 3890227..7e0fb34 100644
--- a/blueprint/blueprint-annotation-impl/pom.xml
+++ b/blueprint/blueprint-annotation-impl/pom.xml
@@ -42,6 +42,11 @@
<properties>
<aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ org.apache.aries.blueprint.annotation;provide:=true,
+ org.apache.aries.blueprint.annotation.service;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.activator>
org.apache.aries.blueprint.annotation.impl.Activator
</aries.osgi.activator>
diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml
index 2d868b5..a74b0b5 100644
--- a/blueprint/blueprint-bundle/pom.xml
+++ b/blueprint/blueprint-bundle/pom.xml
@@ -46,12 +46,7 @@
<aries.osgi.activator>
org.apache.aries.blueprint.container.BlueprintExtender
</aries.osgi.activator>
- <!--
- We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
- stabilizing API. This should be removed once the dependency is available at a
- version greater than or equal to 1.0.0
-
- We also add a version range from 1.2 for config admin. This is what we need,
+ <!-- We add a version range from 1.2 for config admin. This is what we need,
but we rely on the 4.2 compendium for a lot of other stuff.
-->
<aries.osgi.import>
@@ -65,9 +60,9 @@
org.osgi.service.event*;resolution:=optional,
org.osgi.service.framework;resolution:=optional,
org.osgi.service.cm;version="[1.2,2)",
- org.apache.aries.blueprint.annotation.service;version="$<range;[==,=+)>";resolution:=optional,
- org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
- org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.blueprint.annotation.service;provide:=true;resolution:=optional,
+ org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
+ org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
*
</aries.osgi.import>
<!-- Export package versions are maintained in packageinfo files -->
diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml
index c7707fc..418bb73 100644
--- a/blueprint/blueprint-cm/pom.xml
+++ b/blueprint/blueprint-cm/pom.xml
@@ -44,8 +44,9 @@
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg />
<aries.osgi.import.pkg>
- org.apache.aries.*;version="$<range;[==,=+)>",
- *
+ org.apache.aries.blueprint;provide:=true,
+ org.apache.aries.blueprint.ext;provide:=true,
+ *
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.blueprint.compendium.cm
diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml
index b7a9cd6..85bd9aa 100644
--- a/blueprint/blueprint-core/pom.xml
+++ b/blueprint/blueprint-core/pom.xml
@@ -55,20 +55,16 @@
org.apache.aries.blueprint.utils,
org.osgi.service.blueprint;version=1.0.0
</aries.osgi.export.pkg>
- <!--
- We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
- stabilizing API. This should be removed once the dependency is available at a
- version greater than or equal to 1.0.0
- -->
<aries.osgi.import>
!org.osgi.service.blueprint,
!org.apache.aries.blueprint*,
- org.apache.aries.util.tracker;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
+ org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
+ org.apache.aries.blueprint.annotation.service,
+ org.osgi.service.blueprint.*;provide:=true,
org.osgi.service.event*;resolution:=optional,
org.osgi.service.framework;resolution:=optional,
- org.apache.aries.blueprint.annotation.service;version="$<range;[==,=+)>";resolution:=optional,
- org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
- org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.proxy;provide:=true,
*
</aries.osgi.import>
<aries.osgi.private.pkg>
diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml
index d38564a..dff9e20 100644
--- a/blueprint/blueprint-jexl-evaluator/pom.xml
+++ b/blueprint/blueprint-jexl-evaluator/pom.xml
@@ -43,13 +43,8 @@
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg />
- <!--
- We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
- stabilizing API. This should be removed once the dependency is available at a
- version greater than or equal to 1.0.0
- -->
<aries.osgi.import>
- org.apache.aries.blueprint.ext.evaluator;version="$<range;[==,=+)>",
+ org.apache.aries.blueprint.ext.evaluator;provide:=true,
org.apache.commons.jexl2,
org.slf4j,
org.osgi.service.blueprint
diff --git a/blueprint/blueprint-sample-annotation/pom.xml b/blueprint/blueprint-sample-annotation/pom.xml
index 5dd29a7..46b4be0 100644
--- a/blueprint/blueprint-sample-annotation/pom.xml
+++ b/blueprint/blueprint-sample-annotation/pom.xml
@@ -46,7 +46,7 @@
org.apache.aries.blueprint.sample.Activator
</aries.osgi.activator>
<aries.osgi.import>
- org.apache.aries.blueprint.annotation;version="$<range;[==,=+)>",
+ org.apache.aries.blueprint.annotation;provide:=true,
*
</aries.osgi.import>
<aries.osgi.private.pkg />
diff --git a/blueprint/blueprint-sample-fragment/pom.xml b/blueprint/blueprint-sample-fragment/pom.xml
index 4d453dd..46f0ebd 100644
--- a/blueprint/blueprint-sample-fragment/pom.xml
+++ b/blueprint/blueprint-sample-fragment/pom.xml
@@ -43,7 +43,7 @@
org.apache.aries.blueprint.fragment;-noimport:=true
</aries.osgi.export>
<aries.osgi.import>
- org.apache.aries.blueprint.annotation;version="$<range;[==,=+)>",
+ org.apache.aries.blueprint.annotation;provide:=true,
*
</aries.osgi.import>
<aries.osgi.private.pkg />
diff --git a/ejb/ejb-modeller/pom.xml b/ejb/ejb-modeller/pom.xml
index feeb7ec..08e638a 100644
--- a/ejb/ejb-modeller/pom.xml
+++ b/ejb/ejb-modeller/pom.xml
@@ -47,6 +47,8 @@
<aries.osgi.import.pkg>
org.apache.openejb.*;resolution:=optional,
org.apache.xbean.*;resolution:=optional,
+ org.apache.aries.application.modelling;provide:=true,
+ org.apache.aries.util.filesystem;provide:=true,
*
</aries.osgi.import.pkg>
</properties>
diff --git a/ejb/openejb-extender/pom.xml b/ejb/openejb-extender/pom.xml
index 0a6a375..a06e6f6 100644
--- a/ejb/openejb-extender/pom.xml
+++ b/ejb/openejb-extender/pom.xml
@@ -41,6 +41,10 @@
<aries.osgi.export />
<aries.osgi.import>
org.apache.aries.jpa.container.context;resolution:=optional,
+ org.apache.aries.proxy;provide:=true,
+ org.apache.openejb.config;provide:=true,
+ org.apache.openejb.persistence;provide:=true,
+ org.apache.openejb.util.proxy;provide:=true,
*
</aries.osgi.import>
<aries.osgi.private.pkg>
diff --git a/jpa/jpa-container-context/pom.xml b/jpa/jpa-container-context/pom.xml
index 1f63103..431fb2c 100644
--- a/jpa/jpa-container-context/pom.xml
+++ b/jpa/jpa-container-context/pom.xml
@@ -46,9 +46,9 @@
javax.persistence;version="[1.0.0,2.1.0)",
javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
- org.apache.aries.jpa.container.context;version="$<range;[==,=+)>",
- org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
- org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.jpa.container.context;provide:=true,
+ org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
+ org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.activator>
diff --git a/jpa/jpa-container/pom.xml b/jpa/jpa-container/pom.xml
index 908911c..bb74572 100644
--- a/jpa/jpa-container/pom.xml
+++ b/jpa/jpa-container/pom.xml
@@ -47,8 +47,9 @@
javax.persistence.criteria;version="[1.1.0,2.1.0)";resolution:=optional,
javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
!javax.transaction,
- org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
- org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
+ org.apache.aries.jpa.container*;provide:=true,
+ org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
+ org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
org.osgi.framework;version="[1.5,2)",
org.osgi.framework.hooks.weaving;resolution:=optional,
org.osgi.framework.wiring;resolution:=optional,
diff --git a/parent/default-parent/pom.xml b/parent/default-parent/pom.xml
index b1b33c4..cc58a9e 100644
--- a/parent/default-parent/pom.xml
+++ b/parent/default-parent/pom.xml
@@ -459,7 +459,8 @@
<Include-Resource>${aries.osgi.include.resource}</Include-Resource>
<_removeheaders>${aries.osgi.remove.headers}}</_removeheaders>
<_failok>${aries.osgi.failok}</_failok>
- <_versionpolicy>${aries.osgi.import.default.version}</_versionpolicy>
+ <_consumer-policy>${aries.osgi.import.default.version}</_consumer-policy>
+ <_provider-policy>$<range;[==,=+)></_provider-policy>
<Export-Service>${aries.osgi.export.service}</Export-Service>
<Import-Service>${aries.osgi.import.service}</Import-Service>
</instructions>
diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index e139712..a86a58e 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -53,7 +53,8 @@
a 4.2 framework (we only need 4.3 for weaving which is optional).
-->
<aries.osgi.import.pkg>
- org.apache.aries.proxy.weavinghook;resolution:=optional,
+ org.apache.aries.proxy.weavinghook;resolution:=optional;provide:=true,
+ org.apache.aries.proxy*;provide:=true,
org.objectweb.asm*;resolution:=optional,
org.osgi.framework;version="[1.5,2)",
org.osgi.framework.hooks.weaving;resolution:=optional,
diff --git a/samples/ariestrader/modules/ariestrader-beans/pom.xml b/samples/ariestrader/modules/ariestrader-beans/pom.xml
index d3f1abd..5b1f3b9 100644
--- a/samples/ariestrader/modules/ariestrader-beans/pom.xml
+++ b/samples/ariestrader/modules/ariestrader-beans/pom.xml
@@ -36,6 +36,10 @@
<aries.osgi.export>
org.apache.aries.samples.ariestrader.beans
</aries.osgi.export>
+ <aries.osgi.import>
+ org.apache.aries.samples.ariestrader.api.persistence;provide:=true,
+ *
+ </aries.osgi.import>
<aries.osgi.private.pkg />
</properties>
diff --git a/samples/ariestrader/modules/ariestrader-core/pom.xml b/samples/ariestrader/modules/ariestrader-core/pom.xml
index 0225bc4..ef6fd01 100644
--- a/samples/ariestrader/modules/ariestrader-core/pom.xml
+++ b/samples/ariestrader/modules/ariestrader-core/pom.xml
@@ -52,6 +52,7 @@
<instructions>
<Private-Package>org.apache.aries.samples.ariestrader.core.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.core.*</Export-Package>
+ <Import-Package>org.apache.aries.samples.ariestrader.api;provide:=true,*</Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/samples/ariestrader/modules/ariestrader-entities/pom.xml b/samples/ariestrader/modules/ariestrader-entities/pom.xml
index 8061571..3a9d498 100644
--- a/samples/ariestrader/modules/ariestrader-entities/pom.xml
+++ b/samples/ariestrader/modules/ariestrader-entities/pom.xml
@@ -123,6 +123,7 @@
org.apache.aries.samples.ariestrader.entities
</Export-Package>
<Import-Package>
+ org.apache.aries.samples.ariestrader.api.persistence;provide:=true,
org.apache.openjpa.enhance;version="[1.0.0,2.1.0)",
org.apache.openjpa.util;version="[1.0.0,2.1.0)",
javax.persistence;version="[1.0.0,2.1.0)",
diff --git a/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml b/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
index 876e17e..d37b500 100644
--- a/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
+++ b/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
@@ -57,6 +57,10 @@
<instructions>
<Private-Package>org.apache.aries.samples.ariestrader.persist.jdbc.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.persist.jdbc.*</Export-Package>
+ <Import-Package>
+ org.apache.aries.samples.ariestrader.api;provide:=true,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml b/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
index e34dcb5..5af6e66 100644
--- a/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
+++ b/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
@@ -63,6 +63,7 @@
<Private-Package>org.apache.aries.samples.ariestrader.persist.jpa.am.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.persist.jpa.am.*</Export-Package>
<Import-Package>
+ org.apache.aries.samples.ariestrader.api;provide:=true,
javax.persistence;version="[1.0.0,2.1.0)",
*
</Import-Package>
diff --git a/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml b/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
index 29a7ca1..258101b 100644
--- a/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
+++ b/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
@@ -63,6 +63,7 @@
<Private-Package>org.apache.aries.samples.ariestrader.persist.jpa.cm.*</Private-Package>
<Export-Package>!org.apache.aries.samples.ariestrader.persist.jpa.cm.*</Export-Package>
<Import-Package>
+ org.apache.aries.samples.ariestrader.api;provide:=true,
javax.persistence;version="[1.0.0,2.1.0)",
*
</Import-Package>
diff --git a/samples/blog/blog-biz/pom.xml b/samples/blog/blog-biz/pom.xml
index 48fa018..2d1f754 100644
--- a/samples/blog/blog-biz/pom.xml
+++ b/samples/blog/blog-biz/pom.xml
@@ -31,6 +31,10 @@
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ org.apache.aries.samples.blog.api;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.samples.blog.biz.*
</aries.osgi.private.pkg>
diff --git a/samples/blog/blog-comment-ejb/pom.xml b/samples/blog/blog-comment-ejb/pom.xml
index 6d6b6da..2dd1199 100644
--- a/samples/blog/blog-comment-ejb/pom.xml
+++ b/samples/blog/blog-comment-ejb/pom.xml
@@ -40,6 +40,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.blog.comment.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.comment.*</Export-Package>
+ <Import-Package>org.apache.aries.samples.blog.api.comment.persistence;provide:=true,*</Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/samples/blog/blog-persistence-jdbc/pom.xml b/samples/blog/blog-persistence-jdbc/pom.xml
index 9060c5d..e51b7eb 100644
--- a/samples/blog/blog-persistence-jdbc/pom.xml
+++ b/samples/blog/blog-persistence-jdbc/pom.xml
@@ -34,6 +34,10 @@
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ org.apache.aries.samples.blog.api.persistence;provide:=true,
+ *
+ </aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.samples.blog.persistence.jdbc.*
</aries.osgi.private.pkg>
diff --git a/samples/blog/blog-persistence-jpa/pom.xml b/samples/blog/blog-persistence-jpa/pom.xml
index f088ebb..249098c 100644
--- a/samples/blog/blog-persistence-jpa/pom.xml
+++ b/samples/blog/blog-persistence-jpa/pom.xml
@@ -40,6 +40,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.blog.persistence.jpa.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.persistence.jpa.*</Export-Package>
+ <Import-Package>org.apache.aries.samples.blog.api.persistence;provide:=true,*</Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/samples/blueprint/helloworld/helloworld-server/pom.xml b/samples/blueprint/helloworld/helloworld-server/pom.xml
index 80e69cb..786ab0f 100644
--- a/samples/blueprint/helloworld/helloworld-server/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-server/pom.xml
@@ -40,6 +40,10 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Import-Package>
+ org.apache.aries.samples.blueprint.helloworld.api;provide:=true,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/samples/blueprint/idverifier/idverifier-client/pom.xml b/samples/blueprint/idverifier/idverifier-client/pom.xml
index 0f0ba05..a142a18 100644
--- a/samples/blueprint/idverifier/idverifier-client/pom.xml
+++ b/samples/blueprint/idverifier/idverifier-client/pom.xml
@@ -60,6 +60,10 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=true;blueprint.timeout:= 60000</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.samples.blueprint.idverifier.client.IDVerifierClientActivator</Bundle-Activator>
+ <Import-Package>
+ org.apache.aries.samples.blueprint.idverifier.api;provide:=true,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/samples/blueprint/idverifier/idverifier-server/pom.xml b/samples/blueprint/idverifier/idverifier-server/pom.xml
index 51bbb16..421f6c2 100644
--- a/samples/blueprint/idverifier/idverifier-server/pom.xml
+++ b/samples/blueprint/idverifier/idverifier-server/pom.xml
@@ -37,6 +37,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Import-Package>
+ org.apache.aries.samples.blueprint.idverifier.api;provide:=true,
+ *
+ </Import-Package>
+
</instructions>
</configuration>
</plugin>
diff --git a/transaction/transaction-manager/pom.xml b/transaction/transaction-manager/pom.xml
index a1d48be..08beac7 100644
--- a/transaction/transaction-manager/pom.xml
+++ b/transaction/transaction-manager/pom.xml
@@ -40,6 +40,7 @@
</scm>
<properties>
<aries.osgi.export>
+ org.apache.geronimo.transaction.manager;version="2.2.1";provide:=true,
org.apache.geronimo.transaction*;version="2.2.1",
javax.transaction*;version="1.1.0"
</aries.osgi.export>
diff --git a/web/web-urlhandler/pom.xml b/web/web-urlhandler/pom.xml
index 0048477..7a7b481 100644
--- a/web/web-urlhandler/pom.xml
+++ b/web/web-urlhandler/pom.xml
@@ -41,7 +41,7 @@
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
- org.apache.aries.web.converter
+ org.apache.aries.web.converter;provide:=true
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
org.apache.aries.web.converter.impl,
