Skip to content

Commit

Permalink
Make the FileInstall BAR plugin easier to build
Browse files Browse the repository at this point in the history 
Applied PR #140 from Tim Ward <[email protected]>

See: #140

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833314 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Neil Bartlett committed Jun 11, 2018
1 parent 0f47585 commit 018aeba
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 51 deletions.
59 changes: 18 additions & 41 deletions fileinstall-plugins/installer.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
<artifactId>pax-exam-container-forked</artifactId>
<version>4.9.2</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -132,46 +132,6 @@

<build>
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
<version>4.9.2</version>
<configuration>
<configClass>org.apache.felix.fileinstall.plugins.installer.test.InstallerIntegrationTest</configClass>
</configuration>
<executions>
<execution>
<goals>
<goal>start-container</goal>
<goal>stop-container</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.12</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
</executions>
<configuration>
<forkMode>always</forkMode>
<parallel>none</parallel>
<threadCount>1</threadCount>
</configuration>
</plugin>

<!-- Generate a dependency map, used by PAX Exam to find correct bundle versions. -->
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
Expand Down Expand Up @@ -219,6 +179,23 @@
<ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>
[1.8,)
</versionRange>
<goals>
<goal>
run
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
Expand Down
54 changes: 45 additions & 9 deletions fileinstall-plugins/installer/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -59,14 +60,6 @@
<version>3.5.0</version>
<scope>compile</scope>
</dependency>
<!--
<dependency>
<groupId>org.jboss.osgi.repository</groupId>
<artifactId>jbosgi-repository-core</artifactId>
<version>6.0.1.Final</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
Expand Down Expand Up @@ -94,7 +87,50 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>
[1.8,)
</versionRange>
<goals>
<goal>
run
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>


Expand Down
20 changes: 20 additions & 0 deletions fileinstall-plugins/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>


<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall.plugins.reactor</artifactId>
<name>Apache Felix File Install Plugin Reactor</name>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
<module>resolver</module>
<module>installer</module>
<module>installer.test</module>
</modules>


</project>
46 changes: 45 additions & 1 deletion fileinstall-plugins/resolver/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -78,7 +79,50 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<versionRange>
[1.8,)
</versionRange>
<goals>
<goal>
run
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>

0 comments on commit 018aeba

Please sign in to comment.