Code cleanup

Gaetan Boismal

04.00.2016 ccab156039cbb22408ffe623e169bd15dcfcfbdc

Code cleanup

Factor out build-helper-maven-plugin:version and parse-version execution
declaration.

 opendj-dsml-servlet/pom.xml

@@ -78,15 +78,6 @@
            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
                <version>1.8</version>
                <executions>
                    <execution>
                        <id>parse-version</id>
                        <goals>
                            <goal>parse-version</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>

            <plugin>

 opendj-server-legacy/pom.xml

@@ -586,8 +586,9 @@
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>build-helper-maven-plugin</artifactId>
        <version>1.8</version>
        <executions>
          <!-- Run inherited 'parse-version' execution to generate properties (major.version, minor.version, ...) -->

          <!-- Take into account several sources directories for the build -->
          <execution>
            <id>main-java-sources</id>
@@ -605,13 +606,6 @@
              </sources>
            </configuration>
          </execution>
          <!-- Parse version to generate properties (major.version, minor.version, ...) -->
          <execution>
            <id>parse-version</id>
            <goals>
              <goal>parse-version</goal>
            </goals>
          </execution>

          <!-- Attach localized jars to this module -->
          <execution>
@@ -1401,7 +1395,6 @@
          <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>build-helper-maven-plugin</artifactId>
            <version>1.7</version>
            <executions>
              <!-- Add snmp source directory and snmp generated directory as sources -->
              <execution>

 opendj-server/pom.xml

@@ -12,7 +12,7 @@
  Header, with the fields enclosed by brackets [] replaced by your own identifying
  information: "Portions Copyright [year] [name of copyright owner]".

  Copyright 2013-2015 ForgeRock AS.
  Copyright 2013-2016 ForgeRock AS.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
@@ -83,20 +83,14 @@
        <filtering>true</filtering>
      </resource>
    </resources>

    <plugins>
      <!-- Parse version to generate properties (major.version, minor.version, ...) -->
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>build-helper-maven-plugin</artifactId>
        <version>1.8</version>
        <executions>
          <execution>
            <id>parse-version</id>
            <goals>
              <goal>parse-version</goal>
            </goals>
          </execution>
        </executions>
      </plugin>

      <!-- Retrieve the SVN revision number and the build timestamp -->
      <plugin>
        <groupId>org.codehaus.mojo</groupId>

 pom.xml

@@ -159,6 +159,21 @@
                    <version>${project.version}</version>
                </plugin>

                <plugin>
                    <groupId>org.codehaus.mojo</groupId>
                    <artifactId>build-helper-maven-plugin</artifactId>
                    <version>1.8</version>
                    <executions>
                        <!-- Parse version to generate properties (major.version, minor.version, ...) -->
                        <execution>
                            <id>parse-version</id>
                            <goals>
                                <goal>parse-version</goal>
                            </goals>
                        </execution>
                    </executions>
                </plugin>

                <!--
                | This plugin's configuration is used to store Eclipse m2e settings only.
                | It has no influence on the Maven build itself.