Merge branch 'master' into security_scan

maximthomas

26.58.2020 e493e2eb69ce6803a6a4d6d8cbe8e903fbc3148f

Merge branch 'master' into security_scan

 .travis.yml

@@ -13,7 +13,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 -Dresume=false -P distribution release:prepare
      - mvn -B -DtagNameFormat="$git_version" -DreleaseVersion="$git_version" -DignoreSnapshots=true  -DpushChanges=false -DscmCommentPrefix="[ci skip] $git_version_last->$git_version " -DskipTests -Darguments=-DskipTests -Dresume=false -P distribution 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:
@@ -23,7 +23,7 @@
      target_commitish: $(git rev-list -n 1 $git_version)
      tag_name: $git_version
      name: $git_version
      body: "compare: $(git rev-list -n 1 $git_version_last)...$(git rev-list -n 1 $git_version)"
      release_notes: "compare: $(git rev-list -n 1 $git_version_last)...$(git rev-list -n 1 $git_version)"
      api_key:
        secure: bprK7kiogA+nA4TuYU7BHHIPasg2Ve7dG/eZRQ+mJpH2y6GXFBqoEpN2AQECrJ5IgVQZ9WyBc+/PXhjh/VYrg3bvU9lE2zTnkQa5kiPFGnC5cOmqO2dSdUjiBcm3yBO9J3pL//Qsr8g7fv9g5580yMW/NYMs0R70S5ystqjJFSFQHXLkWJBzXQnIyMqjPNsndmqR9lnqX690u298z9H56pNrZqK851NVjTX9WKIoWlVezCSp3nwvAD5tW+p1A0Sy/6kPheYyudEHvHO5zUe33vh3lxB/qqXzIszlEPvIzzcig/ElxTCQ+4eWL34MlGLUzeJ8DdR7JshIPkTrAQ9i5nbOIP0NLu5wfNh642Sl4diGqa+7ioAmhIQuQmBJcOb0l9pP01fLVmgJoPVLGctWpklB9FdNCu96EtHmqj6FmsQzSTpmkfhCjRrgPHQYTZNcl25xdN6GSYZpiP2fYSmp06Wz2mi2OO2gvwjU2iX2b8j/koJ8kWQHrCYamTKbu4X08Vd+lE3EupTBfBzmiPiu8pC5PRi+nmilKdg40lsga++HB3IRRoPYhULo29Yfh6kMmWrP4Pn7RFOyI0Jm5NhLlZW2A5Q+FpEr8qyiLV1eC5RxMlAdaqassz2aWgwxrJC2taF0gUnZbg6w0xa5O0UAl0VAAGAJb2cXl9yJDCkYL18=
      skip_cleanup: true
@@ -56,15 +56,15 @@
      -   git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.wiki.git $git_version >/dev/null 2>&1
      -   cd $TRAVIS_BUILD_DIR
      - echo 'build and push Docker'
      -   docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
      -   docker build ./opendj-packages/opendj-docker -t $DOCKER_USERNAME/opendj -t $DOCKER_USERNAME/opendj:$git_version
      -   docker push $DOCKER_USERNAME/opendj:$git_version
      -   docker push $DOCKER_USERNAME/opendj
      -   echo "$DOCKER_PASSWORD" | docker login -u "openidentityplatformcommunity" --password-stdin
      -   docker build ./opendj-packages/opendj-docker -t openidentityplatform/opendj -t openidentityplatform/opendj:$git_version
      -   docker push openidentityplatform/opendj:$git_version
      -   docker push openidentityplatform/opendj
      - echo 'build and push Github Docker'
      -   docker login docker.pkg.github.com -u "$GITHUB_USERNAME" -p "$GITHUB_PASSWORD"
      -   echo "$GITHUBKEY" | docker login -u "Open Identity Platform Community" docker.pkg.github.com --password-stdin
      -   docker build ./opendj-packages/opendj-docker -t docker.pkg.github.com/openidentityplatform/opendj/opendj -t docker.pkg.github.com/openidentityplatform/opendj/opendj:$git_version
      -   #docker push docker.pkg.github.com/openidentityplatform/opendj/opendj:$git_version
      -   #docker push docker.pkg.github.com/openidentityplatform/opendj/opendj         
      -   docker push docker.pkg.github.com/openidentityplatform/opendj/opendj:$git_version
      -   docker push docker.pkg.github.com/openidentityplatform/opendj/opendj         
  - os: linux
    jdk: oraclejdk11
  - os: linux
@@ -88,7 +88,7 @@
before_install:
  - date -u
  - uname -a
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then brew install rpm && brew cask install wine-stable; else sudo apt-get install -y rpm wine; fi
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then brew install rpm && brew cask install wine-stable; else sudo apt-get install -y rpm && sudo dpkg --add-architecture i386 && wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && sudo apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main' && sudo apt update && sudo apt install --install-recommends winehq-stable ; fi
  - git fetch -t
  - export git_version_last="$(git describe --abbrev=0 --tags)"
  - export git_version="$(echo $git_version_last | awk -F . '{ printf "%d.%d.%d", $1,$2,$3 + 1}')"

 opendj-cli/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-cli</artifactId>

 opendj-config/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-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.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-core</artifactId>

 opendj-doc-generated-ref/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-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.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-doc-maven-plugin</artifactId>

 opendj-dsml-servlet/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-parent</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-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.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-embedded-server-examples</artifactId>

 opendj-grizzly/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-grizzly</artifactId>

 opendj-ldap-sdk-examples/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-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.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-ldap-toolkit</artifactId>

 opendj-legacy/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-legacy</artifactId>
  <name>OpenDJ Legacy</name>

 opendj-maven-plugin/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-SNAPSHOT</version>
  </parent>

  <artifactId>opendj-maven-plugin</artifactId>

 opendj-openidm-account-change-notification-handler/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-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.openidentityplatform.opendj</groupId>
        <artifactId>opendj-deb</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-deb-standard</artifactId>

 opendj-packages/opendj-deb/pom.xml

@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <profiles>

 opendj-packages/opendj-docker/Dockerfile

@@ -33,7 +33,8 @@

ADD run.sh /opt/opendj/run.sh

RUN useradd -m -r -u 1001 -G root,sudo $OPENDJ_USER
RUN useradd -m -r -u 1001 -G root,sudo $OPENDJ_USER \
    && install -d -o $OPENDJ_USER /opt/opendj/data

RUN chgrp -R 0 /opt/opendj && \
    chmod -R g=u /opt/opendj && \

 opendj-packages/opendj-docker/pom.xml

@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <profiles>

 opendj-packages/opendj-msi/opendj-msi-standard/pom.xml

@@ -21,7 +21,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-msi</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-msi-standard</artifactId>

 opendj-packages/opendj-msi/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-msi</artifactId>

 opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-rpm</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-rpm-standard</artifactId>

 opendj-packages/opendj-rpm/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <packaging>pom</packaging>

 opendj-packages/opendj-svr4/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-packages</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-svr4</artifactId>

 opendj-packages/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.openidentityplatform.opendj</groupId>
        <artifactId>opendj-parent</artifactId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>

    <artifactId>opendj-packages</artifactId>

 opendj-rest2ldap-servlet/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-SNAPSHOT</version>
  </parent>

  <artifactId>opendj-rest2ldap-servlet</artifactId>

 opendj-rest2ldap/pom.xml

@@ -20,7 +20,7 @@
    <parent>
        <artifactId>opendj-parent</artifactId>
        <groupId>org.openidentityplatform.opendj</groupId>
        <version>4.4.4-SNAPSHOT</version>
        <version>4.4.5-SNAPSHOT</version>
    </parent>
    
    <artifactId>opendj-rest2ldap</artifactId>

 opendj-server-example-plugin/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-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.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server-legacy</artifactId>
  <packaging>jar</packaging>

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java

@@ -2955,18 +2955,28 @@
      {
        Method tmpDirectBufferCleanerMethod = null;
        Method tmpDirectBufferCleanerCleanMethod = null;
        boolean tmpCleanSupported;
        try
        {
          tmpDirectBufferCleanerMethod = Class.forName("java.nio.DirectByteBuffer").getMethod("cleaner");
          tmpDirectBufferCleanerMethod.setAccessible(true);
          tmpDirectBufferCleanerCleanMethod = Class.forName("sun.misc.Cleaner").getMethod("clean");
          tmpDirectBufferCleanerCleanMethod.setAccessible(true);
          tmpCleanSupported = true;
        }
        catch (Exception e)
        {
          tmpCleanSupported = false;
        boolean tmpCleanSupported = false;
        // 
        // We know that this will fail in Java 9+ since sun.misc.Cleaner was moved to jdk.internal.ref.Cleaner (see JDK-8148117)
        // Also in Java9+, calling 'setAccessible(true)' to Java internal classes generates warnings:
        // * WARNING: An illegal reflective access operation has occurred
        // * WARNING: All illegal access operations will be denied in a future release
        // unless the JVM is started with the 'add-opens=java.base/java.nio=ALL-UNNAMED' flag
        // Since this is only an optimization, avoid it completely in Java 9+
        // 
        if (System.getProperty("java.version").startsWith("1.")) {
          try
          {
            tmpDirectBufferCleanerMethod = Class.forName("java.nio.DirectByteBuffer").getMethod("cleaner");
            tmpDirectBufferCleanerMethod.setAccessible(true);
            tmpDirectBufferCleanerCleanMethod = Class.forName("sun.misc.Cleaner").getMethod("clean");
            tmpDirectBufferCleanerCleanMethod.setAccessible(true);
            tmpCleanSupported = true;
          }
          catch (Exception e)
          {
            tmpCleanSupported = false;
          }
        }
        CLEAN_SUPPORTED = tmpCleanSupported;
        directBufferCleanerMethod = tmpDirectBufferCleanerMethod;

 opendj-server/pom.xml

@@ -19,7 +19,7 @@
  <parent>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-SNAPSHOT</version>
  </parent>
  <artifactId>opendj-server</artifactId>
  <name>OpenDJ Server NG</name>

 pom.xml

@@ -18,7 +18,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.openidentityplatform.opendj</groupId>
    <artifactId>opendj-parent</artifactId>
    <version>4.4.4-SNAPSHOT</version>
    <version>4.4.5-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>OpenDJ Directory Services Project</name>
@@ -32,6 +32,7 @@
        <product.name>OpenDJ</product.name>
        <product.name.lowercase>opendj</product.name.lowercase>
        <product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <localized.jars.classifier>i18n</localized.jars.classifier>
        <freemarker.version>2.3.28</freemarker.version>
        <grizzly-framework.version>2.4.4</grizzly-framework.version>
@@ -352,6 +353,12 @@
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-release-plugin</artifactId>
                    <version>3.0.0-M1</version>
                </plugin>
                
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-jar-plugin</artifactId>
                    <version>3.2.0</version>
                </plugin>