From 433fe4053339a714d1d440886b1e6b010d9a4762 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 22 Nov 2011 13:49:45 +0000
Subject: [PATCH] [MRM-1561] Update to Archiva as OSGi compliant application
 add maven felix plugin version in the parent.

git-svn-id: https://svn.apache.org/repos/asf/archiva/parent@1204993 13f79535-47bb-0310-9956-ffa450edef68
---
 .gitignore |  5 +++++
 pom.xml    | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..79176ce3b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.project
+.classpath
+.settings
+target
+*.i??
diff --git a/pom.xml b/pom.xml
index 05ccb259b..c413fe85c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -489,6 +489,17 @@
     <pluginManagement>
       <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>
-- 
2.39.5