This is an automated email from the ASF dual-hosted git repository. richard pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push: new 945d5ca Changes packing from feature to pom new fd99b2a Merge pull request #171 from nakomis/change-packaging-to-pom 945d5ca is described below commit 945d5caf1eced59269198a907c0f484e0d355f59 Author: Martin Harris <martin.har...@cloudsoftcorp.com> AuthorDate: Thu Jan 30 12:51:33 2020 +0000 Changes packing from feature to pom This ensures that the GPG signatures for the feature files are uploaded to the Nexus repository when creating a release --- features/pom.xml | 54 +++++++++++++++++++++++++++++++++----- modularity-server/features/pom.xml | 53 ++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 13 deletions(-) diff --git a/features/pom.xml b/features/pom.xml index 552f90e..47f60cd 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-features</artifactId> <name>Brooklyn UI :: Features</name> - <packaging>feature</packaging> + <packaging>pom</packaging> <dependencies> <dependency> @@ -59,16 +59,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> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> <configuration> - <startLevel>100</startLevel> - <aggregateFeatures>true</aggregateFeatures> - <resolver>(obr)</resolver> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> </configuration> - <!-- TODO would be nice to verify this --> + <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> diff --git a/modularity-server/features/pom.xml b/modularity-server/features/pom.xml index 34f4580..245c708 100644 --- a/modularity-server/features/pom.xml +++ b/modularity-server/features/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-modularity-features</artifactId> <name>Brooklyn UI :: Modularity Server :: Features</name> - <packaging>feature</packaging> + <packaging>pom</packaging> <dependencies> <dependency> @@ -59,15 +59,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> - <startLevel>100</startLevel> + <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> <plugin> <groupId>org.codehaus.mojo</groupId>