Attachment 227936 Details for Bug 381057 – corresponding patch for eclipse-platform-parent

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] corresponding patch for eclipse-platform-parent

0001-381057-Fix-api-description-generation.patch (text/plain), 1.99 KB, created by Jan Sievers

on 2013-03-05 10:15:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Sievers

Created: 2013-03-05 10:15:20 EST

Size: 1.99 KB

patch

obsolete

>From ca682e8119eb5b5235488c205a93049455c41880 Mon Sep 17 00:00:00 2001
>From: Jan Sievers <jan.sievers@sap.com>
>Date: Tue, 5 Mar 2013 16:06:36 +0100
>Subject: [PATCH] 381057 Fix api description generation
>
>- use cbi mvan plugin 1.0.1-SNAPSHOT which
>  includes required fixes
>- use generated .apibuild.xml from target/ folder
>- include generated .api_description file from
>  target/ folder into outer bundle jar via
>  additionalFileSets (see bug 402095)
>---
> eclipse-platform-parent/pom.xml | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
>index 8e2ba75..53f98e9 100644
>--- a/eclipse-platform-parent/pom.xml
>+++ b/eclipse-platform-parent/pom.xml
>@@ -116,7 +116,7 @@
>       <plugin>
>         <groupId>org.eclipse.cbi.maven.plugins</groupId>
>         <artifactId>eclipse-cbi-plugin</artifactId>
>-        <version>1.0.0</version>
>+        <version>1.0.1-SNAPSHOT</version>
>         <executions>
>           <execution>
>             <goals>
>@@ -284,6 +284,14 @@
>             <archive>
>                <addMavenDescriptor>false</addMavenDescriptor>
>             </archive>
>+			<additionalFileSets>
>+				<fileSet>
>+					<directory>${project.build.directory}</directory>
>+					<includes>
>+						<include>.api_description</include>
>+					</includes>
>+				</fileSet>
>+			</additionalFileSets>
>           </configuration>
>         </plugin>
>         <plugin>
>@@ -565,7 +573,7 @@
>               
>               <argLine>-XX:-UseLoopPredicate -Dhelp.lucene.tokenizer=standard</argLine>
>               
>-              <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile .apibuild.xml</appArgLine>
>+              <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile target/.apibuild.xml</appArgLine>
>               <dependencies>
>                 
>                 <dependency>
>-- 
>1.8.0.msysgit.0
>

Actions: View | Diff

Attachments on bug 381057: 221047 | 221048 | 225435 | 225436 | 225884 | 225885 | 225994 | 227124 | 227935 | 227936