Review request JMC-6022 - Use hg changeset in version properties

[Klara Ward]

New review, more general solution more future proof for github and other 
SCMs.
Stills needs another scm connection configured if not using Hg,
for example "scm:git:git://localhost/dummy"

Regards,
Klara
On 2018-05-07 11:57, Klara Ward wrote:
> Please review change for JMC-6022 - 
> <https://bugs.openjdk.java.net/browse/JMC-6022>Use hg changeset in 
> version properties
>
> Currently, the changeSet property is set to 0, if the mercurial 
> profile is not activated.
> Change is to always call the hgchangeset goal, regardless of profile.
> If/when we create a github mirror, additional logic is required.
>
> Diff is attached.
>
> Regards,
> Klara

-------------- next part --------------
diff -r 0a79b43a0ab2 application/org.openjdk.jmc.rcp.application/src/main/resources/about.mappings
--- a/application/org.openjdk.jmc.rcp.application/src/main/resources/about.mappings	Thu May 03 15:17:04 2018 +0200
+++ b/application/org.openjdk.jmc.rcp.application/src/main/resources/about.mappings	Mon May 07 17:16:03 2018 +0200
@@ -34,7 +34,7 @@
 #version
 0=${unqualifiedVersion}
 #changeid
-1=${changeSet}
+1=${buildNumber}
 #date
 2=${build.date}
 #qualifier
diff -r 0a79b43a0ab2 application/org.openjdk.jmc.ui.common/src/main/resources/version.properties
--- a/application/org.openjdk.jmc.ui.common/src/main/resources/version.properties	Thu May 03 15:17:04 2018 +0200
+++ b/application/org.openjdk.jmc.ui.common/src/main/resources/version.properties	Mon May 07 17:16:03 2018 +0200
@@ -32,7 +32,7 @@
 #
 
 jmc.fullversion=${unqualifiedVersion}
-jmc.changeid=${changeSet}
+jmc.changeid=${buildNumber}
 jmc.qualifier=${buildQualifier}
 jmc.date=${build.date}
 jmc.buildid=${buildId}
diff -r 0a79b43a0ab2 pom.xml
--- a/pom.xml	Thu May 03 15:17:04 2018 +0200
+++ b/pom.xml	Mon May 07 17:16:03 2018 +0200
@@ -46,9 +46,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<tycho-version>1.0.0</tycho-version>
-		<changeSet>0</changeSet>
 		<buildId>${user.name}</buildId>
+		<scmConnection>scm:hg:http://hg.openjdk.java.net/jmc/jmc</scmConnection>
 	</properties>
+	<scm>
+		<connection>${scmConnection}</connection>
+	</scm>
 	<profiles>
 		<profile>
 			<id>photon</id>
@@ -95,31 +98,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>mercurial</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>buildnumber-maven-plugin</artifactId>
-						<version>1.4</version>
-						<inherited>false</inherited>
-						<executions>
-							<execution>
-								<id>build.changeid</id>
-								<phase>initialize</phase>
-								<goals>
-									<goal>hgchangeset</goal>
-								</goals>
-								<configuration>
-									<scmDirectory>${rootDir}</scmDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 	<build>
 		<plugins>
@@ -230,6 +208,18 @@
 				<version>1.4</version>
 				<executions>
 					<execution>
+						<phase>initialize</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+						<configuration>
+							<doCheck>false</doCheck>
+							<doUpdate>false</doUpdate>
+							<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+							<revisionOnScmFailure>no.scm.config.in.pom</revisionOnScmFailure>
+						</configuration>
+					</execution>
+					<execution>
 						<id>build.date</id>
 						<phase>initialize</phase>
 						<goals>