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

vharseko
28.45.2018 ad8393c9a2cf383843340dec22f252599ddafb9c
Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenDJ.git
29 files modified
1 files added
148 ■■■■ changed files
.travis.yml 8 ●●●●● patch | view | raw | blame | history
opendj-bom/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-cli/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-config/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-core/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-doc-generated-ref/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-doc-maven-plugin/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-dsml-servlet/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-embedded-server-examples/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-grizzly/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-ldap-sdk-examples/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-ldap-toolkit/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-legacy/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-maven-plugin/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-openidm-account-change-notification-handler/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/opendj-deb/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/opendj-docker/Dockerfile 16 ●●●●● patch | view | raw | blame | history
opendj-packages/opendj-docker/pom.xml 69 ●●●●● patch | view | raw | blame | history
opendj-packages/opendj-msi/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/opendj-rpm/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/opendj-svr4/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-packages/pom.xml 3 ●●●● patch | view | raw | blame | history
opendj-rest2ldap-servlet/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-rest2ldap/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-server-example-plugin/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/pom.xml 2 ●●● patch | view | raw | blame | history
opendj-server/pom.xml 2 ●●● patch | view | raw | blame | history
pom.xml 2 ●●● patch | view | raw | blame | history
.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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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"]
opendj-packages/opendj-docker/pom.xml
New file
@@ -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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>