Attachment 223599 Details for Bug 390119 – patch

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

[patch] patch

0001-390119-use-maven-resources-plugin-to-update-buildId.patch (text/plain), 1.97 KB, created by Jan Sievers

on 2012-11-15 07:26:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Sievers

Created: 2012-11-15 07:26:37 EST

Size: 1.97 KB

patch

obsolete

>From 45adf4c5d24f4488dd518ad4a63acf9aece7cf6a Mon Sep 17 00:00:00 2001
>From: Jan Sievers <jan.sievers@sap.com>
>Date: Thu, 15 Nov 2012 13:21:13 +0100
>Subject: [PATCH] 390119 use maven-resources-plugin to update buildId
>
>Use maven-resources-plugin filtering to replace
>@build@ with qualified version in about.mappings.
>
>Need to add a bogus emtpy source.. dir
>and add "." to bin.includes so that
>content from target/classes is picked up.
>---
> org.eclipse.jdt/build.properties |  6 ++++--
> org.eclipse.jdt/pom.xml          | 16 +++++++++++++++-
> 2 files changed, 19 insertions(+), 3 deletions(-)
>
>diff --git a/org.eclipse.jdt/build.properties b/org.eclipse.jdt/build.properties
>index 6e251c8..edcab52 100644
>--- a/org.eclipse.jdt/build.properties
>+++ b/org.eclipse.jdt/build.properties
>@@ -10,7 +10,6 @@
> ###############################################################################
> bin.includes = about.html,\
>                about.ini,\
>-               about.mappings,\
>                about.properties,\
>                plugin.properties,\
>                plugin.xml,\
>@@ -18,4 +17,7 @@ bin.includes = about.html,\
>                intro/,\
>                META-INF/,\
>                eclipse32.png,\
>-               images/
>+               images/,\
>+			   .
>+#empty bogus source dir, workaround for bug 390119
>+source..=bogus/		
>diff --git a/org.eclipse.jdt/pom.xml b/org.eclipse.jdt/pom.xml
>index d2f4080..31f3c6e 100644
>--- a/org.eclipse.jdt/pom.xml
>+++ b/org.eclipse.jdt/pom.xml
>@@ -22,4 +22,18 @@
>   <artifactId>org.eclipse.jdt</artifactId>
>   <version>3.8.0-SNAPSHOT</version>
>   <packaging>eclipse-plugin</packaging>
>-</project>
>+
>+  <properties>
>+	  <build>${unqualifiedVersion}.${buildQualifier}</build>
>+  </properties>  
>+  <build>
>+    <resources>
>+      <resource>
>+        <directory>.</directory>
>+        <filtering>true</filtering>
>+        <includes>
>+          <include>about.mappings</include>
>+        </includes>
>+      </resource>
>+    </resources>
>+  </build></project>
>-- 
>1.8.0.msysgit.0
>

Actions: View | Diff

Attachments on bug 390119: 222079 | 223599 | 223713 | 223714 | 223715 | 223716 | 223717 | 223718 | 223719 | 223720 | 223964 | 223965 | 223966 | 223967 | 223968 | 223969 | 223970 | 223972 | 223987 | 223988 | 223989 | 223990 | 223991 | 223992 | 223993 | 223994 | 224072