diff --git a/org.eclipse.jgit.console/.gitignore b/org.eclipse.jgit.console/.gitignore index 7bfe4ab211c16958e37c3a3c8147ad264de0efc4..934e0e06ffa0a2aeedbe1341d321549336719cc0 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 c84587a5a04f53b3c8a89abce91904678d81817a..1dea0d8409017ca341068e994c4f767a149e0363 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 7bfe4ab211c16958e37c3a3c8147ad264de0efc4..934e0e06ffa0a2aeedbe1341d321549336719cc0 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 3680bdde375e19ea67ab7d4fc3b459fd3c043e39..095d21a2d0228753ea332935772bcddfd73746fc 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 7351243d9dbd52f43e2740089788855b43f4975e..934e0e06ffa0a2aeedbe1341d321549336719cc0 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 ab3bd25ad8b720cf8ea54ee2eb8c5b349f2ac039..b5bbb0ab81f290601ec9b655edc319bd85ad3efb 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 7bfe4ab211c16958e37c3a3c8147ad264de0efc4..934e0e06ffa0a2aeedbe1341d321549336719cc0 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 bc47ed3d05a152bcb6d81a4c19ee013b4627c4d6..a0e9089cea81c5a076c527aacff8b354e834c3b0 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 7bfe4ab211c16958e37c3a3c8147ad264de0efc4..934e0e06ffa0a2aeedbe1341d321549336719cc0 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 a751da3fa324e40a6e301150b7a14818747f7c58..066002a7fe63825633f2a29f93e1369ed365cb11 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 b9e00027e179156b8db99acce765958993aba5ee..a5887288c9de109703303c5da259b4dee108fc44 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>