From 0f6ed2441d11976f0cfc99af052a7c9bfde2750e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 04 Mar 2016 16:29:56 +0000
Subject: [PATCH] OPENDJ-2582 Consequences of changes done in the sdk
---
opendj-server/pom.xml | 33 ++--------------
opendj-server-legacy/pom.xml | 31 ++-------------
pom.xml | 21 ++++++++++
3 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 4f3fde2..277f9c4 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -614,36 +614,13 @@
</executions>
</plugin>
- <!-- Retrieve the SVN revision number and the build timestamp -->
+ <!--
+ Retrieve the SCM revision number and store it into the ${buildRevision} property
+ and retrieve the build timestamp and store it into the ${buildDateTime} property
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>generate-buildnumber</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
- <revisionOnScmFailure>-1</revisionOnScmFailure>
- </configuration>
- </execution>
- <execution>
- <id>generate-timestamp</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <format>{0,date,yyyyMMddHHmmss}</format>
- <items>
- <item>timestamp</item>
- </items>
- <buildNumberPropertyName>buildDateTime</buildNumberPropertyName>
- </configuration>
- </execution>
- </executions>
</plugin>
<!-- Compile unit tests -->
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 77dd23d..12bbc75 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -91,38 +91,15 @@
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
- <!-- Retrieve the SVN revision number and the build timestamp -->
+ <!--
+ Retrieve the SCM revision number and store it into the ${buildRevision} property
+ and retrieve the build timestamp and store it into the ${buildDateTime} property
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>generate-buildnumber</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <useLastCommittedRevision>true</useLastCommittedRevision>
- <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
- <revisionOnScmFailure>-1</revisionOnScmFailure>
- </configuration>
- </execution>
- <execution>
- <id>generate-timestamp</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <format>{0,date,yyyyMMddHHmmss}</format>
- <items>
- <item>timestamp</item>
- </items>
- <buildNumberPropertyName>buildDateTime</buildNumberPropertyName>
- </configuration>
- </execution>
- </executions>
</plugin>
+
<plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>i18n-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index be376fd..122b631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,27 @@
</executions>
</plugin>
+ <!-- Retrieve the build timestamp -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-timestamp</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <format>{0,date,yyyyMMddHHmmss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ <buildNumberPropertyName>buildDateTime</buildNumberPropertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!--
| This plugin's configuration is used to store Eclipse m2e settings only.
| It has no influence on the Maven build itself.
--
Gitblit v1.10.0