You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2015/03/04 16:56:11 UTC
[2/4] karaf git commit: [KARAF-3584] Generate metadata for activator
/ capabilities and requirements directly
[KARAF-3584] Generate metadata for activator / capabilities and requirements directly
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dfceded0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dfceded0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dfceded0
Branch: refs/heads/master
Commit: dfceded06cfa5c272a02d1fb7e919857254da073
Parents: 759d29c
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Mar 4 10:55:37 2015 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Mar 4 16:04:56 2015 +0100
----------------------------------------------------------------------
bundle/core/pom.xml | 9 ---------
config/pom.xml | 9 ---------
deployer/blueprint/pom.xml | 9 ---------
deployer/features/pom.xml | 9 ---------
deployer/kar/pom.xml | 9 ---------
deployer/spring/pom.xml | 9 ---------
deployer/wrap/pom.xml | 10 ----------
diagnostic/core/pom.xml | 6 ------
features/core/pom.xml | 3 ---
http/pom.xml | 9 ---------
instance/pom.xml | 9 ---------
jaas/modules/pom.xml | 3 ---
jdbc/pom.xml | 9 ---------
jndi/pom.xml | 9 ---------
kar/pom.xml | 3 ---
log/pom.xml | 9 ---------
management/server/pom.xml | 9 ---------
obr/pom.xml | 9 ---------
package/pom.xml | 9 ---------
pom.xml | 3 +--
profile/pom.xml | 9 ---------
scheduler/pom.xml | 11 +++--------
shell/ssh/pom.xml | 7 -------
system/pom.xml | 9 ---------
.../tooling/tracker/GenerateServiceMetadata.java | 16 ++++++++++++++--
web/pom.xml | 9 ---------
wrapper/pom.xml | 9 ---------
27 files changed, 18 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/bundle/core/pom.xml
----------------------------------------------------------------------
diff --git a/bundle/core/pom.xml b/bundle/core/pom.xml
index 4a41e0d..40b996e 100644
--- a/bundle/core/pom.xml
+++ b/bundle/core/pom.xml
@@ -138,18 +138,9 @@
org.apache.felix.utils.version,
org.apache.felix.utils.manifest
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
<Embed-Dependency>
org.apache.karaf.jaas.modules;inline="org/apache/karaf/jaas/modules/JaasHelper*.class"
</Embed-Dependency>
- <Bundle-Activator>
- org.apache.karaf.bundle.core.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>org.apache.karaf.bundle.command.*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/config/pom.xml
----------------------------------------------------------------------
diff --git a/config/pom.xml b/config/pom.xml
index c12a911..96c16c3 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -114,15 +114,6 @@
org.apache.karaf.util.tracker,
org.apache.felix.utils.properties
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.config.core.impl.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>org.apache.karaf.config.command.*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/deployer/blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/deployer/blueprint/pom.xml b/deployer/blueprint/pom.xml
index 3fa0fea..d1605de 100644
--- a/deployer/blueprint/pom.xml
+++ b/deployer/blueprint/pom.xml
@@ -99,15 +99,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.deployer.blueprint.osgi.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/deployer/features/pom.xml
----------------------------------------------------------------------
diff --git a/deployer/features/pom.xml b/deployer/features/pom.xml
index 9a1bbbd..90f237d 100644
--- a/deployer/features/pom.xml
+++ b/deployer/features/pom.xml
@@ -107,15 +107,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.deployer.features.osgi.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/deployer/kar/pom.xml
----------------------------------------------------------------------
diff --git a/deployer/kar/pom.xml b/deployer/kar/pom.xml
index 45228a6..3abe7cc 100644
--- a/deployer/kar/pom.xml
+++ b/deployer/kar/pom.xml
@@ -115,15 +115,6 @@
org.apache.karaf.deployer.kar.osgi,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.deployer.kar.osgi.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/deployer/spring/pom.xml
----------------------------------------------------------------------
diff --git a/deployer/spring/pom.xml b/deployer/spring/pom.xml
index 28f4f3c..b8ee2f4 100644
--- a/deployer/spring/pom.xml
+++ b/deployer/spring/pom.xml
@@ -103,15 +103,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.deployer.spring.osgi.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/deployer/wrap/pom.xml
----------------------------------------------------------------------
diff --git a/deployer/wrap/pom.xml b/deployer/wrap/pom.xml
index c02bc2d..a8c9a2e 100644
--- a/deployer/wrap/pom.xml
+++ b/deployer/wrap/pom.xml
@@ -88,16 +88,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.deployer.wrap.osgi.Activator
- </Bundle-Activator>
- <_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/diagnostic/core/pom.xml
----------------------------------------------------------------------
diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
index 2012ee5..380e277 100644
--- a/diagnostic/core/pom.xml
+++ b/diagnostic/core/pom.xml
@@ -115,12 +115,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
<Bundle-Activator>
org.apache.karaf.diagnostic.internal.Activator
</Bundle-Activator>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/features/core/pom.xml
----------------------------------------------------------------------
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 228107a..fd6f5cc 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -155,9 +155,6 @@
<Embed-Dependency>
org.apache.karaf.util;inline="org/apache/karaf/util/XmlUtils*.class"
</Embed-Dependency>
- <Bundle-Activator>
- org.apache.karaf.features.internal.osgi.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/http/pom.xml
----------------------------------------------------------------------
diff --git a/http/pom.xml b/http/pom.xml
index df78746..596db4d 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -104,15 +104,6 @@
org.apache.felix.utils.version,
org.apache.felix.utils.manifest,
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.http.core.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/instance/pom.xml
----------------------------------------------------------------------
diff --git a/instance/pom.xml b/instance/pom.xml
index 99010cc..9ffe1b0 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -187,12 +187,6 @@
!org.apache.karaf.instance.core.internal,
*
</Import-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
<Private-Package>
org.apache.karaf.jpm,
org.apache.karaf.jpm.impl,
@@ -206,9 +200,6 @@
org.apache.karaf.util.locks,
org.apache.karaf.util.tracker
</Private-Package>
- <Bundle-Activator>
- org.apache.karaf.instance.core.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>org.apache.karaf.instance.command.*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/jaas/modules/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index 2d5c181..81530cd 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -163,9 +163,6 @@
org.apache.http*,
org.apache.commons.codec*
</Private-Package>
- <Bundle-Activator>
- org.apache.karaf.jaas.modules.impl.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index d56e910..5ab594b 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -101,15 +101,6 @@
org.apache.karaf.util,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.jdbc.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/jndi/pom.xml
----------------------------------------------------------------------
diff --git a/jndi/pom.xml b/jndi/pom.xml
index d7b8df6..a6d517e 100644
--- a/jndi/pom.xml
+++ b/jndi/pom.xml
@@ -99,16 +99,7 @@
org.apache.karaf.jndi.internal.osgi,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
<Karaf-Commands>*</Karaf-Commands>
- <Bundle-Activator>
- org.apache.karaf.jndi.internal.osgi.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index bf88696..7409c05 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -116,9 +116,6 @@
org.apache.karaf.util.tracker,
org.apache.felix.utils.properties
</Private-Package>
- <Bundle-Activator>
- org.apache.karaf.kar.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>org.apache.karaf.kar.command.*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/log/pom.xml
----------------------------------------------------------------------
diff --git a/log/pom.xml b/log/pom.xml
index 4b3ba9c..5daab0b 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -111,15 +111,6 @@
org.apache.karaf.log.core.internal.osgi,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.log.core.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>
org.apache.karaf.log.command*
</Karaf-Commands>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/management/server/pom.xml
----------------------------------------------------------------------
diff --git a/management/server/pom.xml b/management/server/pom.xml
index 670b024..f698ffc 100644
--- a/management/server/pom.xml
+++ b/management/server/pom.xml
@@ -122,15 +122,6 @@
org.apache.karaf.util.jaas,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.management.internal.Activator
- </Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/obr/pom.xml
----------------------------------------------------------------------
diff --git a/obr/pom.xml b/obr/pom.xml
index 32ab70b..dd2362d 100644
--- a/obr/pom.xml
+++ b/obr/pom.xml
@@ -97,15 +97,6 @@
org.apache.karaf.obr.core.internal.osgi,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.obr.core.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index eadf1af..fba9279 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -120,15 +120,6 @@
org.apache.felix.utils.version,
org.apache.felix.utils.manifest
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.packages.core.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>
org.apache.karaf.packages.command
</Karaf-Commands>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c036a18..b2dda1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2167,9 +2167,8 @@
<nsh_interface>org.apache.aries.blueprint.NamespaceHandler</nsh_interface>
<nsh_namespace>osgi.service.blueprint.namespace</nsh_namespace>
<_removeheaders>Private-Package,Include-Resource,Embed-Dependency,Created-By,Bnd-LastModified,Built-By,Tool</_removeheaders>
+ <_versionpolicy>${bnd.version.policy}</_versionpolicy>
<Bundle-DocURL>http://karaf.apache.org/</Bundle-DocURL>
- <Provide-Capability>${capabilities}</Provide-Capability>
- <Require-Capability>${requirements}</Require-Capability>
</instructions>
</configuration>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/profile/pom.xml
----------------------------------------------------------------------
diff --git a/profile/pom.xml b/profile/pom.xml
index b2fab7d..1bde1b7 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -188,15 +188,6 @@
org.apache.felix.utils.version,
org.apache.felix.utils.properties,
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.profile.impl.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>
org.apache.karaf.profile.command.*
</Karaf-Commands>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/scheduler/pom.xml b/scheduler/pom.xml
index 9d5287f..66ffa69 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -60,8 +60,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Activator>org.apache.karaf.scheduler.core.Activator</Bundle-Activator>
- <Karaf-Commands>org.apache.karaf.scheduler.command</Karaf-Commands>
<Export-Package>
org.apache.karaf.scheduler;version=${project.version};-noimport:=true
</Export-Package>
@@ -85,12 +83,9 @@
org.quartz.simpl.*,
org.quartz.utils.*,
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
+ <Karaf-Commands>
+ org.apache.karaf.scheduler.command
+ </Karaf-Commands>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/shell/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml
index d297159..7f4d60b 100644
--- a/shell/ssh/pom.xml
+++ b/shell/ssh/pom.xml
@@ -119,13 +119,6 @@
org.apache.karaf.util.jaas,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>org.apache.karaf.shell.ssh.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/system/pom.xml
----------------------------------------------------------------------
diff --git a/system/pom.xml b/system/pom.xml
index 8729359..333899d 100644
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -105,15 +105,6 @@
org.apache.karaf.util.tracker,
org.apache.felix.utils.properties
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.system.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
index 5fb78de..10aafc8 100644
--- a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
+++ b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
@@ -40,6 +40,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.xbean.finder.ClassFinder;
+import org.osgi.framework.BundleActivator;
/**
* Generates service requirement and capabilities for activators
@@ -53,10 +54,13 @@ public class GenerateServiceMetadata extends AbstractMojo {
@Parameter(defaultValue = "${project}")
protected MavenProject project;
- @Parameter(defaultValue="requirements")
+ @Parameter(defaultValue="BNDExtension-Bundle-Activator")
+ protected String activatorProperty;
+
+ @Parameter(defaultValue="BNDExtension-Require-Capability")
protected String requirementsProperty;
- @Parameter(defaultValue="capabilities")
+ @Parameter(defaultValue="BNDExtension-Provide-Capability")
protected String capabilitiesProperty;
@Parameter(defaultValue = "${project.build.directory}/generated/karaf-tracker")
@@ -79,6 +83,7 @@ public class GenerateServiceMetadata extends AbstractMojo {
ClassFinder finder = createFinder(classLoader);
List<Class<?>> classes = finder.findAnnotatedClasses(Services.class);
+ List<Class> activators = new ArrayList<>();
for (Class<?> clazz : classes) {
URL classUrl = clazz.getClassLoader().getResource(clazz.getName().replace('.', '/') + ".class");
if (classUrl == null || !classUrl.getPath().startsWith(project.getBuild().getOutputDirectory())) {
@@ -86,6 +91,10 @@ public class GenerateServiceMetadata extends AbstractMojo {
continue;
}
+ if (BundleActivator.class.isAssignableFrom(clazz)) {
+ activators.add(clazz);
+ }
+
Properties props = new Properties();
Services services = clazz.getAnnotation(Services.class);
if (services != null) {
@@ -137,6 +146,9 @@ public class GenerateServiceMetadata extends AbstractMojo {
project.getProperties().setProperty(requirementsProperty, requirements.toString());
project.getProperties().setProperty(capabilitiesProperty, capabilities.toString());
+ if (activators.size() == 1) {
+ project.getProperties().setProperty(activatorProperty, activators.get(0).getName());
+ }
} catch (Exception e) {
throw new MojoExecutionException("Error building commands help", e);
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/web/pom.xml
----------------------------------------------------------------------
diff --git a/web/pom.xml b/web/pom.xml
index a2754f3..b9fb6be 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -105,15 +105,6 @@
org.apache.karaf.web.management.internal,
org.apache.karaf.util.tracker
</Private-Package>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
- <Bundle-Activator>
- org.apache.karaf.web.internal.osgi.Activator
- </Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfceded0/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/wrapper/pom.xml b/wrapper/pom.xml
index 9c469f2..ae427ce 100644
--- a/wrapper/pom.xml
+++ b/wrapper/pom.xml
@@ -124,15 +124,6 @@
!org.tanukisoftware.wrapper*,
*
</Import-Package>
- <Bundle-Activator>
- org.apache.karaf.wrapper.internal.osgi.Activator
- </Bundle-Activator>
- <Provide-Capability>
- ${capabilities}
- </Provide-Capability>
- <Require-Capability>
- ${requirements}
- </Require-Capability>
<Karaf-Commands>
org.apache.karaf.wrapper.commands
</Karaf-Commands>