This is an automated email from the ASF dual-hosted git repository.
richard pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/1.0.0 by this push:
new 680da6d Merge pull request #155 from nakomis/change-packaging-to-pom
680da6d is described below
commit 680da6d1f94195fe01c0dd9ea915164ebe868e5d
Author: Richard Downer <[email protected]>
AuthorDate: Thu Jan 30 14:23:06 2020 +0000
Merge pull request #155 from nakomis/change-packaging-to-pom
Changes packing from feature to pom
---
karaf/features/pom.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 49 insertions(+), 5 deletions(-)
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index e420d78..5b9d57c 100644
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -31,7 +31,7 @@
<artifactId>brooklyn-dist-features</artifactId>
<name>Brooklyn Dist Karaf Features</name>
<description>Defines Karaf features for Karaf runtime</description>
- <packaging>feature</packaging>
+ <packaging>pom</packaging>
<dependencies>
<dependency>
@@ -45,12 +45,56 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/feature</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.plugin.version}</version>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/feature.xml</file>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
