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

Bruno Lavit
26.02.2015 482e359e5d411485277737d2e2bde0ebee47def9
Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 9489a0ac355de3321e8c5a5a0920f0a7103b2416.
13 files modified
159 ■■■■■ changed files
opendj-packages/opendj-deb/opendj-deb-oem/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-deb/pom.xml 17 ●●●●● patch | view | raw | blame | history
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml 78 ●●●● patch | view | raw | blame | history
opendj-packages/opendj-msi/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-rpm/pom.xml 18 ●●●●● patch | view | raw | blame | history
opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-svr4/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/opendj-zip/opendj-zip-oem/pom.xml 8 ●●●●● patch | view | raw | blame | history
opendj-packages/opendj-zip/pom.xml 4 ●●● patch | view | raw | blame | history
opendj-packages/pom.xml 6 ●●●●● patch | view | raw | blame | history
opendj-packages/opendj-deb/opendj-deb-oem/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-deb/pom.xml
@@ -24,7 +24,9 @@
  !      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>
    <packaging>pom</packaging>
@@ -54,9 +56,9 @@
        <deb.maintainer>opendj@forgerock.org</deb.maintainer>
        <manpage.dir>${project.build.directory}/dependency/man</manpage.dir>
        <deb.doc.homepage.url>http://opendj.forgerock.org/</deb.doc.homepage.url>
        <deb.product.name />
        <deb.product.name.lowercase />
        <deb.resources.path />
        <deb.product.name/>
        <deb.product.name.lowercase/>
        <deb.resources.path/>
    </properties>
    <build>
@@ -124,7 +126,8 @@
                            </goals>
                            <configuration>
                                <target>
                                    <gzip src="${deb.resources.path}/changelog" destfile="${project.build.directory}/deb/changelog.Debian.gz" />
                                    <gzip src="${deb.resources.path}/changelog"
                                          destfile="${project.build.directory}/deb/changelog.Debian.gz"/>
                                </target>
                            </configuration>
                        </execution>
@@ -138,8 +141,8 @@
                            <configuration>
                                <target>
                                    <apply executable="gzip"><!-- Must we also build these packages on Windows? -->
                                        <arg value="-9" />
                                        <fileset dir="${manpage.dir}" />
                                        <arg value="-9"/>
                                        <fileset dir="${manpage.dir}"/>
                                    </apply>
                                </target>
                            </configuration>
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
@@ -24,7 +24,9 @@
  !      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>
@@ -82,64 +84,64 @@
                                        <copy toDir="${project.build.directory}/msi/files">
                                            <fileset dir="${package.dir}">
                                                <!-- Exclude Mac apps -->
                                                <exclude name="QuickSetup.app/**" />
                                                <exclude name="Uninstall.app/**" />
                                                <exclude name="QuickSetup.app/**"/>
                                                <exclude name="Uninstall.app/**"/>
                                                <!-- Exclude shell scripts -->
                                                <exclude name="bin/**" />
                                                <exclude name="setup" />
                                                <exclude name="uninstall" />
                                                <exclude name="upgrade" />
                                                <exclude name="**/*.sh" />
                                                <exclude name="bin/**"/>
                                                <exclude name="setup"/>
                                                <exclude name="uninstall"/>
                                                <exclude name="upgrade"/>
                                                <exclude name="**/*.sh"/>
                                            </fileset>
                                        </copy>
                                        <mkdir dir="${project.build.directory}/msi/build" />
                                        <copy file="${msi.resources}/package.wxs" toDir="${project.build.directory}/msi/build" />
                                        <copy file="${msi.resources}/opendjbanner.bmp" toDir="${project.build.directory}/msi/build" />
                                        <copy file="${msi.resources}/opendjdialog.bmp" toDir="${project.build.directory}/msi/build" />
                                        <copy file="${msi.resources}/package.wxs" toDir="${project.build.directory}/msi/build"/>
                                        <copy file="${msi.resources}/opendjbanner.bmp" toDir="${project.build.directory}/msi/build"/>
                                        <copy file="${msi.resources}/opendjdialog.bmp" toDir="${project.build.directory}/msi/build"/>
                                        <mkdir dir="${project.build.directory}/msi/dist" />
                                        <!-- Construct a .wxs file from the directory structure -->
                                        <exec executable="heat.exe" dir="${project.build.directory}/msi/files">
                                            <arg value="dir" />
                                            <arg value="." />
                                            <arg value="-nologo" />
                                            <arg value="-cg" /> <arg value="all" />
                                            <arg value="-gg" />
                                            <arg value="-sfrag" />
                                            <arg value="-srd" />
                                            <arg value="-ke" />
                                            <arg value="-dr" /> <arg value="OPENDJ" />
                                            <arg value="-var" /> <arg value="var.src" />
                                            <arg value="-template" /> <arg value="fragment" />
                                            <arg value="-o" /> <arg value="${project.build.directory}/msi/build/payload.wxs" />
                                            <arg value="dir"/>
                                            <arg value="."/>
                                            <arg value="-nologo"/>
                                            <arg value="-cg"/> <arg value="all"/>
                                            <arg value="-gg"/>
                                            <arg value="-sfrag"/>
                                            <arg value="-srd"/>
                                            <arg value="-ke"/>
                                            <arg value="-dr"/> <arg value="OPENDJ"/>
                                            <arg value="-var"/> <arg value="var.src"/>
                                            <arg value="-template"/> <arg value="fragment"/>
                                            <arg value="-o"/> <arg value="${project.build.directory}/msi/build/payload.wxs"/>
                                        </exec>
                                        <!-- Compile all .wxs files into .wixobj files (fast) -->
                                        <exec executable="candle.exe" dir="${project.build.directory}/msi">
                                            <arg value="-nologo" />
                                            <arg value="-out" /> <arg value="${project.build.directory}/msi/build/" />
                                            <arg value="-dsrc=files" />
                                            <arg value="-dname=${product.name}" />
                                            <arg value="-dmajor=${parsedVersion.majorVersion}" />
                                            <arg value="-dminor=${parsedVersion.minorVersion}" />
                                            <arg value="-dpoint=${parsedVersion.incrementalVersion}" />
                                            <arg value="build/package.wxs" />
                                            <arg value="build/payload.wxs" />
                                            <arg value="-nologo"/>
                                            <arg value="-out"/> <arg value="${project.build.directory}/msi/build/"/>
                                            <arg value="-dsrc=files"/>
                                            <arg value="-dname=${product.name}"/>
                                            <arg value="-dmajor=${parsedVersion.majorVersion}"/>
                                            <arg value="-dminor=${parsedVersion.minorVersion}"/>
                                            <arg value="-dpoint=${parsedVersion.incrementalVersion}"/>
                                            <arg value="build/package.wxs"/>
                                            <arg value="build/payload.wxs"/>
                                        </exec>
                                        <!-- Build the package (slow) -->
                                        <exec executable="light.exe" dir="${project.build.directory}/msi">
                                            <arg value="-nologo" />
                                            <arg value="-ext" /> <arg value="WixUIExtension" />
                                            <arg value="-out" /> <arg value="dist/${product.name.lowercase}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.msi" />
                                            <arg value="build/package.wixobj" />
                                            <arg value="build/payload.wixobj" />
                                            <arg value="-nologo"/>
                                            <arg value="-ext"/> <arg value="WixUIExtension"/>
                                            <arg value="-out"/> <arg value="dist/${product.name.lowercase}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.msi"/>
                                            <arg value="build/package.wixobj"/>
                                            <arg value="build/payload.wixobj"/>
                                        </exec>
                                        <!-- Attach msi artifact to the build -->
                                        <attachartifact file="${project.build.directory}/msi/dist/${product.name.lowercase}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.msi" />
                                        <attachartifact file="${project.build.directory}/msi/dist/${product.name.lowercase}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.msi"/>
                                    </target>
                                </configuration>
                            </execution>
opendj-packages/opendj-msi/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-rpm/pom.xml
@@ -24,7 +24,9 @@
  !      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>
@@ -51,12 +53,12 @@
        <rpm.prefix>/opt/${product.name.lowercase}</rpm.prefix>
        <manpage.dir>${project.build.directory}/dependency/man</manpage.dir>
        <doc.homepage.url>http://opendj.forgerock.org/</doc.homepage.url>
        <rpm.license />
        <rpm.product.name />
        <rpm.product.name.lowercase />
        <rpm.resources.path />
        <rpm.description.header />
        <rpm.product.summary />
        <rpm.license/>
        <rpm.product.name/>
        <rpm.product.name.lowercase/>
        <rpm.resources.path/>
        <rpm.description.header/>
        <rpm.product.summary/>
    </properties>
    <build>
@@ -131,7 +133,7 @@
                        </description>
                        <requires>
                            <require>jre &gt;= 1.7</require>
                            <require>jre >= 1.7</require>
                        </requires>
                        <defineStatements>
opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-svr4/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
@@ -24,7 +24,9 @@
  !      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>
@@ -62,7 +64,7 @@
        <dependency>
            <groupId>org.forgerock.opendj</groupId>
            <artifactId>opendj-server-legacy</artifactId>
            <version>3.0.0-SNAPSHOT</version>
            <version>${project.version}</version>
            <exclusions>
                <exclusion>
                    <groupId>com.sleepycat</groupId>
@@ -77,7 +79,7 @@
            <plugin>
                <groupId>org.forgerock.opendj</groupId>
                <artifactId>opendj-maven-plugin</artifactId>
                <version>3.0.0-SNAPSHOT</version>
                <version>${project.version}</version>
                <configuration>
                    <productJarName>${product.name}</productJarName>
                    <supportedLocales>${product.locales}</supportedLocales>
opendj-packages/opendj-zip/pom.xml
@@ -24,7 +24,9 @@
  !      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>
opendj-packages/pom.xml
@@ -24,7 +24,9 @@
  !      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>
@@ -131,7 +133,7 @@
        <legal.folder>legal-notices</legal.folder>
        <lib.folder>lib</lib.folder>
        <!-- Location of the opendj service file for linux based packages. -->
        <sysv.file.location />
        <sysv.file.location/>
    </properties>
    <modules>