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 2014/11/27 12:55:38 UTC
[3/3] karaf git commit: [KARAF-3387] Validate features using the new
verify-features goal
[KARAF-3387] Validate features using the new verify-features goal
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c5ca124e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c5ca124e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c5ca124e
Branch: refs/heads/master
Commit: c5ca124ebba656286a173cb6c5fe3b960c6695bd
Parents: 506753e
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Nov 27 11:50:18 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Nov 27 12:08:28 2014 +0100
----------------------------------------------------------------------
assemblies/apache-karaf-minimal/pom.xml | 1 +
assemblies/apache-karaf/pom.xml | 1 +
assemblies/features/enterprise/pom.xml | 29 ++++++++++++++++-
.../enterprise/src/main/feature/feature.xml | 11 ++++++-
assemblies/features/spring/pom.xml | 28 +++++++++++++++-
.../spring/src/main/feature/feature.xml | 13 ++++++--
assemblies/features/standard/pom.xml | 34 +++++++++++++++++++-
.../standard/src/main/feature/feature.xml | 31 +++++++++++++++---
instance/pom.xml | 1 +
kar/pom.xml | 1 +
service/guard/pom.xml | 5 ++-
wrapper/pom.xml | 1 +
12 files changed, 144 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/apache-karaf-minimal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml
index 385d3bd..a05bcf9 100644
--- a/assemblies/apache-karaf-minimal/pom.xml
+++ b/assemblies/apache-karaf-minimal/pom.xml
@@ -117,6 +117,7 @@
<bootFeatures>
<feature>jaas</feature>
<feature>shell</feature>
+ <feature>feature</feature>
<feature>ssh</feature>
<feature>management</feature>
<feature>bundle</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index 6b721ed..c084744 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -164,6 +164,7 @@
<feature>aries-blueprint</feature>
<feature>shell</feature>
<feature>shell-compat</feature>
+ <feature>feature</feature>
<feature>jaas</feature>
<feature>ssh</feature>
<feature>management</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/features/enterprise/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml
index b081bc2..860a5d0 100644
--- a/assemblies/features/enterprise/pom.xml
+++ b/assemblies/features/enterprise/pom.xml
@@ -38,6 +38,15 @@
</properties>
<dependencies>
+
+ <!-- Framework distribution -->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+
<!-- transaction deps -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -190,7 +199,7 @@
<executions>
<execution>
<id>compile</id>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>features-generate-descriptor</goal>
</goals>
@@ -198,6 +207,24 @@
<addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
</configuration>
</execution>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify-features</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${project.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.7</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 43f4269..845b51f 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -21,6 +21,7 @@
<!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
+ <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
<feature name="transaction" description="OSGi Transaction Manager" version="1.0.0">
<details>JTA implementation provided by Apache Aries Transaction 1.0.0</details>
@@ -33,6 +34,7 @@
aries.transaction.howl.bufferSizeKBytes = 4
</config>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.0</bundle>
<conditional>
<condition>aries-blueprint</condition>
@@ -51,6 +53,7 @@
aries.transaction.howl.bufferSizeKBytes = 4
</config>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
<conditional>
<condition>aries-blueprint</condition>
@@ -69,6 +72,7 @@
aries.transaction.howl.bufferSizeKBytes = 4
</config>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.1</bundle>
<conditional>
<condition>aries-blueprint</condition>
@@ -95,6 +99,7 @@
<details>JPA 2.0 implementation provided by Apache Aries JPA ${aries.jpa.version}. NB: this feature doesn"t provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.container.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle>
@@ -272,6 +277,7 @@
<feature name="weld" description="JBoss Weld CDI container support" version="${weld.version}">
<details>Add support of JBoss Weld CDI container.</details>
<feature>pax-cdi-weld</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
<bundle>mvn:org.jboss.weld/weld-osgi-bundle/${weld.version}</bundle>
</feature>
@@ -300,7 +306,10 @@
<bundle dependency="true" start-level="30">mvn:org.apache.karaf.services/org.apache.karaf.services.coordinator/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.api/${aries.subsystem.api.version}</bundle>
<bundle start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem.core/${aries.subsystem.core.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.subsystem/org.apache.karaf.subsystem.core/${project.version}</bundle>
+ <conditional>
+ <condition>shell</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.subsystem/org.apache.karaf.subsystem.core/${project.version}</bundle>
+ </conditional>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/features/spring/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml
index 2112070..d6adfe0 100644
--- a/assemblies/features/spring/pom.xml
+++ b/assemblies/features/spring/pom.xml
@@ -40,6 +40,14 @@
<dependencies>
+ <!-- Framework distribution -->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
@@ -318,7 +326,7 @@
<executions>
<execution>
<id>compile</id>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>features-generate-descriptor</goal>
</goals>
@@ -326,6 +334,24 @@
<addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
</configuration>
</execution>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify-features</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${project.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.7</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 7a3b461..9fa9038 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -20,6 +20,9 @@
<!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
+ <repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>
+ <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
+
<!-- Spring DM support -->
<feature name="spring-dm" description="Spring DM support" version="${spring.osgi.version}">
<feature version="[2.5.6,4)">spring</feature>
@@ -28,8 +31,14 @@
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.springstate/${project.version}</bundle>
+ <conditional>
+ <condition>deployer</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+ </conditional>
+ <conditional>
+ <condition>bundle</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.springstate/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="spring-dm-web" description="Spring DM Web support" version="${spring.osgi.version}">
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 150aaa6..ef3e1cb 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -39,6 +39,14 @@
</properties>
<dependencies>
+ <!-- Framework distribution -->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+
<!-- standard deps -->
<dependency>
<groupId>org.apache.karaf.shell</groupId>
@@ -51,6 +59,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.command</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.instance</groupId>
<artifactId>org.apache.karaf.instance.core</artifactId>
<scope>provided</scope>
@@ -421,7 +434,7 @@
<executions>
<execution>
<id>compile</id>
- <phase>compile</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>features-generate-descriptor</goal>
</goals>
@@ -429,6 +442,25 @@
<addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
</configuration>
</execution>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify-features</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${project.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.7</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <ignoreMissingConditions>true</ignoreMissingConditions>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 7b2b618..bdb2e5a 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -68,12 +68,19 @@
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.jexl.evaluator/${aries.blueprint.jexl.evaluator.version}</bundle>
</feature>
+ <feature name="feature" description="Features Support" version="${project.version}">
+ <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
+ <conditional>
+ <condition>shell</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
+ </conditional>
+ </feature>
+
<feature name="shell" description="Karaf Shell" version="${project.version}">
<bundle dependency="true" start-level="30">mvn:jline/jline/${jline.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.jledit/core/${jledit.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.commands/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
</feature>
<feature name="shell-compat" description="Karaf Shell Compatibility" version="${project.version}">
@@ -138,11 +145,14 @@
<feature name="jaas" description="Provide JAAS support" version="${project.version}">
<bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/${project.version}</bundle>
<bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/${project.version}</bundle>
- <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
<bundle start-level="30" start="true">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.config/${project.version}</bundle>
</conditional>
+ <conditional>
+ <condition>shell</condition>
+ <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="log" description="Provide Log support" version="${project.version}">
@@ -193,8 +203,6 @@
<feature>aries-blueprint</feature>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.http/${project.version}</bundle>
<conditional>
<condition>eventadmin</condition>
@@ -208,6 +216,14 @@
<condition>instance</condition>
<bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.instance/${project.version}</bundle>
</conditional>
+ <conditional>
+ <condition>shell</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
+ </conditional>
+ <conditional>
+ <condition>feature</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="ssh" description="Provide a SSHd server on Karaf" version="${project.version}">
@@ -258,6 +274,7 @@
</feature>
<feature name="jasypt-encryption" description="Advanced encryption support for Karaf security" version="${project.version}">
+ <feature>jaas</feature>
<bundle dependency="true" start-level="30">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
@@ -275,7 +292,6 @@
<feature name="scr" description="Declarative Service support" version="${project.version}">
<bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle>
<conditional>
<condition>management</condition>
<bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.management/${project.version}</bundle>
@@ -284,6 +300,10 @@
<condition>webconsole</condition>
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
</conditional>
+ <conditional>
+ <condition>shell</condition>
+ <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle>
+ </conditional>
<capability>
osgi.service;effective:=active;objectClass=org.apache.felix.scr.ScrService,
osgi.extender;osgi.extender="osgi.component";uses:="org.osgi.service.component";version:Version="1.2.1"
@@ -293,6 +313,7 @@
<feature name="blueprint-web" description="Provides an OSGI-aware Servlet ContextListener for bootstrapping
blueprint inside web-bundle containers" version="${project.version}">
<feature>war</feature>
+ <feature>aries-blueprint</feature>
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.webosgi/${aries.blueprint.web.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/instance/pom.xml
----------------------------------------------------------------------
diff --git a/instance/pom.xml b/instance/pom.xml
index 55948fa..e3a5cab 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -67,6 +67,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index b0182aa..bf88696 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -63,6 +63,7 @@
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.command</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/service/guard/pom.xml
----------------------------------------------------------------------
diff --git a/service/guard/pom.xml b/service/guard/pom.xml
index b49d0f2..86e8a63 100644
--- a/service/guard/pom.xml
+++ b/service/guard/pom.xml
@@ -110,7 +110,10 @@
<instructions>
<Bundle-Activator>org.apache.karaf.service.guard.impl.Activator</Bundle-Activator>
<Export-Package>org.apache.karaf.service.guard.tools</Export-Package>
- <Private-Package>org.apache.karaf.service.guard.impl</Private-Package>
+ <Private-Package>
+ org.apache.karaf.service.guard.impl,
+ org.apache.karaf.util.jaas
+ </Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/c5ca124e/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/wrapper/pom.xml b/wrapper/pom.xml
index 823621b..3744ca0 100644
--- a/wrapper/pom.xml
+++ b/wrapper/pom.xml
@@ -53,6 +53,7 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>tanukisoft</groupId>