From 1f5eda73085a9f0f4887cd09e1a0f82e681b408a Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Mon, 9 Mar 2026 16:48:13 +0300 Subject: [PATCH 01/19] Update OpenDJ dependency version to 5.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9fa21274..d596516d 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ org.openidentityplatform.opendj opendj-parent - 5.0.3 + 5.0.4-SNAPSHOT pom import From 473399b59a88d92c4708b221f72b792baa10c04e Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 10 Mar 2026 13:08:04 +0300 Subject: [PATCH 02/19] jsvc_exec "-wait 120" --- .../openicf-zip/src/main/resources/bin/openicf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh index fd3c6449..61f493c9 100644 --- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh +++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh @@ -89,7 +89,7 @@ case "$1" in start) echo "Starting the $DESC..." # Start the service - jsvc_exec + jsvc_exec "-wait 120" echo "The $DESC has started. pid=$(cat $PID)" ;; @@ -110,7 +110,7 @@ case "$1" in jsvc_exec "-stop" # Start the service - jsvc_exec + jsvc_exec "-wait 120" echo "The $DESC has restarted. pid=$(cat $PID)" else From ca6523bc7118d6b585f895d1434fc4a134e4dd57 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 10 Mar 2026 15:35:18 +0300 Subject: [PATCH 03/19] error: Error fetching URL: https://docs.groovy-lang.org/latest/html/api/ --- OpenICF-java-framework/bundles-parent/pom.xml | 4 ++-- OpenICF-java-framework/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenICF-java-framework/bundles-parent/pom.xml b/OpenICF-java-framework/bundles-parent/pom.xml index 0b83fe17..93ea6652 100644 --- a/OpenICF-java-framework/bundles-parent/pom.xml +++ b/OpenICF-java-framework/bundles-parent/pom.xml @@ -181,7 +181,7 @@ maven-javadoc-plugin - https://docs.groovy-lang.org/latest/html/api/ + @@ -328,7 +328,7 @@ maven-javadoc-plugin - https://docs.groovy-lang.org/latest/html/api/ + diff --git a/OpenICF-java-framework/pom.xml b/OpenICF-java-framework/pom.xml index 8ed4af2e..9905f569 100644 --- a/OpenICF-java-framework/pom.xml +++ b/OpenICF-java-framework/pom.xml @@ -153,7 +153,7 @@ ${maven.compiler.source} public - https://docs.groovy-lang.org/latest/html/api/ + From e9d4b866a8fff27e07cf5368f06ca327ce614967 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 10 Mar 2026 15:50:16 +0300 Subject: [PATCH 04/19] kill -9 $PID --- .../openicf-zip/src/main/resources/bin/openicf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh index 61f493c9..c156bea2 100644 --- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh +++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh @@ -98,7 +98,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - + kill -9 $PID echo "The $DESC has stopped." ;; restart) @@ -108,7 +108,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - + kill -9 $PID # Start the service jsvc_exec "-wait 120" From f035fdc8eedb186ff3e18ec14c8abe2b147072d7 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 10 Mar 2026 15:57:57 +0300 Subject: [PATCH 05/19] sudo --- .github/workflows/build.yml | 8 ++++---- .../openicf-zip/src/main/resources/bin/openicf.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9386aa16..992c6905 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,15 +36,15 @@ jobs: - name: Test on Unix if: runner.os != 'Windows' run: | + unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip + openicf/bin/ConnectorServer.sh if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc else brew install coreutils jsvc fi - unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip - openicf/bin/ConnectorServer.sh - openicf/bin/openicf.sh start - openicf/bin/openicf.sh stop + sudo openicf/bin/openicf.sh start + sudo openicf/bin/openicf.sh stop rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh index c156bea2..61f493c9 100644 --- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh +++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh @@ -98,7 +98,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - kill -9 $PID + echo "The $DESC has stopped." ;; restart) @@ -108,7 +108,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - kill -9 $PID + # Start the service jsvc_exec "-wait 120" From 8e01d2dc61a9372c3f12740a12e8b0c6d7533ba7 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 10 Mar 2026 16:08:46 +0300 Subject: [PATCH 06/19] sudo rm --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 992c6905..4b18343e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: fi sudo openicf/bin/openicf.sh start sudo openicf/bin/openicf.sh stop - rm -rf openicf/logs + sudo rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' ! grep " ERROR " openicf/logs/ConnectorServer.log From 6303a5fe5d43982528cbaba7f8146ef8efd05d64 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Tue, 10 Mar 2026 16:24:57 +0300 Subject: [PATCH 07/19] remove mac os as service --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b18343e..2148c8e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,12 +40,12 @@ jobs: openicf/bin/ConnectorServer.sh if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc + openicf/bin/openicf.sh start + openicf/bin/openicf.sh stop + rm -rf openicf/logs else brew install coreutils jsvc fi - sudo openicf/bin/openicf.sh start - sudo openicf/bin/openicf.sh stop - sudo rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' ! grep " ERROR " openicf/logs/ConnectorServer.log From f67cdd2b671cbd1f6b34fba9453441dd14cb5e1e Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Wed, 18 Mar 2026 13:14:40 +0300 Subject: [PATCH 08/19] Update jsvc installation to specific version 1.5.0 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9386aa16..399a777a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc else - brew install coreutils jsvc + brew install coreutils jsvc@1.5.0 fi unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip openicf/bin/ConnectorServer.sh From 3eee002373a6ddd6b517a12d80faa69a3137b927 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Wed, 18 Mar 2026 13:30:36 +0300 Subject: [PATCH 09/19] Downgrade jsvc version in build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 399a777a..8e9debf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc else - brew install coreutils jsvc@1.5.0 + brew install coreutils jsvc@1.4.1 fi unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip openicf/bin/ConnectorServer.sh From 4269a441e00326593f2329737d2286c6d4d06a7a Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Sun, 22 Mar 2026 20:23:49 +0300 Subject: [PATCH 10/19] Update build script to install commons-daemon --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e9debf3..ab7a641c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,8 @@ jobs: if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc else - brew install coreutils jsvc@1.4.1 + brew update + brew install coreutils commons-daemon fi unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip openicf/bin/ConnectorServer.sh From ab8ca7cf7e71ddf601ff2ce06379c1008a0197a5 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Sun, 22 Mar 2026 20:38:47 +0300 Subject: [PATCH 11/19] Simplify brew install command in build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab7a641c..113ab4a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,7 @@ jobs: sudo apt-get install jsvc else brew update - brew install coreutils commons-daemon - fi + brew install coreutils jsvc fi unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip openicf/bin/ConnectorServer.sh openicf/bin/openicf.sh start From c9d3baa678e82d33bfac890ad4cf5e56e84d5c77 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Mon, 23 Mar 2026 10:32:51 +0300 Subject: [PATCH 12/19] Fix formatting issue in build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 113ab4a6..90d9ced4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,8 @@ jobs: sudo apt-get install jsvc else brew update - brew install coreutils jsvc fi + brew install coreutils jsvc + fi unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip openicf/bin/ConnectorServer.sh openicf/bin/openicf.sh start From 413988866cd63b4d31e679438eb977790de7b80e Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 23 Mar 2026 10:56:08 +0300 Subject: [PATCH 13/19] Revert "error: Error fetching URL: https://docs.groovy-lang.org/latest/html/api/" This reverts commit ca6523bc7118d6b585f895d1434fc4a134e4dd57. --- OpenICF-java-framework/bundles-parent/pom.xml | 4 ++-- OpenICF-java-framework/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenICF-java-framework/bundles-parent/pom.xml b/OpenICF-java-framework/bundles-parent/pom.xml index 93ea6652..0b83fe17 100644 --- a/OpenICF-java-framework/bundles-parent/pom.xml +++ b/OpenICF-java-framework/bundles-parent/pom.xml @@ -181,7 +181,7 @@ maven-javadoc-plugin - + https://docs.groovy-lang.org/latest/html/api/ @@ -328,7 +328,7 @@ maven-javadoc-plugin - + https://docs.groovy-lang.org/latest/html/api/ diff --git a/OpenICF-java-framework/pom.xml b/OpenICF-java-framework/pom.xml index 9905f569..8ed4af2e 100644 --- a/OpenICF-java-framework/pom.xml +++ b/OpenICF-java-framework/pom.xml @@ -153,7 +153,7 @@ ${maven.compiler.source} public - + https://docs.groovy-lang.org/latest/html/api/ From f01020d4533a11a4bc742dbdc383bd6a0852b947 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 23 Mar 2026 12:18:49 +0300 Subject: [PATCH 14/19] kill -9 $PID 2>/dev/null || true --- .github/workflows/build.yml | 6 +++--- .../openicf-zip/src/main/resources/bin/openicf.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2148c8e8..3506f87a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,12 +40,12 @@ jobs: openicf/bin/ConnectorServer.sh if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc - openicf/bin/openicf.sh start - openicf/bin/openicf.sh stop - rm -rf openicf/logs else brew install coreutils jsvc fi + openicf/bin/openicf.sh start + openicf/bin/openicf.sh stop + rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' ! grep " ERROR " openicf/logs/ConnectorServer.log diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh index 61f493c9..b935daf2 100644 --- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh +++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh @@ -98,7 +98,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - + kill -9 $PID 2>/dev/null || true echo "The $DESC has stopped." ;; restart) @@ -108,7 +108,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - + kill -9 $PID 2>/dev/null || true # Start the service jsvc_exec "-wait 120" From 65cd3b429c9b9882b0b44e87a05a94d5f0aecb19 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 23 Mar 2026 12:43:12 +0300 Subject: [PATCH 15/19] test log in service --- .github/workflows/build.yml | 2 ++ .../openicf-zip/src/main/resources/bin/openicf.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3506f87a..2f37a4b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,8 @@ jobs: brew install coreutils jsvc fi openicf/bin/openicf.sh start + timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' + ! grep " ERROR " openicf/logs/ConnectorServer.log || cat openicf/logs/ConnectorServer.log openicf/bin/openicf.sh stop rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh index b935daf2..61f493c9 100644 --- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh +++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh @@ -98,7 +98,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - kill -9 $PID 2>/dev/null || true + echo "The $DESC has stopped." ;; restart) @@ -108,7 +108,7 @@ case "$1" in # Stop the service jsvc_exec "-stop" - kill -9 $PID 2>/dev/null || true + # Start the service jsvc_exec "-wait 120" From 56076859bb8f8073624608231b9a044c133892cc Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 23 Mar 2026 14:33:23 +0300 Subject: [PATCH 16/19] openicf.err --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f37a4b3..a4fce7a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,8 +44,8 @@ jobs: brew install coreutils jsvc fi openicf/bin/openicf.sh start - timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' - ! grep " ERROR " openicf/logs/ConnectorServer.log || cat openicf/logs/ConnectorServer.log + timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/openicf.err ; do sleep 5; done' || cat openicf/logs/* + ! grep " ERROR " openicf/logs/ConnectorServer.log openicf/bin/openicf.sh stop rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & From 8102899cba31866160ef7a15604f9a1d0aea3073 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 23 Mar 2026 17:04:23 +0300 Subject: [PATCH 17/19] openicf.err --- .github/workflows/build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4fce7a8..6bc68175 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,14 +40,12 @@ jobs: openicf/bin/ConnectorServer.sh if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get install jsvc - else - brew install coreutils jsvc + openicf/bin/openicf.sh start + timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/openicf.err ; do sleep 5; done' || cat openicf/logs/* + ! grep " ERROR " openicf/logs/ConnectorServer.log + openicf/bin/openicf.sh stop + rm -rf openicf/logs/* fi - openicf/bin/openicf.sh start - timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/openicf.err ; do sleep 5; done' || cat openicf/logs/* - ! grep " ERROR " openicf/logs/ConnectorServer.log - openicf/bin/openicf.sh stop - rm -rf openicf/logs openicf/bin/ConnectorServer.sh /run & timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' ! grep " ERROR " openicf/logs/ConnectorServer.log From e3ab52fd21159cbcfd42cfc1eae71c59482a6865 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Mon, 23 Mar 2026 17:20:13 +0300 Subject: [PATCH 18/19] mac os timeout --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6bc68175..23dbe866 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,8 @@ jobs: ! grep " ERROR " openicf/logs/ConnectorServer.log openicf/bin/openicf.sh stop rm -rf openicf/logs/* + else + brew install coreutils jsvc fi openicf/bin/ConnectorServer.sh /run & timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done' From 44199c8a00f15b03360f9247472dea2a1d016277 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Tue, 24 Mar 2026 11:05:08 +0300 Subject: [PATCH 19/19] Update OpenDJ version to 5.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d596516d..00b3e2e2 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ org.openidentityplatform.opendj opendj-parent - 5.0.4-SNAPSHOT + 5.0.4 pom import