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>tags/v0.7.0
@@ -1,5 +1,2 @@ | |||
/bin | |||
/target | |||
/META-INF/MANIFEST.MF | |||
/.project | |||
/.classpath | |||
/.settings/org.maven.ide.eclipse.prefs |
@@ -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> |
@@ -1,5 +1,2 @@ | |||
/bin | |||
/target | |||
/META-INF/MANIFEST.MF | |||
/.project | |||
/.classpath | |||
/.settings/org.maven.ide.eclipse.prefs |
@@ -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> |
@@ -1,4 +1,2 @@ | |||
/bin | |||
/target | |||
/.project | |||
/.classpath | |||
/.settings/org.maven.ide.eclipse.prefs |
@@ -1,6 +1,3 @@ | |||
/bin | |||
/target | |||
/META-INF/MANIFEST.MF | |||
/trash | |||
/.project | |||
/.classpath | |||
/.settings/org.maven.ide.eclipse.prefs |
@@ -1,5 +1,2 @@ | |||
/bin | |||
/target | |||
/META-INF/MANIFEST.MF | |||
/.project | |||
/.classpath | |||
/.settings/org.maven.ide.eclipse.prefs |
@@ -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> |
@@ -1,5 +1,2 @@ | |||
/bin | |||
/target | |||
/META-INF/MANIFEST.MF | |||
/.project | |||
/.classpath | |||
/.settings/org.maven.ide.eclipse.prefs |
@@ -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> |
@@ -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> |