Test + Run on jdk15+ (#234)

vharseko

25.23.2022 6eb8e788c223ac5d67ce7a873594f4f4ad6b409c

Test + Run on jdk15+ (#234)

* ADD test opendj-server-legacy for Linux

* ADD support jdk15+ for Unix

* ADD support jdk15+ for Windows

 .github/workflows/build.yml

@@ -43,6 +43,18 @@
      env:
        MAVEN_OPTS: -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10
      run: mvn --batch-mode --errors --update-snapshots package --file pom.xml
    - name: Test on Unix
      if: runner.os != 'Windows'
      run:   |
        opendj-server-legacy/target/package/opendj/setup -h localhost -p 1389 --ldapsPort 1636 --adminConnectorPort 4444 --enableStartTLS --generateSelfSignedCertificate --rootUserDN "cn=Directory Manager" --rootUserPassword password --baseDN dc=example,dc=com --addBaseEntry --cli --acceptLicense --no-prompt
        opendj-server-legacy/target/package/opendj/bin/status --bindDN "cn=Directory Manager" --bindPassword password
        opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
    - name: Test on Windows
      if: runner.os == 'Windows'
      run:   |
        opendj-server-legacy\target\package\opendj\setup.bat -h localhost -p 1389 --ldapsPort 1636 --adminConnectorPort 4444 --enableStartTLS --generateSelfSignedCertificate --rootUserDN "cn=Directory Manager" --rootUserPassword password --baseDN dc=example,dc=com --addBaseEntry --cli --acceptLicense --no-prompt
        opendj-server-legacy\target\package\opendj\bat\status.bat --bindDN "cn=Directory Manager" --bindPassword password
        opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
    - name: Upload artifacts OpenDJ Server
      uses: actions/upload-artifact@v3
      with:

 opendj-server-legacy/resource/bin/_script-util.bat

@@ -96,13 +96,13 @@


:setJavaHomeAndArgs

if "%SET_JAVA_HOME_AND_ARGS_DONE%" == "true" goto end

if not "%OPENDJ_JAVA_ARGS%" == "" goto checkEnvJavaHome

rem if not "%OPENDJ_JAVA_ARGS%" == "" goto checkEnvJavaHome

set SCRIPT_JAVA_ARGS_PROPERTY=%SCRIPT_NAME%.java-args

call:readProperty %SCRIPT_JAVA_ARGS_PROPERTY%

set OPENDJ_JAVA_ARGS=%PROPERTY_VALUE%

set OPENDJ_JAVA_ARGS=%OPENDJ_JAVA_ARGS% %PROPERTY_VALUE%

if not "%OPENDJ_JAVA_ARGS%" == "" goto checkEnvJavaHome

call:readProperty default.java-args

set OPENDJ_JAVA_ARGS=%PROPERTY_VALUE%

set OPENDJ_JAVA_ARGS=%OPENDJ_JAVA_ARGS% %PROPERTY_VALUE

if "%OPENDJ_JAVA_BIN%" == "" goto checkEnvJavaHome



:endJavaHomeAndArgs

@@ -170,6 +170,9 @@
set PATH=%SystemRoot%;%PATH%

set SCRIPT_NAME_ARG=-Dorg.opends.server.scriptName=%SCRIPT_NAME%

set SET_ENVIRONMENT_VARS_DONE=true

"%OPENDJ_JAVA_BIN%" --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --version > NUL 2>&1

set RESULT_CODE=%errorlevel%

if %RESULT_CODE% == 0 set OPENDJ_JAVA_ARGS=%OPENDJ_JAVA_ARGS% --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED

goto scriptBegin



:testJava

@@ -177,7 +180,7 @@
:continueTestJava

"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% org.opends.server.tools.CheckJVMVersion > NUL 2>&1

set RESULT_CODE=%errorlevel%

if %RESULT_CODE% == 13 goto notSupportedJavaHome

if %RESULT_CODE% == 8 goto notSupportedJavaHome

if not %RESULT_CODE% == 0 goto noValidJavaHome

goto end




 opendj-server-legacy/resource/bin/_script-util.sh

@@ -183,6 +183,13 @@
       LD_PRELOAD LD_PRELOAD_32 LD_PRELOAD_64
  SCRIPT_NAME_ARG=-Dorg.opends.server.scriptName=${SCRIPT_NAME}
    export SCRIPT_NAME_ARG
	
  "${OPENDJ_JAVA_BIN}" --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --version > /dev/null 2>&1
  RESULT_CODE=${?}
  if test ${RESULT_CODE} -eq 0
  then
    export OPENDJ_JAVA_ARGS="$OPENDJ_JAVA_ARGS --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED"
  fi
}

# Configure the appropriate CLASSPATH for server, using Opend DJ logger.