Skip to content
Permalink
Browse files
This closes #171
  • Loading branch information
ahgittin committed Mar 31, 2021
2 parents 7748360 + e75ce56 commit 02fc68f75629b09de9630810fd2394875af58d1f
Showing 19 changed files with 128 additions and 246 deletions.
@@ -34,21 +34,14 @@
</parent>

<dependencies>

<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${karaf.version}</version>
<type>kar</type>
</dependency>

<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
<classifier>features</classifier>
<version>${karaf.version}</version>
<type>xml</type>
</dependency>

<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-features</artifactId>
@@ -84,27 +77,17 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-features</artifactId>
<version>${project.version}</version>
<type>kar</type>
<scope>runtime</scope>
</dependency>

</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -115,12 +98,14 @@
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<framework>framework</framework>
<installedFeatures>
<feature>wrapper</feature> <!-- https://karaf.apache.org/manual/latest/wrapper -->
</installedFeatures>
@@ -132,50 +117,18 @@
<!-- Goes into org.apache.karaf.features.cfg. Can use brackets to guide loading order (same as prerequisite). -->
<bootFeature>brooklyn-boot</bootFeature>
</bootFeatures>
<installAllFeaturesByDefault>false</installAllFeaturesByDefault>
</configuration>
</plugin>

<!-- Exclude META-INF from dist; Disables https://github.com/apache/maven-pom/blob/43dd8d34421ae2dfda40b1adde404b52f3800735/asf/pom.xml#L285-L301 -->
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-dist-config</artifactId>
<version>${project.version}</version>
<classifier>classrename</classifier>
<type>cfg</type>
<outputDirectory>${project.build.directory}/assembly/etc</outputDirectory>
<destFileName>${project.groupId}.classrename.cfg</destFileName>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-dist-config</artifactId>
<version>${project.version}</version>
<classifier>osgilauncher</classifier>
<type>cfg</type>
<outputDirectory>${project.build.directory}/assembly/etc</outputDirectory>
<destFileName>${project.groupId}.osgilauncher.cfg</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

This file was deleted.

@@ -31,7 +31,7 @@
<artifactId>brooklyn-dist-features</artifactId>
<name>Brooklyn Dist Karaf Features</name>
<description>Defines Karaf features for Karaf runtime</description>
<packaging>pom</packaging>
<packaging>kar</packaging>

<dependencies>
<dependency>
@@ -57,58 +57,83 @@
</dependency>
</dependencies>


<build>
<resources>
<resource>
<directory>src/main/feature</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>${*}</delimiter>
</delimiters>
<aggregateFeatures>true</aggregateFeatures>
<includeTransitiveDependency>false</includeTransitiveDependency>
<startLevel>50</startLevel>
<resolver>(obr)</resolver>
</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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-dist-config</artifactId>
<version>${project.version}</version>
<classifier>classrename</classifier>
<type>cfg</type>
<outputDirectory>${project.build.directory}/classes/resources/etc</outputDirectory>
<destFileName>${project.groupId}.classrename.cfg</destFileName>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-dist-config</artifactId>
<version>${project.version}</version>
<classifier>osgilauncher</classifier>
<type>cfg</type>
<outputDirectory>${project.build.directory}/classes/resources/etc</outputDirectory>
<destFileName>${project.groupId}.osgilauncher.cfg</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

0 comments on commit 02fc68f

Please sign in to comment.