changeset 137:a8533f338974

JMC-6412: Updating about box to support more flexible versioning Reviewed-by: ghb
author hirt <marcus.hirt@oracle.com>
date Thu, 28 Feb 2019 22:09:51 +0100
parents 71ec7bcc9637
children 8115549a88aa
files application/l10n/org.openjdk.jmc.rcp.application.ja/plugin_ja.properties application/l10n/org.openjdk.jmc.rcp.application.zh_CN/plugin_zh_CN.properties application/org.openjdk.jmc.rcp.application/plugin.properties application/org.openjdk.jmc.rcp.application/src/main/resources/about.mappings pom.xml
diffstat 5 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/application/l10n/org.openjdk.jmc.rcp.application.ja/plugin_ja.properties	Thu Feb 28 12:49:56 2019 +0100
+++ b/application/l10n/org.openjdk.jmc.rcp.application.ja/plugin_ja.properties	Thu Feb 28 22:09:51 2019 +0100
@@ -36,7 +36,7 @@
 OPEN_FILE_NAME=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F...
 OPEN_FILE_DESCRIPTION=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
 MISSION_CONTROL_FILE_COMMANDS_CATEGORY=Mission Control\u30D5\u30A1\u30A4\u30EB\u30FB\u30B3\u30DE\u30F3\u30C9
-ABOUT_TEXT=JDK Mission Control {4} ({3}, {1})\n\nhttp://www.oracle.com/missioncontrol\n\nCopyright \u00A9 2018, 2019, Oracle and/or its affiliates. All rights reserved.\nOracle\u304A\u3088\u3073Java\u306F\u30AA\u30E9\u30AF\u30EB \u304A\u3088\u3073\u305D\u306E\u95A2\u9023\u4F1A\u793E\u306E\u767B\u9332\u5546\u6A19\u3067\u3059\u3002\n\u305D\u306E\u4ED6\u306E\u793E\u540D\u3001\u5546\u54C1\u540D\u7B49\u306F\u5404\u793E\u306E\u5546\u6A19\u307E\u305F\u306F\u767B\u9332\u5546\u6A19\u3067\u3042\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n\nIntel\u3001Intel Xeon\u306F\u3001Intel Corporation\u306E\u5546\u6A19\u307E\u305F\u306F\n\u767B\u9332\u5546\u6A19\u3067\u3059\u3002\u3059\u3079\u3066\u306ESPARC\u306E\u5546\u6A19\u306F\u30E9\u30A4\u30BB\u30F3\u30B9\u3092\u3082\u3068\u306B\n\u4F7F\u7528\u3057\u3001SPARC International, Inc.\u306E\u5546\u6A19\u307E\u305F\u306F\u767B\u9332\u5546\u6A19\n\u3067\u3059\u3002AMD\u3001Opteron\u3001AMD\u30ED\u30B4\u3001AMD Opteron\u30ED\u30B4\u306F\u3001\nAdvanced Micro Devices, Inc.\u306E\u5546\u6A19\u307E\u305F\u306F\u767B\u9332\u5546\u6A19\u3067\u3059\u3002\nUNIX\u306F\u3001The Open Group\u306E\u767B\u9332\u5546\u6A19\u3067\u3059\u3002
+ABOUT_TEXT=JDK Mission Control {0}{5}+{4}\n(JDK {6}, Qualifier: {3}, Change id: {1})\n\nhttp://www.oracle.com/missioncontrol\n\nCopyright \u00A9 2018, 2019, Oracle and/or its affiliates. All rights reserved.\nOracle\u304A\u3088\u3073Java\u306F\u30AA\u30E9\u30AF\u30EB \u304A\u3088\u3073\u305D\u306E\u95A2\u9023\u4F1A\u793E\u306E\u767B\u9332\u5546\u6A19\u3067\u3059\u3002\n\u305D\u306E\u4ED6\u306E\u793E\u540D\u3001\u5546\u54C1\u540D\u7B49\u306F\u5404\u793E\u306E\u5546\u6A19\u307E\u305F\u306F\u767B\u9332\u5546\u6A19\u3067\u3042\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n\nIntel\u3001Intel Xeon\u306F\u3001Intel Corporation\u306E\u5546\u6A19\u307E\u305F\u306F\n\u767B\u9332\u5546\u6A19\u3067\u3059\u3002\u3059\u3079\u3066\u306ESPARC\u306E\u5546\u6A19\u306F\u30E9\u30A4\u30BB\u30F3\u30B9\u3092\u3082\u3068\u306B\n\u4F7F\u7528\u3057\u3001SPARC International, Inc.\u306E\u5546\u6A19\u307E\u305F\u306F\u767B\u9332\u5546\u6A19\n\u3067\u3059\u3002AMD\u3001Opteron\u3001AMD\u30ED\u30B4\u3001AMD Opteron\u30ED\u30B4\u306F\u3001\nAdvanced Micro Devices, Inc.\u306E\u5546\u6A19\u307E\u305F\u306F\u767B\u9332\u5546\u6A19\u3067\u3059\u3002\nUNIX\u306F\u3001The Open Group\u306E\u767B\u9332\u5546\u6A19\u3067\u3059\u3002
 GENERAL_PREFERENCE_PAGE_TITLE=\u5168\u822C
 FILE_ASSOCIATIONS_PREFERENCE_PAGE_TITLE=\u30D5\u30A1\u30A4\u30EB\u306E\u95A2\u9023\u4ED8\u3051
 APPEARANCE_PREFERENCE_PAGE_TITLE=\u5916\u89B3
--- a/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/plugin_zh_CN.properties	Thu Feb 28 12:49:56 2019 +0100
+++ b/application/l10n/org.openjdk.jmc.rcp.application.zh_CN/plugin_zh_CN.properties	Thu Feb 28 22:09:51 2019 +0100
@@ -36,7 +36,7 @@
 OPEN_FILE_NAME=\u6253\u5F00\u6587\u4EF6...
 OPEN_FILE_DESCRIPTION=\u6253\u5F00\u6587\u4EF6
 MISSION_CONTROL_FILE_COMMANDS_CATEGORY=Mission Control \u6587\u4EF6\u547D\u4EE4
-ABOUT_TEXT=JDK Mission Control {4} ({3}\uFF0C{1})\n\nhttp://www.oracle.com/missioncontrol\n\n\u7248\u6743\u6240\u6709 \u00A9 1999\uFF0C2017\uFF0COracle \u548C/\u6216\u5176\u9644\u5C5E\u516C\u53F8\u3002\u4FDD\u7559\u6240\u6709\u6743\u5229\u3002\nOracle \u548C Java \u662F Oracle \u548C/\u6216\u5176\u9644\u5C5E\u516C\u53F8\u7684\u6CE8\u518C\u5546\u6807\u3002\u5176\u4ED6\u540D\u79F0\n\u53EF\u80FD\u662F\u5404\u81EA\u6240\u6709\u8005\u7684\u5546\u6807\u3002\n\nIntel \u548C Intel Xeon \u662F Intel Corporation \u7684\u5546\u6807\u6216\n\u6CE8\u518C\u5546\u6807\u3002\u6240\u6709 SPARC \u5546\u6807\u5747\u662F SPARC International, Inc \u7684\n\u5546\u6807\u6216\u6CE8\u518C\u5546\u6807\uFF0C\u5E76\u5E94\u6309\u7167\u8BB8\u53EF\u8BC1\u7684\u89C4\u5B9A\u4F7F\u7528\u3002AMD\u3001Opteron\u3001\nAMD \u5FBD\u6807\u4EE5\u53CA AMD Opteron \u5FBD\u6807\u662F Advanced Micro Devices \u7684\n\u5546\u6807\u6216\u6CE8\u518C\u5546\u6807\u3002UNIX \u662F The Open Group \u7684\n\u6CE8\u518C\u5546\u6807\u3002
+ABOUT_TEXT=JDK Mission Control {0}{5}+{4}\n(JDK {6}, Qualifier: {3}, Change id: {1})\n\nhttp://www.oracle.com/missioncontrol\n\n\u7248\u6743\u6240\u6709 \u00A9 1999\uFF0C2017\uFF0COracle \u548C/\u6216\u5176\u9644\u5C5E\u516C\u53F8\u3002\u4FDD\u7559\u6240\u6709\u6743\u5229\u3002\nOracle \u548C Java \u662F Oracle \u548C/\u6216\u5176\u9644\u5C5E\u516C\u53F8\u7684\u6CE8\u518C\u5546\u6807\u3002\u5176\u4ED6\u540D\u79F0\n\u53EF\u80FD\u662F\u5404\u81EA\u6240\u6709\u8005\u7684\u5546\u6807\u3002\n\nIntel \u548C Intel Xeon \u662F Intel Corporation \u7684\u5546\u6807\u6216\n\u6CE8\u518C\u5546\u6807\u3002\u6240\u6709 SPARC \u5546\u6807\u5747\u662F SPARC International, Inc \u7684\n\u5546\u6807\u6216\u6CE8\u518C\u5546\u6807\uFF0C\u5E76\u5E94\u6309\u7167\u8BB8\u53EF\u8BC1\u7684\u89C4\u5B9A\u4F7F\u7528\u3002AMD\u3001Opteron\u3001\nAMD \u5FBD\u6807\u4EE5\u53CA AMD Opteron \u5FBD\u6807\u662F Advanced Micro Devices \u7684\n\u5546\u6807\u6216\u6CE8\u518C\u5546\u6807\u3002UNIX \u662F The Open Group \u7684\n\u6CE8\u518C\u5546\u6807\u3002
 GENERAL_PREFERENCE_PAGE_TITLE=\u4E00\u822C\u4FE1\u606F
 FILE_ASSOCIATIONS_PREFERENCE_PAGE_TITLE=\u6587\u4EF6\u5173\u8054
 APPEARANCE_PREFERENCE_PAGE_TITLE=\u5916\u89C2
--- a/application/org.openjdk.jmc.rcp.application/plugin.properties	Thu Feb 28 12:49:56 2019 +0100
+++ b/application/org.openjdk.jmc.rcp.application/plugin.properties	Thu Feb 28 22:09:51 2019 +0100
@@ -36,8 +36,8 @@
 OPEN_FILE_NAME=Open File...
 OPEN_FILE_DESCRIPTION=Open a file
 MISSION_CONTROL_FILE_COMMANDS_CATEGORY=Mission Control File Commands
-ABOUT_TEXT=JDK Mission Control {0}\n\
-(Build id: {4}, Qualifier: {3}, Change id: {1})\n\n\
+ABOUT_TEXT=JDK Mission Control {0}{5}+{4}\n\
+(JDK {6}, Qualifier: {3}, Change id: {1})\n\n\
 http://www.oracle.com/missioncontrol\n\n\
 Copyright \u00A9 2018, 2019, Oracle and/or its affiliates. All rights reserved.\n\
 Oracle and Java are registered trademarks of Oracle and/or its\n\
--- a/application/org.openjdk.jmc.rcp.application/src/main/resources/about.mappings	Thu Feb 28 12:49:56 2019 +0100
+++ b/application/org.openjdk.jmc.rcp.application/src/main/resources/about.mappings	Thu Feb 28 22:09:51 2019 +0100
@@ -41,3 +41,7 @@
 3=${buildQualifier}
 #buildid
 4=${buildId}
+# Critical Patch Update Id
+5=${patchId}
+#embedded JDK version
+6=${jdkVersion}
\ No newline at end of file
--- a/pom.xml	Thu Feb 28 12:49:56 2019 +0100
+++ b/pom.xml	Thu Feb 28 22:09:51 2019 +0100
@@ -83,6 +83,11 @@
 		<maven.resources.version>3.0.2</maven.resources.version>
 		<spotbugs.version>3.1.10</spotbugs.version>
 		<buildId>${user.name}</buildId>
+		<!-- Critical Patch Update Id. Used in a release where _only_ the embedded
+		     JDK has changed. Set to .[cpu sequence number], e.g. .1 -->
+		<patchId></patchId>
+		<!-- The version of the JDK to embed, e.g. 12.0.2 -->
+		<jdkVersion></jdkVersion>
 		<scmConnection>scm:hg:http://hg.openjdk.java.net/jmc/jmc</scmConnection>
 	</properties>
 	<scm>