diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-01-12 11:41:35 -0800 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-01-12 11:46:55 -0800 |
| commit | 20b4d4740aea3b0f51063211f3b69261ced0a5d9 (patch) | |
| tree | c3ac7a8ab2cc47b6293038399f696289d2a46a7a /org.eclipse.jgit.junit | |
| parent | cbab08fb2885b3024e7786e7665efad2b0579310 (diff) | |
| download | jgit-20b4d4740aea3b0f51063211f3b69261ced0a5d9.tar.gz jgit-20b4d4740aea3b0f51063211f3b69261ced0a5d9.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.junit')
| -rw-r--r-- | org.eclipse.jgit.junit/.gitignore | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.junit/pom.xml | 13 |
2 files changed, 1 insertions, 17 deletions
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> |