From 482e359e5d411485277737d2e2bde0ebee47def9 Mon Sep 17 00:00:00 2001
From: Bruno Lavit <bruno.lavit@forgerock.com>
Date: Thu, 26 Nov 2015 15:02:38 +0000
Subject: [PATCH] Revert "[maven-release-plugin] prepare for next development iteration"
---
opendj-packages/opendj-zip/pom.xml | 4 +
opendj-packages/pom.xml | 6 +
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml | 78 +++++++++++++------------
opendj-packages/opendj-msi/pom.xml | 4 +
opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml | 4 +
opendj-packages/opendj-svr4/pom.xml | 4 +
opendj-packages/opendj-deb/opendj-deb-oem/pom.xml | 4 +
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 4 +
opendj-packages/opendj-zip/opendj-zip-oem/pom.xml | 8 +-
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml | 4 +
opendj-packages/opendj-deb/pom.xml | 17 +++--
opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml | 4 +
opendj-packages/opendj-rpm/pom.xml | 18 +++--
13 files changed, 93 insertions(+), 66 deletions(-)
diff --git a/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml b/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml
index 2d06825..76c180f 100644
--- a/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
index 37a64ea..c7bd1c8 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index 04e46ac..c743e1b 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
index de86291..8d4e508 100644
--- a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index b83ceeb..7bf63e2 100644
--- a/opendj-packages/opendj-msi/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml
index 362c49e..c2646ba 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 657f6e3..4de52ec 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index dc3e6fe..ecc5633 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/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 >= 1.7</require>
+ <require>jre >= 1.7</require>
</requires>
<defineStatements>
diff --git a/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml b/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
index d5b538d..7d0303f 100644
--- a/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index 762c4a9..55832cc 100644
--- a/opendj-packages/opendj-svr4/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml b/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
index 7f48c4d..1b62374 100644
--- a/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
+++ b/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>
diff --git a/opendj-packages/opendj-zip/pom.xml b/opendj-packages/opendj-zip/pom.xml
index 3c9b27f..f33d27c 100644
--- a/opendj-packages/opendj-zip/pom.xml
+++ b/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>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 7d57dff..7ac158c 100644
--- a/opendj-packages/pom.xml
+++ b/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>
--
Gitblit v1.10.0