From 20b4d4740aea3b0f51063211f3b69261ced0a5d9 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <spearce@spearce.org>
Date: Tue, 12 Jan 2010 11:41:35 -0800
Subject: Finish removing Apache Felix maven-bundle-plugin

Since Robin reverted using the maven-bundle-plugin to produce the
OSGi manifest, there is no reason for us to reference it from our
build process anymore.

Also, when Robin reverted the to the Eclipse way of doing things,
we failed to update the ignore files to ignore our generated files
but not ignore our tracked .classpath.

Finally, we cannot delete the MANIFEST.MF file during a Maven build,
as this is once again a source file.

Change-Id: I53f77f2002cb4285f728968829560e835651e188
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 org.eclipse.jgit.console/.gitignore |  5 +----
 org.eclipse.jgit.console/pom.xml    | 14 --------------
 org.eclipse.jgit.junit/.gitignore   |  5 +----
 org.eclipse.jgit.junit/pom.xml      | 13 -------------
 org.eclipse.jgit.pgm/.gitignore     |  4 +---
 org.eclipse.jgit.test/.gitignore    |  5 +----
 org.eclipse.jgit.ui/.gitignore      |  5 +----
 org.eclipse.jgit.ui/pom.xml         | 14 --------------
 org.eclipse.jgit/.gitignore         |  5 +----
 org.eclipse.jgit/pom.xml            | 15 ---------------
 pom.xml                             | 36 ------------------------------------
 11 files changed, 6 insertions(+), 115 deletions(-)

diff --git a/org.eclipse.jgit.console/.gitignore b/org.eclipse.jgit.console/.gitignore
index 7bfe4ab211..934e0e06ff 100644
--- a/org.eclipse.jgit.console/.gitignore
+++ b/org.eclipse.jgit.console/.gitignore
@@ -1,5 +1,2 @@
+/bin
 /target
-/META-INF/MANIFEST.MF
-/.project
-/.classpath
-/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml
index c84587a5a0..1dea0d8409 100644
--- a/org.eclipse.jgit.console/pom.xml
+++ b/org.eclipse.jgit.console/pom.xml
@@ -82,20 +82,6 @@
     </resources>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-RequiredExecutionEnvironment>J2SE-1.6</Bundle-RequiredExecutionEnvironment>
-            <Import-Package>
-              com.jcraft.jsch;version="${jsch-version}",
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
diff --git a/org.eclipse.jgit.junit/.gitignore b/org.eclipse.jgit.junit/.gitignore
index 7bfe4ab211..934e0e06ff 100644
--- a/org.eclipse.jgit.junit/.gitignore
+++ b/org.eclipse.jgit.junit/.gitignore
@@ -1,5 +1,2 @@
+/bin
 /target
-/META-INF/MANIFEST.MF
-/.project
-/.classpath
-/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 3680bdde37..095d21a2d0 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -88,19 +88,6 @@
     </resources>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              junit.framework;version="${junit-version}",
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
diff --git a/org.eclipse.jgit.pgm/.gitignore b/org.eclipse.jgit.pgm/.gitignore
index 7351243d9d..934e0e06ff 100644
--- a/org.eclipse.jgit.pgm/.gitignore
+++ b/org.eclipse.jgit.pgm/.gitignore
@@ -1,4 +1,2 @@
+/bin
 /target
-/.project
-/.classpath
-/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.eclipse.jgit.test/.gitignore b/org.eclipse.jgit.test/.gitignore
index ab3bd25ad8..b5bbb0ab81 100644
--- a/org.eclipse.jgit.test/.gitignore
+++ b/org.eclipse.jgit.test/.gitignore
@@ -1,6 +1,3 @@
+/bin
 /target
-/META-INF/MANIFEST.MF
 /trash
-/.project
-/.classpath
-/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.eclipse.jgit.ui/.gitignore b/org.eclipse.jgit.ui/.gitignore
index 7bfe4ab211..934e0e06ff 100644
--- a/org.eclipse.jgit.ui/.gitignore
+++ b/org.eclipse.jgit.ui/.gitignore
@@ -1,5 +1,2 @@
+/bin
 /target
-/META-INF/MANIFEST.MF
-/.project
-/.classpath
-/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index bc47ed3d05..a0e9089cea 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -82,20 +82,6 @@
     </resources>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              !javax.swing.*,
-              com.jcraft.jsch;version="${jsch-version}",
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
diff --git a/org.eclipse.jgit/.gitignore b/org.eclipse.jgit/.gitignore
index 7bfe4ab211..934e0e06ff 100644
--- a/org.eclipse.jgit/.gitignore
+++ b/org.eclipse.jgit/.gitignore
@@ -1,5 +1,2 @@
+/bin
 /target
-/META-INF/MANIFEST.MF
-/.project
-/.classpath
-/.settings/org.maven.ide.eclipse.prefs
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index a751da3fa3..066002a7fe 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -82,21 +82,6 @@
     </resources>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              !org.xml.sax.*,
-              !javax.crypto.*,
-              com.jcraft.jsch;version="${jsch-version}",
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
diff --git a/pom.xml b/pom.xml
index b9e00027e1..a5887288c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,28 +140,6 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.0.1</version>
-          <configuration>
-            <manifestLocation>META-INF</manifestLocation>
-            <instructions>
-              <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-              <Bundle-DocURL>${jgit-url}</Bundle-DocURL>
-              <Bundle-Vendor>%provider_name</Bundle-Vendor>
-              <Bundle-Name>%plugin_name</Bundle-Name>
-              <Bundle-Description>%plugin_description</Bundle-Description>
-              <Bundle-Localization>plugin</Bundle-Localization>
-              <Bundle-Copyright>${jgit-copyright}</Bundle-Copyright>
-              <Bundle-License>http://www.eclipse.org/org/documents/edl-v10.php</Bundle-License>
-              <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-              <Bundle-Version>$(replace;$(project.version);-SNAPSHOT;"").$(tstamp;yyyyMMdd-HHmm)</Bundle-Version>
-              <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            </instructions>
-          </configuration>
-        </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
@@ -237,20 +215,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>META-INF/MANIFEST.MF</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-- 
cgit v1.2.3