From 49c6bb357aadbf9a2179835484f55070d99d6a18 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Wed, 23 Oct 2019 11:24:15 -0400
Subject: [PATCH] Switch back to buildnumber plugin.

---
 pom.xml | 287 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 147 insertions(+), 140 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1497444..7713a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
 	<version>1.1.0</version>
 	<packaging>pom</packaging>
 
-    <scm>
-        <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git</connection>
-        <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git</developerConnection>
-        <url>https://code-repo.d4science.org/gCubeSystem/maven-parent</url>
-        <tag>HEAD</tag>
-    </scm>
+	<scm>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/maven-parent</url>
+		<tag>HEAD</tag>
+	</scm>
 
 	<!-- Plugin repos are common across the profiles -->
 	<pluginRepositories>
@@ -79,9 +79,9 @@
 
 	<profiles>
 
-	<!-- This profile sets an additional parameter for javadoc generation to disables the doclint.
-		 It avoids the build fails if formal/syntax errors are found in javadoc comments.
-	 	 The parameter is only understood by jdk 1.8, so we set it only when jdk 1.8 is used -->
+		<!-- This profile sets an additional parameter for javadoc generation to disables the doclint.
+             It avoids the build fails if formal/syntax errors are found in javadoc comments.
+              The parameter is only understood by jdk 1.8, so we set it only when jdk 1.8 is used -->
 		<profile>
 			<id>disable-java8-doclint</id>
 			<activation>
@@ -99,8 +99,8 @@
 			<id>generate-distribution-packages</id>
 			<activation>
 				<property>
-						<name>generateDistribution</name>
-						<value>true</value>
+					<name>generateDistribution</name>
+					<value>true</value>
 				</property>
 			</activation>
 			<build>
@@ -347,7 +347,7 @@
 									<name>build_commits.csv</name>
 									<append>true</append>
 									<lines>
-                                        <line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${git.commit.id},${repository.releases.url},${project.build.finalName}.${project.packaging}</line>
+                                        <line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${buildNumber},${repository.releases.url},${project.build.finalName}.${project.packaging}</line>
 									</lines>
 								</file>
 							</files>
@@ -448,7 +448,7 @@
 									<name>build_commits.csv</name>
 									<append>true</append>
 									<lines>
-                                        <line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${git.commit.id},${repository.jenkins.staging.url},${project.build.finalName}.${project.packaging}</line>
+                                        <line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${scmBranch},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName}.${project.packaging}</line>
 									</lines>
 								</file>
 							</files>
@@ -468,30 +468,30 @@
 			</build>
 		</profile>
 
-        <profile>
-        <id>dry-run</id>
-        <activation>
-            <activeByDefault>false</activeByDefault>
-            <property>
-                <name>build-dry-run</name>
-                <value>true</value>
-            </property>
-        </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-deploy-plugin</artifactId>
-                            <version>3.0.0-M1</version>
-                            <configuration>
-                                <skip>true</skip>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
+		<profile>
+			<id>dry-run</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<property>
+					<name>build-dry-run</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-deploy-plugin</artifactId>
+							<version>3.0.0-M1</version>
+							<configuration>
+								<skip>true</skip>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
 	</profiles>
 
 
@@ -500,30 +500,37 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
-
-					<groupId>pl.project13.maven</groupId>
-					<artifactId>git-commit-id-plugin</artifactId>
-					<version>3.0.1</version>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>buildnumber-maven-plugin</artifactId>
+					<version>1.4</version>
 					<executions>
 						<execution>
-							<id>get-the-git-infos</id>
+							<id>useLastCommittedRevision</id>
 							<phase>validate</phase>
 							<goals>
-								<goal>revision</goal>
+								<goal>create</goal>
 							</goals>
+							<configuration>
+								<useLastCommittedRevision>true</useLastCommittedRevision>
+								<scmBranchPropertyName>scmBranch</scmBranchPropertyName>
+								<doCheck>false</doCheck>
+								<doUpdate>false</doUpdate>
+							</configuration>
+						</execution>
+						<execution>
+							<id>create-timestamp-id</id>
+							<phase>validate</phase>
+							<goals>
+								<goal>create-timestamp</goal>
+							</goals>
+							<configuration>
+								<timestampFormat>yyyy-MM-dd HH:mm:ss.S</timestampFormat>
+								<timestampPropertyName>scmDate</timestampPropertyName>
+								<!-- formats the timestamp all together like 2016-04-04 14:17:05.123 and puts
+                                    it in the ${myBuildNumberVariable} buildProperty -->
+							</configuration>
 						</execution>
 					</executions>
-					<configuration>
-						<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-						<prefix>git</prefix>
-						<verbose>false</verbose>
-						<generateGitPropertiesFile>false</generateGitPropertiesFile>
-						<gitDescribe>
-							<skip>false</skip>
-							<always>false</always>
-							<dirty>-dirty</dirty>
-						</gitDescribe>
-					</configuration>
 
 				</plugin>
 				<plugin>
@@ -537,10 +544,10 @@
 								<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
 							</manifest>
 							<manifestEntries>
-								<SCM-Revision>${git.commit.id}</SCM-Revision>
+								<SCM-Revision>${buildNumber}</SCM-Revision>
 								<Build-Time>${buildDate}</Build-Time>
-								<SCM-Branch>${git.branch}</SCM-Branch>
-                                <SCM-Revision-URL>${project.scm.url}/commit/${git.commit.id}</SCM-Revision-URL>
+								<SCM-Branch>${scmBranch}</SCM-Branch>
+								<SCM-Revision-URL>${project.scm.url}/commit/${buildNumber}</SCM-Revision-URL>
 							</manifestEntries>
 						</archive>
 					</configuration>
@@ -586,96 +593,96 @@
 							<artifactId>shared-assemblies</artifactId>
 							<version>1.1.0</version>
 						</dependency>
-						</dependencies>
-						<executions>
-							<!-- uberjar creation -->
-							<execution>
-								<id>make-uberjar</id>
-								<configuration>
-									<descriptorRefs>
-										<descriptorRef>gcube-uberjar</descriptorRef>
-									</descriptorRefs>
-												<!--
-												override the plugin-scope configuration that some components have in their pom:
-													<descriptors>
-															<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-													</descriptors>
+					</dependencies>
+					<executions>
+						<!-- uberjar creation -->
+						<execution>
+							<id>make-uberjar</id>
+							<configuration>
+								<descriptorRefs>
+									<descriptorRef>gcube-uberjar</descriptorRef>
+								</descriptorRefs>
+								<!--
+                                override the plugin-scope configuration that some components have in their pom:
+                                    <descriptors>
+                                            <descriptor>${distroDirectory}/descriptor.xml</descriptor>
+                                    </descriptors>
 
-												If not done, the servicearchive will be built also during this execution.
-												-->
-									<descriptors combine.self="override"></descriptors>
+                                If not done, the servicearchive will be built also during this execution.
+                                -->
+								<descriptors combine.self="override"></descriptors>
 
-												<!--
-												 make sure the "-src" is appended to the filename. It is the default
-												 behaviour but it has been set explicitly because some components
-												 (e.g. ghn-distribution) set it to false in their pom
-												-->
-									<appendAssemblyId>true</appendAssemblyId>
-								</configuration>
-								<goals>
-									<goal>single</goal>
-								</goals>
-							</execution>
+								<!--
+                                 make sure the "-src" is appended to the filename. It is the default
+                                 behaviour but it has been set explicitly because some components
+                                 (e.g. ghn-distribution) set it to false in their pom
+                                -->
+								<appendAssemblyId>true</appendAssemblyId>
+							</configuration>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
 
-								<!-- default servicearchive creation-->
-							<execution>
-								<id>make-servicearchive</id>
-								<configuration>
-									<descriptorRefs>
-										<descriptorRef>gcube-default-servicearchive</descriptorRef>
-									</descriptorRefs>
+						<!-- default servicearchive creation-->
+						<execution>
+							<id>make-servicearchive</id>
+							<configuration>
+								<descriptorRefs>
+									<descriptorRef>gcube-default-servicearchive</descriptorRef>
+								</descriptorRefs>
 
-												<!--
-												override the plugin-scope configuration that some components have in their pom:
-													<descriptors>
-															<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-													</descriptors>
+								<!--
+                                override the plugin-scope configuration that some components have in their pom:
+                                    <descriptors>
+                                            <descriptor>${distroDirectory}/descriptor.xml</descriptor>
+                                    </descriptors>
 
-												If not done, the servicearchive will be built also during this execution.
-												-->
-									<descriptors combine.self="override"></descriptors>
+                                If not done, the servicearchive will be built also during this execution.
+                                -->
+								<descriptors combine.self="override"></descriptors>
 
-												<!--
-												 make sure the "-src" is appended to the filename. It is the default
-												 behaviour but it has been set explicitly because some components
-												 (e.g. ghn-distribution) set it to false in their pom
-												-->
-									<appendAssemblyId>true</appendAssemblyId>
-								</configuration>
-								<goals>
-									<goal>single</goal>
-								</goals>
-							</execution>
-								<!-- source package creation -->
-							<execution>
-								<id>make-source-package</id>
-								<configuration>
-									<descriptorRefs>
-										<descriptorRef>gcube-source-package</descriptorRef>
-									</descriptorRefs>
+								<!--
+                                 make sure the "-src" is appended to the filename. It is the default
+                                 behaviour but it has been set explicitly because some components
+                                 (e.g. ghn-distribution) set it to false in their pom
+                                -->
+								<appendAssemblyId>true</appendAssemblyId>
+							</configuration>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
+						<!-- source package creation -->
+						<execution>
+							<id>make-source-package</id>
+							<configuration>
+								<descriptorRefs>
+									<descriptorRef>gcube-source-package</descriptorRef>
+								</descriptorRefs>
 
-												<!--
-												override the plugin-scope configuration that some components have in their pom:
-													<descriptors>
-															<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-													</descriptors>
+								<!--
+                                override the plugin-scope configuration that some components have in their pom:
+                                    <descriptors>
+                                            <descriptor>${distroDirectory}/descriptor.xml</descriptor>
+                                    </descriptors>
 
-												If not done, the servicearchive will be built also during this execution.
-												-->
-												<descriptors combine.self="override"></descriptors>
+                                If not done, the servicearchive will be built also during this execution.
+                                -->
+								<descriptors combine.self="override"></descriptors>
 
-												<!--
-												 make sure the "-src" is appended to the filename. It is the default
-												 behaviour but it has been set explicitly because some components
-												 (e.g. ghn-distribution) set it to false in their pom
-												-->
-									<appendAssemblyId>true</appendAssemblyId>
-								</configuration>
-								<goals>
-									<goal>single</goal>
-								</goals>
-							</execution>
-						</executions>
+								<!--
+                                 make sure the "-src" is appended to the filename. It is the default
+                                 behaviour but it has been set explicitly because some components
+                                 (e.g. ghn-distribution) set it to false in their pom
+                                -->
+								<appendAssemblyId>true</appendAssemblyId>
+							</configuration>
+							<goals>
+								<goal>single</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
 
 				<plugin>
@@ -772,8 +779,8 @@
 		<plugins>
 
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
 			</plugin>
 
 			<!-- enforce integration build requirements -->