diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-01 01:30:44 +0200 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2019-04-02 01:57:28 -0400 |
| commit | 27f1fb668f09bccf7c506f51f16d70d04ec8a240 (patch) | |
| tree | 666c14f96bfdcc46d56472553be61dd9084bb079 /org.eclipse.jgit.ant | |
| parent | 4fcaa1a7d52c8a406fbf7c945a023d480bab32aa (diff) | |
| download | jgit-27f1fb668f09bccf7c506f51f16d70d04ec8a240.tar.gz jgit-27f1fb668f09bccf7c506f51f16d70d04ec8a240.zip | |
Add missing source bundles and add them to a single source feature
Add missing source bundles for
- org.eclipse.jgit.ant
- org.eclipse.jgit.archive
- org.eclipse.jgit.http.apache
- org.eclipse.jgit.http.server
- org.eclipse.jgit.junit
- org.eclipse.jgit.junit.http
- org.eclipse.jgit.junit.ssh
- org.eclipse.jgit.lfs
- org.eclipse.jgit.lfs.server
- org.eclipse.jgit.ui
Combine all source bundles into a single source feature
org.eclipse.jgit.source and delete the other source features.
Ensure all bundles are added to the jgit p2 repository.
Change-Id: I56785f49c940b79f41f763c26e63a4a820ed7cce
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ant')
| -rw-r--r-- | org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 7 | ||||
| -rw-r--r-- | org.eclipse.jgit.ant/pom.xml | 159 |
2 files changed, 107 insertions, 59 deletions
diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF new file mode 100644 index 0000000000..032619178e --- /dev/null +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.jgit.ant - Sources +Bundle-SymbolicName: org.eclipse.jgit.ant.source +Bundle-Vendor: Eclipse.org - JGit +Bundle-Version: 5.4.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.4.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7279f063f6..f43f1af6e2 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -45,62 +45,103 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.4.0-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.jgit.ant</artifactId> - <name>JGit - Ant Tasks</name> - - <description> - Ant based user interface for Git - </description> - - <properties> - <translate-qualifier /> - </properties> - - <dependencies> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.10.5</version> - </dependency> - </dependencies> - - <build> - <sourceDirectory>src/</sourceDirectory> - - <resources> - <resource> - <directory>.</directory> - <includes> - <include>plugin.properties</include> - <include>about.html</include> - </includes> - </resource> - <resource> - <directory>resources/</directory> - </resource> - </resources> - - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${bundle-manifest}</manifestFile> - </archive> - </configuration> - </plugin> + <parent> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit-parent</artifactId> + <version>5.4.0-SNAPSHOT</version> + </parent> + + <artifactId>org.eclipse.jgit.ant</artifactId> + <name>JGit - Ant Tasks</name> + + <description>Ant based user interface for Git</description> + + <properties> + <translate-qualifier /> + <source-bundle-manifest>${project.build.directory}/META-INF/SOURCE-MANIFEST.MF</source-bundle-manifest> + </properties> + + <dependencies> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.10.5</version> + </dependency> + </dependencies> + + <build> + <sourceDirectory>src/</sourceDirectory> + + <resources> + <resource> + <directory>.</directory> + <includes> + <include>plugin.properties</include> + <include>about.html</include> + </includes> + </resource> + <resource> + <directory>resources/</directory> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>translate-source-qualifier</id> + <phase>generate-resources</phase> + <configuration> + <target> + <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> + <replace file="${source-bundle-manifest}"> + <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + </replace> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <inherited>true</inherited> + <executions> + <execution> + <id>attach-sources</id> + <phase>process-classes</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <archive> + <manifestFile>${source-bundle-manifest}</manifestFile> + </archive> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${bundle-manifest}</manifestFile> + </archive> + </configuration> + </plugin> <plugin> <groupId>com.github.siom79.japicmp</groupId> @@ -143,10 +184,10 @@ </execution> </executions> </plugin> - </plugins> - </build> + </plugins> + </build> - <reporting> + <reporting> <plugins> <plugin> <groupId>com.github.siom79.japicmp</groupId> |