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

Jean-Noel Rouvignac
21.47.2014 4d0e8590581808b1a85e05cc9096adedc0fe5f2d
Moved clirr-maven-plugin declaration to a profile in forgerock-parent.
The profile is activated by the presence of the differences file.

Code review: Matthew Swift


opendj-parent/pon.xml:
Now depends on forgerock-parent 1.2.1-SNAPSHOT to inherit clirr profile.

opendj-ldap-sdk/pon.xml:
Do not specify clirrVersion (now clirrPluginVersion) here anymore.
Removed build and reporting plugin declarations now inherited from forgerock-parent.
2 files modified
43 ■■■■■ changed files
opendj-ldap-sdk/pom.xml 36 ●●●●● patch | view | raw | blame | history
pom.xml 7 ●●●●● patch | view | raw | blame | history
opendj-ldap-sdk/pom.xml
@@ -62,7 +62,6 @@
      *
    </opendj.osgi.import>
    <clirrComparisonVersion>2.6.0</clirrComparisonVersion>
    <clirrVersion>2.6.1</clirrVersion>
  </properties>
  <build>
    <plugins>
@@ -96,29 +95,6 @@
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-source-plugin</artifactId>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>clirr-maven-plugin</artifactId>
        <version>${clirrVersion}</version>
        <configuration>
          <comparisonVersion>${clirrComparisonVersion}</comparisonVersion>
          <excludes>
            <exclude>com/forgerock/**</exclude>
          </excludes>
          <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
        </configuration>
        <executions>
          <execution>
            <id>mvn clirr:check</id>
          </execution>
          <execution>
            <id>mvn verify</id>
            <goals>
              <goal>check</goal>
            </goals>
          </execution>
        </executions>
      </plugin>
    </plugins>
  </build>
  <reporting>
@@ -147,18 +123,6 @@
          </links>
        </configuration>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>clirr-maven-plugin</artifactId>
        <version>${clirrVersion}</version>
        <configuration>
          <comparisonVersion>${clirrComparisonVersion}</comparisonVersion>
          <excludes>
            <exclude>com/forgerock/**</exclude>
          </excludes>
          <ignoredDifferencesFile>clirr-ignored-api-changes.xml</ignoredDifferencesFile>
        </configuration>
      </plugin>
    </plugins>
  </reporting>
</project>
pom.xml
@@ -21,14 +21,15 @@
  !
  ! CDDL HEADER END
  !
  !      Copyright 2011-2013 ForgeRock AS
  !      Copyright 2011-2014 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">
-->
<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>
  <parent>
    <groupId>org.forgerock</groupId>
    <artifactId>forgerock-parent</artifactId>
    <version>1.2.0</version>
    <version>1.2.1-SNAPSHOT</version>
  </parent>
  <groupId>org.forgerock.opendj</groupId>
  <artifactId>opendj-project</artifactId>