From 5270abe94b37c0a9b90eb708600f238c0a2da40b Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Tue, 06 Mar 2018 17:50:42 +0000
Subject: [PATCH] -Dresume=false + rollback version to 4.1.5-SNAPSHOT
---
opendj-packages/opendj-docker/pom.xml | 2
opendj-rest2ldap-servlet/pom.xml | 2
opendj-legacy/pom.xml | 2
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml | 6 +-
opendj-doc-generated-ref/pom.xml | 2
opendj-packages/opendj-msi/pom.xml | 8 ++--
opendj-packages/opendj-svr4/pom.xml | 2
opendj-rest2ldap/pom.xml | 2
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 2
pom.xml | 4 +-
opendj-ldap-sdk-examples/pom.xml | 2
opendj-server-legacy/pom.xml | 2
opendj-grizzly/pom.xml | 2
opendj-ldap-toolkit/pom.xml | 2
opendj-maven-plugin/pom.xml | 2
.travis.yml | 2
opendj-server-example-plugin/pom.xml | 2
opendj-config/pom.xml | 2
opendj-cli/pom.xml | 2
opendj-packages/pom.xml | 2
opendj-doc-maven-plugin/pom.xml | 2
opendj-openidm-account-change-notification-handler/pom.xml | 2
opendj-server/pom.xml | 2
opendj-dsml-servlet/pom.xml | 2
opendj-bom/pom.xml | 6 --
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml | 2
opendj-packages/opendj-deb/pom.xml | 2
opendj-embedded-server-examples/pom.xml | 2
opendj-core/pom.xml | 2
opendj-packages/opendj-rpm/pom.xml | 2
30 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3898ded..7e006cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@
- git config --local user.name "Open Identity Platform Community" && git config --local user.email "open-identity-platform-opendj@googlegroups.com"
- git checkout -f $TRAVIS_BRANCH
- git tag -f $git_version && git tag -d $git_version
- - mvn -q -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests release:clean release:prepare
+ - mvn -q -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests -Dresume=false release:prepare
- git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git >/dev/null 2>&1
- git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git $git_version >/dev/null 2>&1
deploy:
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
index c5cbdf0..450604f 100644
--- a/opendj-bom/pom.xml
+++ b/opendj-bom/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-bom</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -126,8 +126,4 @@
</snapshots>
</repository>
</repositories>
-
- <scm>
- <tag>4.1.5</tag>
- </scm>
</project>
diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml
index b4eb274..ce2658f 100644
--- a/opendj-cli/pom.xml
+++ b/opendj-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-cli</artifactId>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index e3f44c8..752e3c8 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-config</artifactId>
<name>OpenDJ Configuration API</name>
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 711b998..41fd5bd 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-core</artifactId>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 4182fe5..0245201 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-generated-ref</artifactId>
diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml
index ff28700..dadd519 100644
--- a/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-doc-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-maven-plugin</artifactId>
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index f287742..1ec78de 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-dsml-servlet</artifactId>
diff --git a/opendj-embedded-server-examples/pom.xml b/opendj-embedded-server-examples/pom.xml
index 1c63819..0cd06e5 100644
--- a/opendj-embedded-server-examples/pom.xml
+++ b/opendj-embedded-server-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-embedded-server-examples</artifactId>
diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml
index c33096c..6fbb6a6 100644
--- a/opendj-grizzly/pom.xml
+++ b/opendj-grizzly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-grizzly</artifactId>
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index ec881df..2ce6e3b 100644
--- a/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-ldap-sdk-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 7a9bd13..1d1194b 100644
--- a/opendj-ldap-toolkit/pom.xml
+++ b/opendj-ldap-toolkit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
diff --git a/opendj-legacy/pom.xml b/opendj-legacy/pom.xml
index db51609..a8e19df 100644
--- a/opendj-legacy/pom.xml
+++ b/opendj-legacy/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-legacy</artifactId>
<name>OpenDJ Legacy</name>
diff --git a/opendj-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
index 81e487e..09216f3 100644
--- a/opendj-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-maven-plugin</artifactId>
diff --git a/opendj-openidm-account-change-notification-handler/pom.xml b/opendj-openidm-account-change-notification-handler/pom.xml
index d259d14..c479425 100644
--- a/opendj-openidm-account-change-notification-handler/pom.xml
+++ b/opendj-openidm-account-change-notification-handler/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-openidm-account-change-notification-handler</artifactId>
<name>OpenDJ account change notification handler for OpenIDM</name>
diff --git a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
index e3472d5..afce24f 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
+++ b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-deb</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-deb-standard</artifactId>
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index 9bc0322..bd9b231 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-docker/pom.xml b/opendj-packages/opendj-docker/pom.xml
index 963116e..2b6ebfe 100644
--- a/opendj-packages/opendj-docker/pom.xml
+++ b/opendj-packages/opendj-docker/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
index f9fef40..1daa424 100644
--- a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
+++ b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-msi</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi-standard</artifactId>
@@ -168,7 +168,7 @@
</goals>
<configuration>
<target>
- <delete dir="${user.home}/.msi" />
+ <delete dir="${user.home}/.msi" />
<mkdir dir="${user.home}/.msi" />
<copy toDir="${user.home}/.msi">
<fileset dir="${package.dir}">
@@ -195,7 +195,7 @@
</exec>
<echo>WineExitStatusCode=${WineExitStatusCode}</echo>
- <exec executable="sh" resultproperty="WineTricksExitStatusCode" failifexecutionfails="false">
+ <exec executable="sh" resultproperty="WineTricksExitStatusCode" failifexecutionfails="false">
<arg value="${project.build.directory}/winetricks/winetricks-LAST.sh" />
<arg value="--unattended" />
<arg value="dotnet40" />
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index 8ce65f4..dd69dcf 100644
--- a/opendj-packages/opendj-msi/pom.xml
+++ b/opendj-packages/opendj-msi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi</artifactId>
@@ -85,9 +85,9 @@
<module>opendj-msi-standard</module>
</modules>
<properties>
- <exec.heat>${project.build.directory}/wix/heat.exe</exec.heat><param.heat />
- <exec.candle>${project.build.directory}/wix/candle.exe</exec.candle><param.candle />
- <exec.light>${project.build.directory}/wix/light.exe</exec.light><param.light />
+ <exec.heat>${project.build.directory}/wix/heat.exe</exec.heat><param.heat></param.heat>
+ <exec.candle>${project.build.directory}/wix/candle.exe</exec.candle><param.candle></param.candle>
+ <exec.light>${project.build.directory}/wix/light.exe</exec.light><param.light></param.light>
</properties>
</profile>
</profiles>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 570b806..f9cbf9e 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-rpm</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-rpm-standard</artifactId>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index 05fdff1..63be743 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index 18f42bd..97bde90 100644
--- a/opendj-packages/opendj-svr4/pom.xml
+++ b/opendj-packages/opendj-svr4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-svr4</artifactId>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index d89a644..9bef25e 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-packages</artifactId>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 6c703ba..bb33ff8 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap-servlet</artifactId>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 7e472e6..4c60987 100644
--- a/opendj-rest2ldap/pom.xml
+++ b/opendj-rest2ldap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap</artifactId>
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index 57333c3..f5d390a 100644
--- a/opendj-server-example-plugin/pom.xml
+++ b/opendj-server-example-plugin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-example-plugin</artifactId>
<name>OpenDJ Server Example Plugin</name>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index cbaae8e..67f7339 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-legacy</artifactId>
<packaging>jar</packaging>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 864da1b..b89cc24 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
<name>OpenDJ Server NG</name>
diff --git a/pom.xml b/pom.xml
index 9b04471..b5476da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-bom</artifactId>
- <version>4.1.5</version>
+ <version>4.1.5-SNAPSHOT</version>
<relativePath>opendj-bom/pom.xml</relativePath>
</parent>
@@ -110,7 +110,7 @@
<connection>scm:git:https://github.com/OpenIdentityPlatform/OpenDJ.git</connection>
<developerConnection>scm:git:https://github.com/OpenIdentityPlatform/OpenDJ.git</developerConnection>
<url>https://github.com/OpenIdentityPlatform/OpenDJ</url>
- <tag>4.1.5</tag>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
--
Gitblit v1.10.0