From 20b4d4740aea3b0f51063211f3b69261ced0a5d9 Mon Sep 17 00:00:00 2001
From: Shawn O. Pearce
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.ui/.gitignore |  5 +----
 org.eclipse.jgit.ui/pom.xml    | 14 --------------
 2 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'org.eclipse.jgit.ui')

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>
-- 
cgit v1.2.3