gCubeSystem
/
maven-parent
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pom.xml
View File

@ -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>
@ -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>
@ -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 -->