mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: a315e2ea | patch | commit | show whitespace
Matthew Swift
30.10.2015 c337e6ca30bfc9c71326aba41cca00230214fb6a 
OPENDJ-2402: Decouple SDK versioning from server versioning in pom files
6 files modified
161 ■■■■■ changed files
opendj-config/pom.xml 18 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap-servlet/pom.xml 3 ●●●●● patch | view | raw | blame | history
opendj-server-example-plugin/pom.xml 3 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/pom.xml 38 ●●●●● patch | view | raw | blame | history
opendj-server/pom.xml 7 ●●●●● patch | view | raw | blame | history
pom.xml 92 ●●●●● patch | view | raw | blame | history 
 opendj-config/pom.xml


@@ -44,13 +44,6 @@


      <artifactId>i18n-core</artifactId>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <type>test-jar</type>


      <version>${project.version}</version>


      <scope>test</scope>


    </dependency>


    <dependency>


      <groupId>org.forgerock.commons</groupId>


      <artifactId>i18n-slf4j</artifactId>


    </dependency>


@@ -61,18 +54,20 @@


    <dependency>


      <groupId>org.forgerock</groupId>


      <artifactId>forgerock-build-tools</artifactId>


      <version>${forgerock-build-tools.version}</version>


      <scope>test</scope>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <version>${project.version}</version>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <type>test-jar</type>


      <scope>test</scope>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-cli</artifactId>


      <version>${project.version}</version>


    </dependency>




    <!-- We need to override testNG version to make test works (see OPENDJ-2389) -->


@@ -153,7 +148,6 @@


      <plugin>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-maven-plugin</artifactId>


        <version>${project.version}</version>


        <executions>


          <execution>


            <id>generate-config</id>




 opendj-rest2ldap-servlet/pom.xml


@@ -48,17 +48,14 @@


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-rest2ldap</artifactId>


      <version>${project.version}</version>


    </dependency>




    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-grizzly</artifactId>


      <version>${project.version}</version>


    </dependency>


  </dependencies>






  <build>


    <plugins>


      <plugin>




 opendj-server-example-plugin/pom.xml


@@ -41,12 +41,10 @@


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <version>${project.version}</version>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-config</artifactId>


      <version>${project.version}</version>


    </dependency>


    <dependency>


      <groupId>org.forgerock.commons</groupId>


@@ -80,7 +78,6 @@


      <plugin>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-maven-plugin</artifactId>


        <version>${project.version}</version>


        <executions>


          <execution>


            <id>generate-config</id>




 opendj-server-legacy/pom.xml


@@ -70,10 +70,6 @@


    <docGuideAdminUrl>http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/</docGuideAdminUrl>


    <locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</locales>




    <!-- Dependencies version properties -->


    <project.version>3.0.0-SNAPSHOT</project.version>


    <i18n.version>1.4.2-SNAPSHOT</i18n.version>




    <!-- Other properties -->


    <checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>


    <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>


@@ -95,8 +91,12 @@


    <!-- ForgeRock libraries -->


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-cli</artifactId>


    </dependency>




    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-rest2ldap</artifactId>


      <version>${project.version}</version>


    </dependency>




    <dependency>


@@ -107,26 +107,16 @@


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-config</artifactId>


      <version>${project.version}</version>


    </dependency>




    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-server</artifactId>


      <version>${project.version}</version>


    </dependency>




    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-cli</artifactId>


      <version>${project.version}</version>


    </dependency>




    <dependency>


      <groupId>org.forgerock</groupId>


      <artifactId>forgerock-build-tools</artifactId>


      <version>${forgerock-build-tools.version}</version>


      <scope>test</scope>


    </dependency>




    <dependency>


@@ -188,22 +178,9 @@


    </dependency>




    <dependency>


      <groupId>org.assertj</groupId>


      <artifactId>assertj-core</artifactId>


      <scope>test</scope>


    </dependency>




    <dependency>


      <groupId>org.mockito</groupId>


      <artifactId>mockito-all</artifactId>


      <scope>test</scope>


    </dependency>




    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <type>test-jar</type>


      <version>${project.version}</version>


      <scope>test</scope>


    </dependency>




@@ -224,7 +201,7 @@


    <dependency>


      <groupId>org.forgerock.commons</groupId>


      <artifactId>forgerock-persistit-core</artifactId>


      <version>4.1.0-SNAPSHOT</version>


      <version>4.2.0</version>


    </dependency>


  </dependencies>




@@ -525,7 +502,6 @@


      <plugin>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-maven-plugin</artifactId>


        <version>${project.version}</version>


        <executions>


          <execution>


            <id>generate-bootstrap-manifest</id>


@@ -1631,7 +1607,6 @@


          <plugin>


            <groupId>org.forgerock.opendj</groupId>


            <artifactId>opendj-doc-maven-plugin</artifactId>


            <version>${project.version}</version>


            <executions>


              <execution>


                <id>generate-man-pages</id>


@@ -2045,7 +2020,6 @@


          <plugin>


            <groupId>org.forgerock.opendj</groupId>


            <artifactId>opendj-doc-maven-plugin</artifactId>


            <version>${project.version}</version>


            <!--


              Configuration reference generation requires


              that opendj-config be on the runtime classpath for the plugin.




 opendj-server/pom.xml


@@ -51,17 +51,14 @@


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <version>${project.version}</version>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-grizzly</artifactId>


      <version>${project.version}</version>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-config</artifactId>


      <version>${project.version}</version>


    </dependency>


    <dependency>


      <groupId>org.forgerock.commons</groupId>


@@ -79,19 +76,15 @@


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-core</artifactId>


      <type>test-jar</type>


      <version>${project.version}</version>


      <scope>test</scope>


    </dependency>


    <dependency>


      <groupId>org.forgerock</groupId>


      <artifactId>forgerock-build-tools</artifactId>


      <version>${forgerock-build-tools.version}</version>


      <scope>test</scope>


    </dependency>


    <dependency>


      <groupId>org.forgerock.opendj</groupId>


      <artifactId>opendj-cli</artifactId>


      <version>${project.version}</version>


    </dependency>


  </dependencies>


  <build>




 pom.xml


@@ -102,9 +102,14 @@


    <mavenRepoSnapshots>http://maven.forgerock.org/repo/snapshots</mavenRepoSnapshots>


    <mavenRepoReleases>http://maven.forgerock.org/repo/releases</mavenRepoReleases>




    <!--


     | Until final release the SDK and server share the same version. Re-using the


     | project.version here avoids the need to update it before releasing milestones.


     -->


    <opendj-sdk.version>${project.version}</opendj-sdk.version>


    <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>


    <i18n-framework.version>1.4.2-SNAPSHOT</i18n-framework.version>


    <forgerock-doc-plugin.version>3.1.0-SNAPSHOT</forgerock-doc-plugin.version>


    <i18n-framework.version>1.4.2</i18n-framework.version>


    <forgerock-doc-plugin.version>3.1.0</forgerock-doc-plugin.version>




    <!-- OSGi bundles properties -->


    <opendj.osgi.import.additional />


@@ -144,6 +149,21 @@


    <pluginManagement>


      <plugins>


        <plugin>


          <groupId>org.forgerock.opendj</groupId>


          <artifactId>opendj-copyright-maven-plugin</artifactId>


          <version>${opendj-sdk.version}</version>


        </plugin>


        <plugin>


          <groupId>org.forgerock.opendj</groupId>


          <artifactId>opendj-doc-maven-plugin</artifactId>


          <version>${opendj-sdk.version}</version>


        </plugin>


        <plugin>


          <groupId>org.forgerock.opendj</groupId>


          <artifactId>opendj-maven-plugin</artifactId>


          <version>${project.version}</version>


        </plugin>


        <plugin>


          <inherited>true</inherited>


          <groupId>org.apache.maven.plugins</groupId>


          <artifactId>maven-compiler-plugin</artifactId>


@@ -248,7 +268,7 @@


                  <pluginExecutionFilter>


                    <groupId>org.forgerock.opendj</groupId>


                    <artifactId>opendj-maven-plugin</artifactId>


                    <versionRange>[1.0.0-SNAPSHOT,)</versionRange>


                    <versionRange>[1.0.0,)</versionRange>


                    <goals>


                      <goal>generate-config</goal>


                    </goals>


@@ -351,6 +371,7 @@




  <dependencyManagement>


    <dependencies>


      <!-- Commons -->


      <dependency>


        <groupId>org.forgerock.commons</groupId>


        <artifactId>forgerock-bom</artifactId>


@@ -358,24 +379,73 @@


        <scope>import</scope>


        <type>pom</type>


      </dependency>


      <dependency>


        <groupId>org.forgerock</groupId>


        <artifactId>forgerock-build-tools</artifactId>


        <version>${forgerock-build-tools.version}</version>


        <scope>test</scope>


      </dependency>




      <!-- I18N framework -->


      <dependency>


        <groupId>org.forgerock.commons</groupId>


        <artifactId>i18n-core</artifactId>


        <version>${i18n-framework.version}</version>


        <scope>compile</scope>


      </dependency>




      <dependency>


        <groupId>org.forgerock.commons</groupId>


        <artifactId>i18n-slf4j</artifactId>


        <version>${i18n-framework.version}</version>


        <scope>compile</scope>


      </dependency>




      <!-- OpenDJ SDK -->


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-cli</artifactId>


        <version>${opendj-sdk.version}</version>


      </dependency>


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-core</artifactId>


        <version>${opendj-sdk.version}</version>


      </dependency>


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-core</artifactId>


        <type>test-jar</type>


        <version>${opendj-sdk.version}</version>


        <scope>test</scope>


      </dependency>


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-grizzly</artifactId>


        <version>${opendj-sdk.version}</version>


      </dependency>


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-rest2ldap</artifactId>


        <version>${opendj-sdk.version}</version>


      </dependency>




      <!-- OpenDJ Server -->


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-config</artifactId>


        <version>${project.version}</version>


      </dependency>


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-legacy</artifactId>


        <version>${project.version}</version>


      </dependency>


      <dependency>


        <groupId>org.forgerock.opendj</groupId>


        <artifactId>opendj-server</artifactId>


        <version>${project.version}</version>


      </dependency>


    </dependencies>


  </dependencyManagement>






  <dependencies>


    <dependency>


      <groupId>org.easytesting</groupId>


@@ -384,6 +454,12 @@


    </dependency>




    <dependency>


      <groupId>org.assertj</groupId>


      <artifactId>assertj-core</artifactId>


      <scope>test</scope>


    </dependency>




    <dependency>


      <groupId>org.mockito</groupId>


      <artifactId>mockito-all</artifactId>


      <scope>test</scope>


@@ -421,7 +497,6 @@


          <plugin>


            <groupId>org.forgerock.opendj</groupId>


            <artifactId>opendj-copyright-maven-plugin</artifactId>


            <version>3.0.0-SNAPSHOT</version>


            <executions>


                <execution>


                    <id>check-copyright</id>


@@ -442,7 +517,6 @@


            <plugin>


              <groupId>org.forgerock.opendj</groupId>


              <artifactId>opendj-copyright-maven-plugin</artifactId>


              <version>3.0.0-SNAPSHOT</version>


              <executions>


                  <execution>


                    <id>check-copyright</id>