From 29d166b011c2797ab66743e10f1d7b09f4d069d6 Mon Sep 17 00:00:00 2001
From: Jenkins slave <bruno.lavit@forgerock.com>
Date: Thu, 26 Nov 2015 14:34:20 +0000
Subject: [PATCH] [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, 66 insertions(+), 93 deletions(-)
diff --git a/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml b/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml
index 76c180f..2d06825 100644
--- a/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml
+++ b/opendj-packages/opendj-deb/opendj-deb-oem/pom.xml
@@ -24,9 +24,7 @@
! 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 c7bd1c8..37a64ea 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
+++ b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
@@ -24,9 +24,7 @@
! 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 c743e1b..04e46ac 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -24,9 +24,7 @@
! 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>
@@ -56,9 +54,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>
@@ -126,8 +124,7 @@
</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>
@@ -141,8 +138,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 8d4e508..de86291 100644
--- a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
+++ b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
@@ -24,9 +24,7 @@
! 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>
@@ -84,64 +82,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 7bf63e2..b83ceeb 100644
--- a/opendj-packages/opendj-msi/pom.xml
+++ b/opendj-packages/opendj-msi/pom.xml
@@ -24,9 +24,7 @@
! 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 c2646ba..362c49e 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml
+++ b/opendj-packages/opendj-rpm/opendj-rpm-oem/pom.xml
@@ -24,9 +24,7 @@
! 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 4de52ec..657f6e3 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
@@ -24,9 +24,7 @@
! 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 ecc5633..dc3e6fe 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -24,9 +24,7 @@
! 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>
@@ -53,12 +51,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>
@@ -133,7 +131,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 7d0303f..d5b538d 100644
--- a/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
+++ b/opendj-packages/opendj-svr4/opendj-svr4-standard/pom.xml
@@ -24,9 +24,7 @@
! 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 55832cc..762c4a9 100644
--- a/opendj-packages/opendj-svr4/pom.xml
+++ b/opendj-packages/opendj-svr4/pom.xml
@@ -24,9 +24,7 @@
! 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 1b62374..7f48c4d 100644
--- a/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
+++ b/opendj-packages/opendj-zip/opendj-zip-oem/pom.xml
@@ -24,9 +24,7 @@
! 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>
@@ -64,7 +62,7 @@
<dependency>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-server-legacy</artifactId>
- <version>${project.version}</version>
+ <version>3.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.sleepycat</groupId>
@@ -79,7 +77,7 @@
<plugin>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-maven-plugin</artifactId>
- <version>${project.version}</version>
+ <version>3.0.0-SNAPSHOT</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 f33d27c..3c9b27f 100644
--- a/opendj-packages/opendj-zip/pom.xml
+++ b/opendj-packages/opendj-zip/pom.xml
@@ -24,9 +24,7 @@
! 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 7ac158c..7d57dff 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -24,9 +24,7 @@
! 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>
@@ -133,7 +131,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