Switch to git-commit-id-plugin.
This commit is contained in:
parent
17346a99eb
commit
cb1946c0e0
58
pom.xml
58
pom.xml
|
@ -347,7 +347,7 @@
|
|||
<name>build_commits.csv</name>
|
||||
<append>true</append>
|
||||
<lines>
|
||||
<line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${scmBranch},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName}</line>
|
||||
<line>${project.groupId},${project.artifactId},${project.version},${project.scm.url},${git.branch},${git.commit.id},${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},${scmBranch},${buildNumber},${repository.jenkins.staging.url},${project.build.finalName}</line>
|
||||
<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>
|
||||
</lines>
|
||||
</file>
|
||||
</files>
|
||||
|
@ -500,37 +500,30 @@
|
|||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>buildnumber-maven-plugin</artifactId>
|
||||
<version>1.4</version>
|
||||
|
||||
<groupId>pl.project13.maven</groupId>
|
||||
<artifactId>git-commit-id-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>useLastCommittedRevision</id>
|
||||
<id>get-the-git-infos</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
<goal>create</goal>
|
||||
<goal>revision</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>
|
||||
|
@ -544,10 +537,10 @@
|
|||
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<SCM-Revision>${buildNumber}</SCM-Revision>
|
||||
<Build-Time>${scmDate}</Build-Time>
|
||||
<SCM-Branch>${scmBranch}</SCM-Branch>
|
||||
<SCM-Revision-URL>${project.scm.url}/commit/${buildNumber}</SCM-Revision-URL>
|
||||
<SCM-Revision>${git.commit.id}</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>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
|
@ -779,9 +772,8 @@
|
|||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>buildnumber-maven-plugin</artifactId>
|
||||
|
||||
<groupId>pl.project13.maven</groupId>
|
||||
<artifactId>git-commit-id-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<!-- enforce integration build requirements -->
|
||||
|
|
Loading…
Reference in New Issue