Fix build of JGit source bundle and feature
Add local changes I missed to push with [1] which broke the JGit build. [1] http://egit.eclipse.org/r/#change,1442 Change-Id: I300bfa84c5d8b5128026869b694ef5da7b0d3a4a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
47f4171315
commit
51f6fbda1f
|
@ -65,6 +65,7 @@
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>org.eclipse.jgit.feature</module>
|
<module>org.eclipse.jgit.feature</module>
|
||||||
|
<module>org.eclipse.jgit.source.feature</module>
|
||||||
<module>org.eclipse.jgit.junit.feature</module>
|
<module>org.eclipse.jgit.junit.feature</module>
|
||||||
<module>org.eclipse.jgit.updatesite</module>
|
<module>org.eclipse.jgit.updatesite</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
@ -77,6 +78,16 @@
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<!-- sources artifacts so that we can place them in the features -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.eclipse.jgit</groupId>
|
||||||
|
<artifactId>org.eclipse.jgit</artifactId>
|
||||||
|
<version>0.9.0-SNAPSHOT</version>
|
||||||
|
<classifier>sources</classifier>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
31
pom.xml
31
pom.xml
|
@ -200,7 +200,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
<version>1.3</version>
|
<version>1.5</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
|
@ -240,12 +240,41 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
<inherited>true</inherited>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-sources</id>
|
<id>attach-sources</id>
|
||||||
|
<phase>process-classes</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>jar</goal>
|
<goal>jar</goal>
|
||||||
</goals>
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifestEntries>
|
||||||
|
<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
|
||||||
|
<Bundle-Name>${project.name} - Sources</Bundle-Name>
|
||||||
|
<Bundle-SymbolicName>${project.artifactId}.source;singleton:=true</Bundle-SymbolicName>
|
||||||
|
<Bundle-Vendor>Eclipse.org - JGit</Bundle-Vendor>
|
||||||
|
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
|
||||||
|
<Eclipse-SourceBundle>${project.artifactId};version="${parsedVersion.osgiVersion}";roots:="."</Eclipse-SourceBundle>
|
||||||
|
</manifestEntries>
|
||||||
|
</archive>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<!-- Build helper maven plugin sets the parsedVersion.osgiVersion property -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>set-osgi-version</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>parse-version</goal>
|
||||||
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
Loading…
Reference in New Issue