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

Matthew Swift
28.30.2015 c1b2a0d6cf318246d723650812575f1ab1258dad
[maven-release-plugin] prepare branch b2.8
17 files modified
125 ■■■■■ changed files
opendj-sdk/opendj-cli/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-config/pom.xml 5 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-copyright-maven-plugin/pom.xml 8 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-core/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-doc-maven-plugin/pom.xml 7 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-grizzly/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-ldap-sdk-examples/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-ldap-toolkit/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-legacy/pom.xml 5 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-maven-plugin/pom.xml 5 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-rest2ldap-servlet/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-rest2ldap/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-sdk/opendj-server-example-plugin/pom.xml 5 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-server-legacy/pom.xml 50 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-server/pom.xml 7 ●●●●● patch | view | raw | blame | history
opendj-sdk/opendj-svn-property-check-maven-plugin/pom.xml 7 ●●●●● patch | view | raw | blame | history
opendj-sdk/pom.xml 12 ●●●● patch | view | raw | blame | history
opendj-sdk/opendj-cli/pom.xml
@@ -29,7 +29,7 @@
  <parent>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-cli</artifactId>
  <name>OpenDJ CLI API</name>
opendj-sdk/opendj-config/pom.xml
@@ -25,13 +25,12 @@
  !      Copyright 2013 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>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-config</artifactId>
  <name>OpenDJ Configuration API</name>
opendj-sdk/opendj-copyright-maven-plugin/pom.xml
@@ -1,16 +1,14 @@
<?xml version="1.0"?>
<project
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<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>
        <artifactId>opendj-project</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>3.0.0-SNAPSHOT</version>
        <version>2.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>opendj-copyright-maven-plugin</artifactId>
    <version>1.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
    <name>OpenDJ Copyright Check Maven Plugin</name>
    <description>
    Checks ForgeRock source file copyrights.
opendj-sdk/opendj-core/pom.xml
@@ -29,7 +29,7 @@
  <parent>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-core</artifactId>
  <name>OpenDJ Core APIs</name>
opendj-sdk/opendj-doc-maven-plugin/pom.xml
@@ -24,16 +24,13 @@
  !      Copyright 2015 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>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-doc-maven-plugin</artifactId>
opendj-sdk/opendj-grizzly/pom.xml
@@ -29,7 +29,7 @@
  <parent>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-grizzly</artifactId>
  <name>OpenDJ Grizzly Transport Provider</name>
opendj-sdk/opendj-ldap-sdk-examples/pom.xml
@@ -29,7 +29,7 @@
  <parent>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-ldap-sdk-examples</artifactId>
  <name>OpenDJ SDK Examples</name>
opendj-sdk/opendj-ldap-toolkit/pom.xml
@@ -29,7 +29,7 @@
  <parent>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-ldap-toolkit</artifactId>
  <name>OpenDJ SDK Toolkit</name>
opendj-sdk/opendj-legacy/pom.xml
@@ -15,13 +15,12 @@
  ! Copyright 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>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-legacy</artifactId>
  <name>OpenDJ Legacy</name>
opendj-sdk/opendj-maven-plugin/pom.xml
@@ -25,13 +25,12 @@
  !      Copyright 2015 ForgeRock AS.
  !
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<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>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-maven-plugin</artifactId>
opendj-sdk/opendj-rest2ldap-servlet/pom.xml
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-project</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>3.0.0-SNAPSHOT</version>
        <version>2.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>opendj-rest2ldap-servlet</artifactId>
    <name>OpenDJ Commons REST LDAP Gateway</name>
opendj-sdk/opendj-rest2ldap/pom.xml
@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-project</artifactId>
        <groupId>org.forgerock.opendj</groupId>
        <version>3.0.0-SNAPSHOT</version>
        <version>2.8.0-SNAPSHOT</version>
    </parent>
    <artifactId>opendj-rest2ldap</artifactId>
    <name>OpenDJ Commons REST Adapter</name>
opendj-sdk/opendj-server-example-plugin/pom.xml
@@ -24,13 +24,12 @@
  !      Copyright 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>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server-example-plugin</artifactId>
  <name>OpenDJ Server Example Plugin</name>
opendj-sdk/opendj-server-legacy/pom.xml
@@ -25,14 +25,13 @@
  !      Copyright 2011-2015 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.opendj</groupId>
    <artifactId>opendj-project</artifactId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server-legacy</artifactId>
  <packaging>jar</packaging>
@@ -64,7 +63,7 @@
    <!-- Product information properties -->
    <shortProductName>OpenDJ</shortProductName>
    <lowerCaseProductName>opendj</lowerCaseProductName>
    <patchFixIds></patchFixIds>
    <patchFixIds />
    <isDebugBuild>false</isDebugBuild>
    <docHomepageUrl>http://opendj.forgerock.org/</docHomepageUrl>
    <docWikiUrl>http://opendj.forgerock.org/docs.html</docWikiUrl>
@@ -1046,12 +1045,8 @@
                  <fileset dir="${old.config.files.path}/config/xml/org/forgerock/opendj/server/config/" />
                </move>
                <delete dir="${old.config.files.path}/config" />
                <replace dir="${old.config.files.path}"
                         token="org.forgerock.opendj.server.config"
                         value="org.opends.server.admin.std"/>
                <replace dir="${old.config.files.path}"
                         token="http://opendj.forgerock.org/admin"
                         value="http://www.opends.org/admin"/>
                <replace dir="${old.config.files.path}" token="org.forgerock.opendj.server.config" value="org.opends.server.admin.std" />
                <replace dir="${old.config.files.path}" token="http://opendj.forgerock.org/admin" value="http://www.opends.org/admin" />
              </target>
            </configuration>
            <goals>
@@ -1098,33 +1093,14 @@
            </goals>
            <configuration>
              <target>
                <zip
                  destfile="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip">
                  <zipfileset
                    dir="${project.build.directory}/package/${lowerCaseProductName}"
                    includes="**/*"
                    excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
                    filemode="644" dirmode="755" prefix="opendj" />
                  <zipfileset
                    dir="${project.build.directory}/package/${lowerCaseProductName}"
                    includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh"
                    filemode="755" dirmode="755" prefix="opendj" />
                  <zipfileset
                    dir="${project.build.directory}/package/${lowerCaseProductName}"
                    includes="bin/*" filemode="755" dirmode="755"
                    prefix="opendj" />
                  <zipfileset
                    dir="${project.build.directory}/package/${lowerCaseProductName}"
                    includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
                    filemode="755" dirmode="755" prefix="opendj" />
                  <zipfileset
                    dir="${project.build.directory}/package/${lowerCaseProductName}"
                    includes="template/**/*" filemode="444" dirmode="744"
                    prefix="opendj" />
                <zip destfile="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip">
                  <zipfileset dir="${project.build.directory}/package/${lowerCaseProductName}" includes="**/*" excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub" filemode="644" dirmode="755" prefix="opendj" />
                  <zipfileset dir="${project.build.directory}/package/${lowerCaseProductName}" includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh" filemode="755" dirmode="755" prefix="opendj" />
                  <zipfileset dir="${project.build.directory}/package/${lowerCaseProductName}" includes="bin/*" filemode="755" dirmode="755" prefix="opendj" />
                  <zipfileset dir="${project.build.directory}/package/${lowerCaseProductName}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub" filemode="755" dirmode="755" prefix="opendj" />
                  <zipfileset dir="${project.build.directory}/package/${lowerCaseProductName}" includes="template/**/*" filemode="444" dirmode="744" prefix="opendj" />
                </zip>
                <attachartifact
                  file="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip"
                  type="zip" />
                <attachartifact file="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip" type="zip" />
              </target>
            </configuration>
          </execution>
@@ -1225,7 +1201,7 @@
          <plugin>
            <groupId>org.forgerock.opendj</groupId>
            <artifactId>opendj-svn-property-check-maven-plugin</artifactId>
            <version>1.0.0-SNAPSHOT</version>
            <version>2.8.0-SNAPSHOT</version>
            <executions>
              <execution>
                <id>check-eol-property</id>
opendj-sdk/opendj-server/pom.xml
@@ -24,13 +24,12 @@
  !      Copyright 2013 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>
    <artifactId>opendj-project</artifactId>
    <groupId>org.forgerock.opendj</groupId>
    <version>3.0.0-SNAPSHOT</version>
    <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server</artifactId>
  <name>OpenDJ Server</name>
@@ -41,7 +40,7 @@
  <properties>
    <!-- Product information properties -->
    <shortProductName>OpenDJ</shortProductName>
    <patchFixIds></patchFixIds>
    <patchFixIds />
    <isDebugBuild>false</isDebugBuild>
    <docHomepageUrl>http://opendj.forgerock.org/</docHomepageUrl>
    <docWikiUrl>http://opendj.forgerock.org/docs.html</docWikiUrl>
opendj-sdk/opendj-svn-property-check-maven-plugin/pom.xml
@@ -24,17 +24,16 @@
 !      Copyright 2015 ForgeRock AS
 !    
 -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<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>
     <artifactId>opendj-project</artifactId>
     <groupId>org.forgerock.opendj</groupId>
     <version>3.0.0-SNAPSHOT</version>
     <version>2.8.0-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-svn-property-check-maven-plugin</artifactId>
  <version>1.0.0-SNAPSHOT</version>
  <version>2.8.0-SNAPSHOT</version>
  <name>OpenDJ Check SVN property maven plugin</name>
  <description>
    Checks ForgeRock source file copyrights.
opendj-sdk/pom.xml
@@ -33,7 +33,7 @@
  </parent>
  <groupId>org.forgerock.opendj</groupId>
  <artifactId>opendj-project</artifactId>
  <version>3.0.0-SNAPSHOT</version>
  <version>2.8.0-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>OpenDJ Directory Services Project</name>
  <description>
@@ -64,9 +64,9 @@
    </mailingList>
  </mailingLists>
  <scm>
    <url>https://svn.forgerock.org/opendj/trunk/opendj/</url>
    <connection>scm:svn:https://svn.forgerock.org/opendj/trunk/opendj/</connection>
    <developerConnection>scm:svn:https://svn.forgerock.org/opendj/trunk/opendj/</developerConnection>
    <url>https://svn.forgerock.org/opendj/fr-branches/b2.8</url>
    <connection>scm:svn:https://svn.forgerock.org/opendj/fr-branches/b2.8</connection>
    <developerConnection>scm:svn:https://svn.forgerock.org/opendj/fr-branches/b2.8</developerConnection>
  </scm>
  <ciManagement>
    <system>jenkins</system>
@@ -533,7 +533,7 @@
          <plugin>
            <groupId>org.forgerock.opendj</groupId>
            <artifactId>opendj-copyright-maven-plugin</artifactId>
            <version>1.0.0-SNAPSHOT</version>
            <version>2.8.0-SNAPSHOT</version>
            <executions>
                <execution>
                    <id>check-copyright</id>
@@ -554,7 +554,7 @@
            <plugin>
              <groupId>org.forgerock.opendj</groupId>
              <artifactId>opendj-copyright-maven-plugin</artifactId>
              <version>1.0.0-SNAPSHOT</version>
              <version>2.8.0-SNAPSHOT</version>
              <executions>
                  <execution>
                    <id>check-copyright</id>