svn commit: r1204993 - in /archiva/parent: .gitignore pom.xml

[ol...@apache.org]

Author: olamy
Date: Tue Nov 22 13:49:45 2011
New Revision: 1204993

URL: http://svn.apache.org/viewvc?rev=1204993&view=rev
Log:
[MRM-1561] Update to Archiva as OSGi compliant application
add maven felix plugin version in the parent.


Added:
    archiva/parent/.gitignore
Modified:
    archiva/parent/pom.xml

Added: archiva/parent/.gitignore
URL: http://svn.apache.org/viewvc/archiva/parent/.gitignore?rev=1204993&view=auto
==============================================================================
--- archiva/parent/.gitignore (added)
+++ archiva/parent/.gitignore Tue Nov 22 13:49:45 2011
@@ -0,0 +1,5 @@
+.project
+.classpath
+.settings
+target
+*.i??

Modified: archiva/parent/pom.xml
URL: http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1204993&r1=1204992&r2=1204993&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Tue Nov 22 13:49:45 2011
@@ -490,6 +490,17 @@
       <plugins>
         <!-- set versions of common plugins for reproducibility, ordered alphabetically -->
         <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.4</version>
+          <extensions>true</extensions>
+          <configuration>
+            <instructions>
+              <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            </instructions>
+          </configuration>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
           <version>2.4.1</version>