From bebd0f871dbb34996527013810b4c211ef3537a1 Mon Sep 17 00:00:00 2001
From: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Date: Wed, 01 Apr 2026 18:42:42 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into copilot/fix-inverted-logic-substring-check Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-install.adoc | 4 ++--
opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java | 5 +++--
opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-troubleshooting.adoc | 4 ++--
opendj-doc-generated-ref/src/main/asciidoc/server-dev-guide/chap-writing-plugins.adoc | 4 ++--
opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-upgrade.adoc | 4 ++--
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 4 ++--
.github/workflows/build.yml | 28 +++++++++++++++++++++++++++-
opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-monitoring.adoc | 4 ++--
8 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6492b9..17a6361 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@
on:
push:
+ branches: [ 'sustaining/4.10.x','master' ]
pull_request:
branches: [ 'sustaining/4.10.x','master' ]
@@ -10,7 +11,7 @@
runs-on: ${{ matrix.os }}
strategy:
matrix:
- java: [ '11','17','21','25']
+ java: [ '11','17','21','25','26']
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
fail-fast: false
steps:
@@ -42,11 +43,21 @@
path: ~/.m2/repository
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2-repository
+ - name: Build Windows native executables
+ if: runner.os == 'Windows'
+ shell: cmd
+ run: |
+ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
+ cd opendj-server-legacy\src\build-tools\windows
+ nmake all
+ xcopy /Y *.exe ..\..\..\lib\
+ git status
- name: Set Integration Test Environment
id: failsafe
if: runner.os != 'Windows'
run: |
echo "MAVEN_PROFILE_FLAG=-P precommit" >> $GITHUB_OUTPUT
+
- name: Build with Maven
timeout-minutes: 180
env:
@@ -234,6 +245,21 @@
opendj-server-legacy\target\package\opendj\bat\rebuild-index.bat --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll --trustAll
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
+ opendj-server-legacy\target\package\opendj\bat\windows-service.bat --enableService
+ net start "OpenDJ Server"
+ for ($i=0; $i -lt 12; $i++) { try { $c = New-Object System.Net.Sockets.TcpClient('localhost', 1636); $c.Close(); break } catch { Start-Sleep -Seconds 5 } }
+ opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
+ net stop "OpenDJ Server"
+ opendj-server-legacy\target\package\opendj\bat\windows-service.bat --disableService
+
+ - name: Upload Windows exe artifacts
+ if: runner.os == 'Windows'
+ uses: actions/upload-artifact@v4
+ with:
+ name: windows-exe-${{ matrix.java }}
+ retention-days: 5
+ path: opendj-server-legacy/src/build-tools/windows/*.exe
+
- name: Upload artifacts OpenDJ Server
uses: actions/upload-artifact@v4
with:
diff --git a/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-monitoring.adoc b/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-monitoring.adoc
index d4d068a..564130f 100644
--- a/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-monitoring.adoc
+++ b/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-monitoring.adoc
@@ -12,13 +12,13 @@
information: "Portions copyright [year] [name of copyright owner]".
Copyright 2017 ForgeRock AS.
- Portions Copyright 2024-2025 3A Systems LLC.
+ Portions Copyright 2024-2026 3A Systems LLC.
////
:figure-caption!:
:example-caption!:
:table-caption!:
-:opendj-version: 4.9.3
+:opendj-version: x.y.z
[#chap-monitoring]
diff --git a/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-troubleshooting.adoc b/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-troubleshooting.adoc
index 916fd86..5ab909b 100644
--- a/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-troubleshooting.adoc
+++ b/opendj-doc-generated-ref/src/main/asciidoc/admin-guide/chap-troubleshooting.adoc
@@ -12,13 +12,13 @@
information: "Portions copyright [year] [name of copyright owner]".
Copyright 2017 ForgeRock AS.
- Portions Copyright 2024-2025 3A Systems LLC.
+ Portions Copyright 2024-2026 3A Systems LLC.
////
:figure-caption!:
:example-caption!:
:table-caption!:
-:opendj-version: 4.9.3
+:opendj-version: x.y.z
[#chap-troubleshooting]
diff --git a/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-install.adoc b/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-install.adoc
index 61970f9..92be08f 100644
--- a/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-install.adoc
+++ b/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-install.adoc
@@ -12,13 +12,13 @@
information: "Portions copyright [year] [name of copyright owner]".
Copyright 2017 ForgeRock AS.
- Portions Copyright 2024-2025 3A Systems LLC.
+ Portions Copyright 2024-2026 3A Systems LLC.
////
:figure-caption!:
:example-caption!:
:table-caption!:
-:opendj-version: 4.9.3
+:opendj-version: x.y.z
[#chap-install]
diff --git a/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-upgrade.adoc b/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-upgrade.adoc
index 725f2f9..cf0268d 100644
--- a/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-upgrade.adoc
+++ b/opendj-doc-generated-ref/src/main/asciidoc/install-guide/chap-upgrade.adoc
@@ -18,8 +18,8 @@
:figure-caption!:
:example-caption!:
:table-caption!:
-:opendj-version: 5.0.3
-:opendj-version-short: 5.0
+:opendj-version: x.y.z
+:opendj-version-short: x.y
[#chap-upgrade]
diff --git a/opendj-doc-generated-ref/src/main/asciidoc/server-dev-guide/chap-writing-plugins.adoc b/opendj-doc-generated-ref/src/main/asciidoc/server-dev-guide/chap-writing-plugins.adoc
index fd15c36..77b43c7 100644
--- a/opendj-doc-generated-ref/src/main/asciidoc/server-dev-guide/chap-writing-plugins.adoc
+++ b/opendj-doc-generated-ref/src/main/asciidoc/server-dev-guide/chap-writing-plugins.adoc
@@ -12,13 +12,13 @@
information: "Portions copyright [year] [name of copyright owner]".
Copyright 2017 ForgeRock AS.
- Portions Copyright 2024-2025 3A Systems LLC.
+ Portions Copyright 2024-2026 3A Systems LLC.
////
:figure-caption!:
:example-caption!:
:table-caption!:
-:opendj-version: 4.9.3
+:opendj-version: x.y.z
[#chap-writing-plugins]
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 7aefcb1..580093e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -1122,8 +1122,8 @@
final ResultCode expectedResultCode, String testName) throws Exception
{
TestTimer timer = new TestTimer.Builder()
- .maxSleep(10, SECONDS)
- .sleepTimes(10, MILLISECONDS)
+ .maxSleep(30, SECONDS)
+ .sleepTimes(100, MILLISECONDS)
.toTimer();
InternalSearchOperation searchOp = timer.repeatUntilSuccess(new Callable<InternalSearchOperation>()
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
index 18c087a..918acc4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -13,6 +13,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems, LLC.
*/
package org.opends.server.tasks;
@@ -92,7 +93,7 @@
boolean isLoopback = localAddress.isLoopbackAddress();
String[] args =
{
- "-h", localIP,
+ "-h", "127.0.0.1",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "",
"-s", "base",
@@ -263,7 +264,7 @@
// anonymous connection.
args = new String[]
{
- "-h", localIP,
+ "-h", "127.0.0.1",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "",
"-s", "base",
--
Gitblit v1.10.0