[brooklyn-server] branch master updated: Changes packing from feature to pom

[ri...@apache.org]

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-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c57581  Changes packing from feature to pom
     new 5c76c2b  Merge pull request #1084 from nakomis/change-packaging-to-pom
9c57581 is described below

commit 9c57581fe0d10f35d40df5a5168a47dc6bc93b86
Author: Martin Harris <ma...@cloudsoftcorp.com>
AuthorDate: Thu Jan 30 12:50:12 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
---
 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 e072a4f..3f13973 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>