Repository: karaf Updated Branches: refs/heads/master f56fd1bdf -> e7ca1e209
[KARAF-5417] Trim down distributions Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e7ca1e20 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e7ca1e20 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e7ca1e20 Branch: refs/heads/master Commit: e7ca1e209f02d844a481bb5d95a351aba47c8c6c Parents: 3f1f44b Author: Guillaume Nodet <[email protected]> Authored: Wed Oct 11 19:17:22 2017 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu Oct 12 10:47:53 2017 +0200 ---------------------------------------------------------------------- assemblies/apache-karaf-minimal/pom.xml | 30 ++++++++++++-------- assemblies/apache-karaf/pom.xml | 20 ++----------- .../java/org/apache/karaf/itests/JmsTest.java | 2 +- .../itests/features/StandardFeaturesTest.java | 2 -- .../apache/karaf/itests/features/XATest.java | 1 + .../resources/META-INF/plexus/components.xml | 2 ++ 6 files changed, 24 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/assemblies/apache-karaf-minimal/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml index 7133a10..4a853f7 100644 --- a/assemblies/apache-karaf-minimal/pom.xml +++ b/assemblies/apache-karaf-minimal/pom.xml @@ -118,25 +118,14 @@ </execution> </executions> <configuration> - <installedFeatures> - <feature>wrapper</feature> - </installedFeatures> <bootFeatures> <feature>jaas</feature> <feature>shell</feature> <feature>feature</feature> <feature>ssh</feature> - <feature>management</feature> <feature>bundle</feature> <feature>config</feature> - <feature>deployer</feature> - <feature>diagnostic</feature> - <feature>instance</feature> - <feature>kar</feature> <feature>log</feature> - <feature>package</feature> - <feature>service</feature> - <feature>system</feature> </bootFeatures> <pidsToExtract> !jmx.acl.*, @@ -146,7 +135,24 @@ <javase>1.8</javase> </configuration> </plugin> - + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>fix-distro</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <delete dir="${project.build.directory}/assembly/system/org/eclipse" /> + <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback" /> + </target> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index ca81c67..d90d55a 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -164,15 +164,15 @@ <configuration> <installedFeatures> <feature>wrapper</feature> + <feature>aries-blueprint</feature> + <feature>shell-compat</feature> </installedFeatures> <startupFeatures> <feature>eventadmin</feature> </startupFeatures> <bootFeatures> <feature>wrap</feature> - <feature>aries-blueprint</feature> <feature>shell</feature> - <feature>shell-compat</feature> <feature>feature</feature> <feature>jaas</feature> <feature>ssh</feature> @@ -190,22 +190,6 @@ <feature>system</feature> </bootFeatures> <libraries> - <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library> - <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library> - <library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library> - - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library> - <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library> - - <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library> - <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library> </libraries> <javase>1.8</javase> </configuration> http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/itests/src/test/java/org/apache/karaf/itests/JmsTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java index 29da7b1..977b087 100644 --- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java @@ -60,7 +60,7 @@ public class JmsTest extends KarafTestSupport { return new Option[] // { composite(super.config()), // - features(activeMqUrl, "jms", "activemq-broker-noweb") + features(activeMqUrl, "jms", "activemq-broker-noweb", "shell-compat") }; } http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java index 4c43178..ef66667 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java @@ -32,9 +32,7 @@ public class StandardFeaturesTest extends KarafTestSupport { public void checkInstalledFeaturesBoot() throws Exception { System.out.println("===>checkInstalledFeaturesBoot"); assertFeatureInstalled("wrap"); - assertFeatureInstalled("aries-blueprint"); assertFeatureInstalled("shell"); - assertFeatureInstalled("shell-compat"); assertFeatureInstalled("jaas"); assertFeatureInstalled("ssh"); assertFeatureInstalled("management"); http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/itests/src/test/java/org/apache/karaf/itests/features/XATest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/XATest.java b/itests/src/test/java/org/apache/karaf/itests/features/XATest.java index d005c1d..5ce83bd 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/XATest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/XATest.java @@ -81,6 +81,7 @@ public class XATest extends KarafTestSupport { "pax-jdbc-derby", "pax-jdbc-pool-transx", "jdbc", + "shell-compat", "camel-blueprint", "camel-spring", "camel-sql", http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml index c86b142..2891bb8 100644 --- a/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml +++ b/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -121,6 +121,8 @@ </process-resources> <compile> </compile> + <prepare-package> + </prepare-package> <package> org.apache.karaf.tooling:karaf-maven-plugin:archive </package>
