Switch back to buildnumber plugin.

This commit is contained in:
Manuele Simi 2019-10-23 11:24:15 -04:00
parent cb1946c0e0
commit 49c6bb357a
1 changed files with 147 additions and 140 deletions

287
pom.xml
View File

@ -8,12 +8,12 @@
<version>1.1.0</version> <version>1.1.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<scm> <scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git</connection> <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> <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/maven-parent.git</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/maven-parent</url> <url>https://code-repo.d4science.org/gCubeSystem/maven-parent</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
<!-- Plugin repos are common across the profiles --> <!-- Plugin repos are common across the profiles -->
<pluginRepositories> <pluginRepositories>
@ -79,9 +79,9 @@
<profiles> <profiles>
<!-- This profile sets an additional parameter for javadoc generation to disables the doclint. <!-- 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. 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 --> The parameter is only understood by jdk 1.8, so we set it only when jdk 1.8 is used -->
<profile> <profile>
<id>disable-java8-doclint</id> <id>disable-java8-doclint</id>
<activation> <activation>
@ -99,8 +99,8 @@
<id>generate-distribution-packages</id> <id>generate-distribution-packages</id>
<activation> <activation>
<property> <property>
<name>generateDistribution</name> <name>generateDistribution</name>
<value>true</value> <value>true</value>
</property> </property>
</activation> </activation>
<build> <build>
@ -347,7 +347,7 @@
<name>build_commits.csv</name> <name>build_commits.csv</name>
<append>true</append> <append>true</append>
<lines> <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> </lines>
</file> </file>
</files> </files>
@ -448,7 +448,7 @@
<name>build_commits.csv</name> <name>build_commits.csv</name>
<append>true</append> <append>true</append>
<lines> <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> </lines>
</file> </file>
</files> </files>
@ -468,30 +468,30 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>dry-run</id> <id>dry-run</id>
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
<property> <property>
<name>build-dry-run</name> <name>build-dry-run</name>
<value>true</value> <value>true</value>
</property> </property>
</activation> </activation>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version> <version>3.0.0-M1</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</profile> </profile>
</profiles> </profiles>
@ -500,30 +500,37 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>pl.project13.maven</groupId> <artifactId>buildnumber-maven-plugin</artifactId>
<artifactId>git-commit-id-plugin</artifactId> <version>1.4</version>
<version>3.0.1</version>
<executions> <executions>
<execution> <execution>
<id>get-the-git-infos</id> <id>useLastCommittedRevision</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>revision</goal> <goal>create</goal>
</goals> </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> </execution>
</executions> </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>
<plugin> <plugin>
@ -537,10 +544,10 @@
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest> </manifest>
<manifestEntries> <manifestEntries>
<SCM-Revision>${git.commit.id}</SCM-Revision> <SCM-Revision>${buildNumber}</SCM-Revision>
<Build-Time>${buildDate}</Build-Time> <Build-Time>${buildDate}</Build-Time>
<SCM-Branch>${git.branch}</SCM-Branch> <SCM-Branch>${scmBranch}</SCM-Branch>
<SCM-Revision-URL>${project.scm.url}/commit/${git.commit.id}</SCM-Revision-URL> <SCM-Revision-URL>${project.scm.url}/commit/${buildNumber}</SCM-Revision-URL>
</manifestEntries> </manifestEntries>
</archive> </archive>
</configuration> </configuration>
@ -586,96 +593,96 @@
<artifactId>shared-assemblies</artifactId> <artifactId>shared-assemblies</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
<!-- uberjar creation --> <!-- uberjar creation -->
<execution> <execution>
<id>make-uberjar</id> <id>make-uberjar</id>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>gcube-uberjar</descriptorRef> <descriptorRef>gcube-uberjar</descriptorRef>
</descriptorRefs> </descriptorRefs>
<!-- <!--
override the plugin-scope configuration that some components have in their pom: override the plugin-scope configuration that some components have in their pom:
<descriptors> <descriptors>
<descriptor>${distroDirectory}/descriptor.xml</descriptor> <descriptor>${distroDirectory}/descriptor.xml</descriptor>
</descriptors> </descriptors>
If not done, the servicearchive will be built also during this execution. If not done, the servicearchive will be built also during this execution.
--> -->
<descriptors combine.self="override"></descriptors> <descriptors combine.self="override"></descriptors>
<!-- <!--
make sure the "-src" is appended to the filename. It is the default make sure the "-src" is appended to the filename. It is the default
behaviour but it has been set explicitly because some components behaviour but it has been set explicitly because some components
(e.g. ghn-distribution) set it to false in their pom (e.g. ghn-distribution) set it to false in their pom
--> -->
<appendAssemblyId>true</appendAssemblyId> <appendAssemblyId>true</appendAssemblyId>
</configuration> </configuration>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
<!-- default servicearchive creation--> <!-- default servicearchive creation-->
<execution> <execution>
<id>make-servicearchive</id> <id>make-servicearchive</id>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>gcube-default-servicearchive</descriptorRef> <descriptorRef>gcube-default-servicearchive</descriptorRef>
</descriptorRefs> </descriptorRefs>
<!-- <!--
override the plugin-scope configuration that some components have in their pom: override the plugin-scope configuration that some components have in their pom:
<descriptors> <descriptors>
<descriptor>${distroDirectory}/descriptor.xml</descriptor> <descriptor>${distroDirectory}/descriptor.xml</descriptor>
</descriptors> </descriptors>
If not done, the servicearchive will be built also during this execution. If not done, the servicearchive will be built also during this execution.
--> -->
<descriptors combine.self="override"></descriptors> <descriptors combine.self="override"></descriptors>
<!-- <!--
make sure the "-src" is appended to the filename. It is the default make sure the "-src" is appended to the filename. It is the default
behaviour but it has been set explicitly because some components behaviour but it has been set explicitly because some components
(e.g. ghn-distribution) set it to false in their pom (e.g. ghn-distribution) set it to false in their pom
--> -->
<appendAssemblyId>true</appendAssemblyId> <appendAssemblyId>true</appendAssemblyId>
</configuration> </configuration>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
<!-- source package creation --> <!-- source package creation -->
<execution> <execution>
<id>make-source-package</id> <id>make-source-package</id>
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>gcube-source-package</descriptorRef> <descriptorRef>gcube-source-package</descriptorRef>
</descriptorRefs> </descriptorRefs>
<!-- <!--
override the plugin-scope configuration that some components have in their pom: override the plugin-scope configuration that some components have in their pom:
<descriptors> <descriptors>
<descriptor>${distroDirectory}/descriptor.xml</descriptor> <descriptor>${distroDirectory}/descriptor.xml</descriptor>
</descriptors> </descriptors>
If not done, the servicearchive will be built also during this execution. If not done, the servicearchive will be built also during this execution.
--> -->
<descriptors combine.self="override"></descriptors> <descriptors combine.self="override"></descriptors>
<!-- <!--
make sure the "-src" is appended to the filename. It is the default make sure the "-src" is appended to the filename. It is the default
behaviour but it has been set explicitly because some components behaviour but it has been set explicitly because some components
(e.g. ghn-distribution) set it to false in their pom (e.g. ghn-distribution) set it to false in their pom
--> -->
<appendAssemblyId>true</appendAssemblyId> <appendAssemblyId>true</appendAssemblyId>
</configuration> </configuration>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
@ -772,8 +779,8 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>pl.project13.maven</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>git-commit-id-plugin</artifactId> <artifactId>buildnumber-maven-plugin</artifactId>
</plugin> </plugin>
<!-- enforce integration build requirements --> <!-- enforce integration build requirements -->