mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Gaetan Boismal
03.04.2016 0f6ed2441d11976f0cfc99af052a7c9bfde2750e
OPENDJ-2582 Consequences of changes done in the sdk

The buildnumber-maven-plugin execution which allows to retrieve SCM
build revision has been factored out in the sdk.
This commit removes duplicated code and factors out build timestamp
generation code in server-parent pom.
3 files modified
85 ■■■■■ changed files
opendj-server-legacy/pom.xml 31 ●●●● patch | view | raw | blame | history
opendj-server/pom.xml 33 ●●●● patch | view | raw | blame | history
pom.xml 21 ●●●●● patch | view | raw | blame | history
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 -->
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>
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.