From ad8393c9a2cf383843340dec22f252599ddafb9c Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Wed, 28 Feb 2018 11:45:50 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenDJ.git
---
opendj-packages/opendj-docker/pom.xml | 69 +++++++++++++++++++++++
opendj-rest2ldap-servlet/pom.xml | 2
opendj-legacy/pom.xml | 2
opendj-doc-generated-ref/pom.xml | 2
opendj-packages/opendj-msi/pom.xml | 2
opendj-packages/opendj-svr4/pom.xml | 2
opendj-rest2ldap/pom.xml | 2
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 2
pom.xml | 2
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 | 8 ++
opendj-server-example-plugin/pom.xml | 2
opendj-config/pom.xml | 2
opendj-cli/pom.xml | 2
opendj-packages/pom.xml | 3
opendj-doc-maven-plugin/pom.xml | 2
opendj-openidm-account-change-notification-handler/pom.xml | 2
opendj-packages/opendj-docker/Dockerfile | 16 +++--
opendj-server/pom.xml | 2
opendj-dsml-servlet/pom.xml | 2
opendj-bom/pom.xml | 2
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, 114 insertions(+), 34 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3686ef0..2bac770 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@
include:
- os: linux
jdk: openjdk8
+ sudo: required
+ services:
+ - docker
before_deploy:
- 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
@@ -35,6 +38,11 @@
- travis
after_deploy:
- echo 'after_deploy'
+ - echo 'build and push Docker'
+ - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+ - docker build ./opendj-packages/opendj-docker/target -t $DOCKER_USERNAME/opendj -t $DOCKER_USERNAME/opendj:$git_version
+ - docker push $DOCKER_USERNAME/opendj:$git_version
+ - docker push $DOCKER_USERNAME/opendj
- os: linux
jdk: oraclejdk8
- os: osx
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
index 3ae3363..3f04f99 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml
index 903b2f7..c20797b 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-cli</artifactId>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 9fcfe21..399fd51 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 0432ec5..e666f51 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-core</artifactId>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index d06de5b..1be7acd 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 e5fff4b..b6922f8 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-maven-plugin</artifactId>
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 45706e6..9d3209d 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 7103858..6525a5f 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-embedded-server-examples</artifactId>
diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml
index d8fb5e1..1fc347a 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-grizzly</artifactId>
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index d23b2bf..0f0d5af 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index f5448a9..14b7bbf 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
diff --git a/opendj-legacy/pom.xml b/opendj-legacy/pom.xml
index 42b9863..ab247d0 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 b667e38..51fb010 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 7c9f640..33f4374 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 40ccf44..f803676 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 9c9135c..a82723e 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-docker/Dockerfile b/opendj-packages/opendj-docker/Dockerfile
index 0b51a03..2c31933 100644
--- a/opendj-packages/opendj-docker/Dockerfile
+++ b/opendj-packages/opendj-docker/Dockerfile
@@ -1,12 +1,6 @@
FROM java:8
-MAINTAINER Open Identity Platform <open-identity-platform@googlegroups.com>
-
-WORKDIR /opt
-
-RUN apt-get install -y wget unzip
-
-RUN wget --quiet https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/4.0.3/opendj-4.0.3.zip && unzip opendj-4.0.3.zip && rm -r opendj-4.0.3.zip
+MAINTAINER Open Identity Platform Community <open-identity-platform-opendj@googlegroups.com>
ENV PORT 1389
@@ -18,6 +12,14 @@
ENV ROOT_PASSWORD password
+ENV VERSION @project_version@
+
+WORKDIR /opt
+
+RUN apt-get install -y wget unzip
+
+RUN wget --quiet https://github.com/OpenIdentityPlatform/OpenDJ/releases/download/$VERSION/opendj-$VERSION.zip && unzip opendj-$VERSION.zip && rm -r opendj-$VERSION.zip
+
RUN /opt/opendj/setup --cli -p $PORT --ldapsPort $LDAPS_PORT --enableStartTLS --generateSelfSignedCertificate --baseDN "$BASE_DN" -h localhost --rootUserDN "$ROOT_USER_DN" --rootUserPassword $ROOT_PASSWORD --acceptLicense --no-prompt --doNotStart
CMD ["/opt/opendj/bin/start-ds", "--nodetach"]
diff --git a/opendj-packages/opendj-docker/pom.xml b/opendj-packages/opendj-docker/pom.xml
new file mode 100644
index 0000000..e8bd1c4
--- /dev/null
+++ b/opendj-packages/opendj-docker/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The contents of this file are subject to the terms of the Common Development and
+ Distribution License (the License). You may not use this file except in compliance with the
+ License.
+
+ You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ specific language governing permission and limitations under the License.
+
+ When distributing Covered Software, include this CDDL Header Notice in each file and include
+ the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ Header, with the fields enclosed by brackets [] replaced by your own identifying
+ information: "Portions Copyright [year] [name of copyright owner]".
+
+ Copyright 2015-2016 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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-packages</artifactId>
+ <version>4.1.3-SNAPSHOT</version>
+ </parent>
+
+ <profiles>
+ <profile>
+ <id>packages</id>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ </profile>
+ </profiles>
+
+ <artifactId>opendj-docker</artifactId>
+ <name>OpenDJ Docker Packages Parent</name>
+
+ <description>
+ This module contains configuration and generic plugin calls to generate Docker file for OpenDJ.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}">
+ <fileset dir="${basedir}">
+ <include name="Dockerfile"/> <!--NOTE DIFFERENCE HERE-->
+ </fileset>
+ </copy>
+ <replace token= "@project_version@" value="${project.version}" dir="target/">
+ <include name="Dockerfile"/>
+ </replace>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index 007db37..d3b27c6 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi</artifactId>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 8e2c31e..503d977 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 d5518b8..2c100cc 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index 857e675..c9eacc9 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-svr4</artifactId>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 6fdbb4f..fb5a25a 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-packages</artifactId>
@@ -52,6 +52,7 @@
<module>opendj-rpm</module>
<module>opendj-svr4</module>
<module>opendj-msi</module>
+ <module>opendj-docker</module>
</modules>
</profile>
</profiles>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 5469c78..74f90e3 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap-servlet</artifactId>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 9379969..0f489d3 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap</artifactId>
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index 68920a4..170be48 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.1-SNAPSHOT</version>
+ <version>4.1.3-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 a2616e0..18aef91 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-legacy</artifactId>
<packaging>jar</packaging>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 2b43db2..19d80bd 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.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
<name>OpenDJ Server NG</name>
diff --git a/pom.xml b/pom.xml
index f69adeb..ea5cc05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-bom</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.1.3-SNAPSHOT</version>
<relativePath>opendj-bom/pom.xml</relativePath>
</parent>
--
Gitblit v1.10.0