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-server.git
The following commit(s) were added to refs/heads/1.0.0 by this push: new 029fa6d Merge pull request #1084 from nakomis/change-packaging-to-pom 029fa6d is described below commit 029fa6d1723550b500483aac5144749c28b6d6b7 Author: Richard Downer <rich...@apache.org> AuthorDate: Thu Jan 30 14:25:16 2020 +0000 Merge pull request #1084 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 c333ac4..27e44ca 100755 --- a/karaf/features/pom.xml +++ b/karaf/features/pom.xml @@ -29,15 +29,59 @@ <artifactId>brooklyn-features</artifactId> <name>Brooklyn Karaf Features</name> - <packaging>feature</packaging> + <packaging>pom</packaging> <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> <pluginManagement>