github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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>
stable-0.7
Shawn O. Pearce 15 years ago
parent
cbab08fb28
commit
20b4d4740a
11 changed files with 6 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      org.eclipse.jgit.console/.gitignore
  2. 14
      org.eclipse.jgit.console/pom.xml
  3. 5
      org.eclipse.jgit.junit/.gitignore
  4. 13
      org.eclipse.jgit.junit/pom.xml
  5. 4
      org.eclipse.jgit.pgm/.gitignore
  6. 5
      org.eclipse.jgit.test/.gitignore
  7. 5
      org.eclipse.jgit.ui/.gitignore
  8. 14
      org.eclipse.jgit.ui/pom.xml
  9. 5
      org.eclipse.jgit/.gitignore
  10. 15
      org.eclipse.jgit/pom.xml
  11. 36
      pom.xml

5
org.eclipse.jgit.console/.gitignore vendored
Unescape View File

@ -1,5 +1,2 @@
/bin
/target /target
/META-INF/MANIFEST.MF
/.project
/.classpath
/.settings/org.maven.ide.eclipse.prefs

14
org.eclipse.jgit.console/pom.xml
Unescape View File

@ -82,20 +82,6 @@
</resources> </resources>
<plugins> <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> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>

5
org.eclipse.jgit.junit/.gitignore vendored
Unescape View File

@ -1,5 +1,2 @@
/bin
/target /target
/META-INF/MANIFEST.MF
/.project
/.classpath
/.settings/org.maven.ide.eclipse.prefs

13
org.eclipse.jgit.junit/pom.xml
Unescape View File

@ -88,19 +88,6 @@
</resources> </resources>
<plugins> <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> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>

4
org.eclipse.jgit.pgm/.gitignore vendored
Unescape View File

@ -1,4 +1,2 @@
/bin
/target /target
/.project
/.classpath
/.settings/org.maven.ide.eclipse.prefs

5
org.eclipse.jgit.test/.gitignore vendored
Unescape View File

@ -1,6 +1,3 @@
/bin
/target /target
/META-INF/MANIFEST.MF
/trash /trash
/.project
/.classpath
/.settings/org.maven.ide.eclipse.prefs

5
org.eclipse.jgit.ui/.gitignore vendored
Unescape View File

@ -1,5 +1,2 @@
/bin
/target /target
/META-INF/MANIFEST.MF
/.project
/.classpath
/.settings/org.maven.ide.eclipse.prefs

14
org.eclipse.jgit.ui/pom.xml
Unescape View File

@ -82,20 +82,6 @@
</resources> </resources>
<plugins> <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> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>

5
org.eclipse.jgit/.gitignore vendored
Unescape View File

@ -1,5 +1,2 @@
/bin
/target /target
/META-INF/MANIFEST.MF
/.project
/.classpath
/.settings/org.maven.ide.eclipse.prefs

15
org.eclipse.jgit/pom.xml
Unescape View File

@ -82,21 +82,6 @@
</resources> </resources>
<plugins> <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> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>

36
pom.xml
Unescape View File

@ -140,28 +140,6 @@
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
@ -237,20 +215,6 @@
</executions> </executions>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>

Write Preview
Loading…
Cancel
Save