[526568] Adding build processing of about.mappings files.
diff --git a/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
index cfc0cf0..417f222 100644
--- a/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.doc; singleton:=true
-Bundle-Version: 5.3.0.qualifier
+Bundle-Version: 5.4.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help
diff --git a/doc/org.eclipse.uml2.doc/about.mappings b/doc/org.eclipse.uml2.doc/about.mappings
index e423b8a..26c15d0 100644
--- a/doc/org.eclipse.uml2.doc/about.mappings
+++ b/doc/org.eclipse.uml2.doc/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2017 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -6,11 +6,11 @@
#
# Contributors:
# IBM - initial API and implementation
+# Kenn Hussey - 526568
#
-# $Id: about.mappings,v 1.1 2006/03/28 21:10:59 khussey Exp $
# This file contains fill-ins for about.properties
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
+0=${buildId}
\ No newline at end of file
diff --git a/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
index 3d5de15..b1c761f 100644
--- a/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.examples
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.4.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.uml2.examples/about.mappings b/examples/org.eclipse.uml2.examples/about.mappings
index 60c90ca..c101df0 100644
--- a/examples/org.eclipse.uml2.examples/about.mappings
+++ b/examples/org.eclipse.uml2.examples/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2017 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -6,12 +6,12 @@
#
# Contributors:
# IBM - initial API and implementation
+# Kenn Hussey - 526568
#
-# $Id: about.mappings,v 1.1 2006/03/28 21:10:55 khussey Exp $
# about.mappings
# contains fill-ins for about.properties
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
index f633c30..fa9c4a9 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.codegen.ecore.ui; singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.uml2.codegen.ecore.ui.CodeGenEcoreUIPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings
index eb5946f..b98206b 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# Copyright (c) 2006, 2017 IBM Corporation, CEA, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
# Contributors:
# IBM - initial API and implementation
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey - 526568
#
# about.mappings
@@ -14,4 +15,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF
index 44062e9..5e10441 100644
--- a/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.common.edit; singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2.common.edit/about.mappings b/plugins/org.eclipse.uml2.common.edit/about.mappings
index eb5946f..b98206b 100644
--- a/plugins/org.eclipse.uml2.common.edit/about.mappings
+++ b/plugins/org.eclipse.uml2.common.edit/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# Copyright (c) 2006, 2017 IBM Corporation, CEA, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
# Contributors:
# IBM - initial API and implementation
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey - 526568
#
# about.mappings
@@ -14,4 +15,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
index 1a1a228..97423e7 100644
--- a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.common; singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2.common/about.mappings b/plugins/org.eclipse.uml2.common/about.mappings
index eb5946f..b98206b 100644
--- a/plugins/org.eclipse.uml2.common/about.mappings
+++ b/plugins/org.eclipse.uml2.common/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# Copyright (c) 2006, 2017 IBM Corporation, CEA, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
# Contributors:
# IBM - initial API and implementation
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey - 526568
#
# about.mappings
@@ -14,4 +15,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF
index 927b16b..d3a0f23 100644
--- a/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.uml.edit; singleton:=true
-Bundle-Version: 5.3.0.qualifier
+Bundle-Version: 5.4.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.uml2.uml.edit.UMLEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.uml.edit/about.mappings b/plugins/org.eclipse.uml2.uml.edit/about.mappings
index eb5946f..b98206b 100644
--- a/plugins/org.eclipse.uml2.uml.edit/about.mappings
+++ b/plugins/org.eclipse.uml2.uml.edit/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# Copyright (c) 2006, 2017 IBM Corporation, CEA, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
# Contributors:
# IBM - initial API and implementation
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey - 526568
#
# about.mappings
@@ -14,4 +15,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.uml/about.mappings b/plugins/org.eclipse.uml2.uml/about.mappings
index eb5946f..b98206b 100644
--- a/plugins/org.eclipse.uml2.uml/about.mappings
+++ b/plugins/org.eclipse.uml2.uml/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, CEA, and others.
+# Copyright (c) 2006, 2017 IBM Corporation, CEA, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
# Contributors:
# IBM - initial API and implementation
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey - 526568
#
# about.mappings
@@ -14,4 +15,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2/about.mappings b/plugins/org.eclipse.uml2/about.mappings
index 589bfb0..c101df0 100644
--- a/plugins/org.eclipse.uml2/about.mappings
+++ b/plugins/org.eclipse.uml2/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2017 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -6,12 +6,12 @@
#
# Contributors:
# IBM - initial API and implementation
+# Kenn Hussey - 526568
#
-# $Id: about.mappings,v 1.1 2006/03/28 21:10:50 khussey Exp $
# about.mappings
# contains fill-ins for about.properties
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
diff --git a/releng/org.eclipse.uml2.releng.tycho/pom.xml b/releng/org.eclipse.uml2.releng.tycho/pom.xml
index 119b44d..1f3f23e 100644
--- a/releng/org.eclipse.uml2.releng.tycho/pom.xml
+++ b/releng/org.eclipse.uml2.releng.tycho/pom.xml
@@ -38,6 +38,10 @@
<project.buildId>org.eclipse.uml2</project.buildId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+ <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
+ <buildId>${buildType}${buildTimestamp}</buildId>
+
<source-java-version>1.5</source-java-version>
<java-source-encoding>UTF-8</java-source-encoding>
<resource-encoding>UTF-8</resource-encoding>
@@ -262,7 +266,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <BUILD_T>N</BUILD_T>
+ <buildType>N</buildType>
</properties>
<build>
<plugins>
@@ -289,7 +293,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <BUILD_T>I</BUILD_T>
+ <buildType>I</buildType>
</properties>
<build>
<plugins>
@@ -316,7 +320,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <BUILD_T>S</BUILD_T>
+ <buildType>S</buildType>
</properties>
<build>
<plugins>
@@ -414,5 +418,57 @@
</pluginRepository>
</pluginRepositories>
</profile>
+ <profile>
+ <id>update-branding-plugins-about.mappings</id>
+ <activation>
+ <file>
+ <exists>${basedir}/about.mappings</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-about.mappings</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>about.mappings</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <configuration>
+ <additionalFileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>about.mappings</include>
+ </includes>
+ </fileSet>
+ </additionalFileSets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
index 6bf8009..f32a31a 100644
--- a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.tests
-Bundle-Version: 5.3.0.qualifier
+Bundle-Version: 5.4.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.uml2.tests/about.mappings b/tests/org.eclipse.uml2.tests/about.mappings
index 31aee98..c101df0 100644
--- a/tests/org.eclipse.uml2.tests/about.mappings
+++ b/tests/org.eclipse.uml2.tests/about.mappings
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 IBM Corporation and others.
+# Copyright (c) 2006, 2017 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -6,12 +6,12 @@
#
# Contributors:
# IBM - initial API and implementation
+# Kenn Hussey - 526568
#
-# $Id: about.mappings,v 1.1 2006/03/28 21:10:52 khussey Exp $
# about.mappings
# contains fill-ins for about.properties
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${buildId}
\ No newline at end of file
