Repository: karaf Updated Branches: refs/heads/master be41010a3 -> 013416ea3
[KARAF-4787] Don't use the features-generate-descriptor inside our build Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3065ace3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3065ace3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3065ace3 Branch: refs/heads/master Commit: 3065ace3b7196c93293b07afbac6c15ceddba048 Parents: be41010 Author: Guillaume Nodet <[email protected]> Authored: Fri Oct 21 09:54:17 2016 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Fri Oct 21 09:54:17 2016 +0200 ---------------------------------------------------------------------- assemblies/features/enterprise/pom.xml | 26 +++++++++++------- assemblies/features/framework/pom.xml | 28 ++++--------------- assemblies/features/spring/pom.xml | 27 ++++++++++-------- assemblies/features/standard/pom.xml | 28 ++++++++++++------- assemblies/features/static/pom.xml | 28 ++++--------------- .../static/src/main/feature/feature.xml | 29 ++++++++++++++++++++ .../static/src/main/feature/features.xml | 29 -------------------- 7 files changed, 89 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/enterprise/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index 5b54c1b..6a8675f 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -188,23 +188,29 @@ </dependencies> <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/feature</directory> + <filtering>true</filtering> + <targetPath>${project.build.directory}/feature</targetPath> + </resource> + </resources> <plugins> <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <configuration> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>compile</id> - <phase>generate-resources</phase> <goals> - <goal>features-generate-descriptor</goal> + <goal>resources</goal> </goals> - <configuration> - <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature> - </configuration> </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <executions> <execution> <id>verify</id> <phase>process-resources</phase> http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/framework/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml index b4806a6..b577001 100644 --- a/assemblies/features/framework/pom.xml +++ b/assemblies/features/framework/pom.xml @@ -173,6 +173,11 @@ <build> <resources> <resource> + <directory>${project.basedir}/src/main/feature</directory> + <filtering>true</filtering> + <targetPath>${project.build.directory}/feature</targetPath> + </resource> + <resource> <directory>${project.basedir}/src/main/resources</directory> <filtering>false</filtering> <includes> @@ -254,31 +259,8 @@ <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>${project.version}</version> - <configuration> - <startLevel>30</startLevel> - <!--<checkDependencyChange>true</checkDependencyChange>--> - <!--<overwriteChangedDependencies>true</overwriteChangedDependencies>--> - <!--<failOnDependencyChange>false</failOnDependencyChange>--> - </configuration> <executions> <execution> - <id>compile</id> - <phase>compile</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <excludedArtifactIds> - <excludedArtifactId>slf4j-api</excludedArtifactId> - <excludedArtifactId>sshd-core</excludedArtifactId> - <excludedArtifactId>jline</excludedArtifactId> - <excludedArtifactId>core</excludedArtifactId> - <excludedArtifactId>org.apache.karaf.region.core</excludedArtifactId> - <excludedArtifactId>org.eclipse.equinox.region</excludedArtifactId> - </excludedArtifactIds> - </configuration> - </execution> - <execution> <id>package</id> <goals> <goal>kar</goal> http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/spring/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 3fff381..3ed9845 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -164,24 +164,29 @@ </dependencies> <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/feature</directory> + <filtering>true</filtering> + <targetPath>${project.build.directory}/feature</targetPath> + </resource> + </resources> <plugins> <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <configuration> - <startLevel>30</startLevel> - </configuration> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>compile</id> - <phase>generate-resources</phase> <goals> - <goal>features-generate-descriptor</goal> + <goal>resources</goal> </goals> - <configuration> - <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature> - </configuration> </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <executions> <execution> <id>verify</id> <phase>process-resources</phase> http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/standard/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 76c21ba..87f571d 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -395,8 +395,26 @@ </dependencies> <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/feature</directory> + <filtering>true</filtering> + <targetPath>${project.build.directory}/feature</targetPath> + </resource> + </resources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <configuration> @@ -404,16 +422,6 @@ </configuration> <executions> <execution> - <id>compile</id> - <phase>generate-resources</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature> - </configuration> - </execution> - <execution> <id>verify</id> <phase>process-resources</phase> <goals> http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/static/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/static/pom.xml b/assemblies/features/static/pom.xml index c6c917a..ab233a8 100644 --- a/assemblies/features/static/pom.xml +++ b/assemblies/features/static/pom.xml @@ -64,6 +64,11 @@ <build> <resources> <resource> + <directory>${project.basedir}/src/main/feature</directory> + <filtering>true</filtering> + <targetPath>${project.build.directory}/feature</targetPath> + </resource> + <resource> <directory>${project.basedir}/src/main/resources</directory> <filtering>false</filtering> <includes> @@ -140,31 +145,8 @@ <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>${project.version}</version> - <configuration> - <startLevel>30</startLevel> - <!--<checkDependencyChange>true</checkDependencyChange>--> - <!--<overwriteChangedDependencies>true</overwriteChangedDependencies>--> - <!--<failOnDependencyChange>false</failOnDependencyChange>--> - </configuration> <executions> <execution> - <id>compile</id> - <phase>compile</phase> - <goals> - <goal>features-generate-descriptor</goal> - </goals> - <configuration> - <excludedArtifactIds> - <excludedArtifactId>slf4j-api</excludedArtifactId> - <excludedArtifactId>sshd-core</excludedArtifactId> - <excludedArtifactId>jline</excludedArtifactId> - <excludedArtifactId>core</excludedArtifactId> - <excludedArtifactId>org.apache.karaf.region.core</excludedArtifactId> - <excludedArtifactId>org.eclipse.equinox.region</excludedArtifactId> - </excludedArtifactIds> - </configuration> - </execution> - <execution> <id>package</id> <goals> <goal>kar</goal> http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/static/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/static/src/main/feature/feature.xml b/assemblies/features/static/src/main/feature/feature.xml new file mode 100644 index 0000000..8f191a5 --- /dev/null +++ b/assemblies/features/static/src/main/feature/feature.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<features name="static-framework-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.1 http://karaf.apache.org/xmlns/features/v1.2.1";> + + <feature version="${project.version}" description="Karaf core feature" name="static-framework"> + <!-- logging --> + <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle> + <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle> + <!-- static config admin --> + <bundle start="true" start-level="10">mvn:org.apache.karaf.services/org.apache.karaf.services.staticcm/${project.version}</bundle> + </feature> + +</features> http://git-wip-us.apache.org/repos/asf/karaf/blob/3065ace3/assemblies/features/static/src/main/feature/features.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/static/src/main/feature/features.xml b/assemblies/features/static/src/main/feature/features.xml deleted file mode 100644 index 8f191a5..0000000 --- a/assemblies/features/static/src/main/feature/features.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<features name="static-framework-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.1 http://karaf.apache.org/xmlns/features/v1.2.1";> - - <feature version="${project.version}" description="Karaf core feature" name="static-framework"> - <!-- logging --> - <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle> - <bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${pax.logging.version}</bundle> - <!-- static config admin --> - <bundle start="true" start-level="10">mvn:org.apache.karaf.services/org.apache.karaf.services.staticcm/${project.version}</bundle> - </feature> - -</features>
