summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jgit.console/.gitignore5
-rw-r--r--org.eclipse.jgit.console/pom.xml14
-rw-r--r--org.eclipse.jgit.junit/.gitignore5
-rw-r--r--org.eclipse.jgit.junit/pom.xml13
-rw-r--r--org.eclipse.jgit.pgm/.gitignore4
-rw-r--r--org.eclipse.jgit.test/.gitignore5
-rw-r--r--org.eclipse.jgit.ui/.gitignore5
-rw-r--r--org.eclipse.jgit.ui/pom.xml14
-rw-r--r--org.eclipse.jgit/.gitignore5
-rw-r--r--org.eclipse.jgit/pom.xml15
-rw-r--r--pom.xml36
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
@@ -83,20 +83,6 @@
<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>
<archive>
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
@@ -89,19 +89,6 @@
<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>
<archive>
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
@@ -83,20 +83,6 @@
<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>
<archive>
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
@@ -83,21 +83,6 @@
<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>
<archive>
diff --git a/pom.xml b/pom.xml
index b9e00027e1..a5887288c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,28 +141,6 @@
<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>
<configuration>
@@ -238,20 +216,6 @@
</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>
<configuration>