From 863edbfec962fb4f245063c11d5f9025307f32c8 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Wed, 25 Dec 2024 07:47:19 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11
---
opendj-packages/opendj-docker/pom.xml | 2
opendj-rest2ldap-servlet/pom.xml | 2
opendj-legacy/pom.xml | 2
opendj-embedded/pom.xml | 2
opendj-packages/opendj-msi/opendj-msi-standard/pom.xml | 2
opendj-doc-generated-ref/pom.xml | 2
opendj-packages/opendj-msi/pom.xml | 2
.github/workflows/deploy.yml | 2
opendj-packages/opendj-svr4/pom.xml | 2
opendj-rest2ldap/pom.xml | 2
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 2
pom.xml | 4 +-
opendj-ldap-sdk-examples/pom.xml | 2
opendj-server-legacy/pom.xml | 2
opendj-grizzly/pom.xml | 2
opendj-ldap-toolkit/pom.xml | 2
opendj-maven-plugin/pom.xml | 2
opendj-server-example-plugin/pom.xml | 2
opendj-config/pom.xml | 2
opendj-cli/pom.xml | 2
opendj-packages/pom.xml | 2
opendj-server-msad-plugin/pom.xml | 2
opendj-doc-maven-plugin/pom.xml | 2
opendj-openidm-account-change-notification-handler/pom.xml | 2
opendj-server/pom.xml | 2
opendj-dsml-servlet/pom.xml | 2
opendj-packages/opendj-deb/opendj-deb-standard/pom.xml | 2
opendj-packages/opendj-deb/pom.xml | 2
.github/workflows/release.yml | 2
.github/workflows/build.yml | 2
opendj-embedded-server-examples/pom.xml | 2
opendj-core/pom.xml | 2
opendj-packages/opendj-rpm/pom.xml | 2
33 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 286b22b..c88f414 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@
sudo mkdir -pm755 /etc/apt/keyrings && sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -c -s)/winehq-$(lsb_release -c -s).sources
sudo apt-get update
- sudo apt install --install-recommends winehq-stable
+ sudo apt install --install-recommends winehq-stable || sudo apt install --install-recommends winehq-staging
sudo mkdir -p /opt/wine/mono && sudo wget "https://dl.winehq.org/wine/wine-mono/8.0.0/wine-mono-8.0.0-x86.tar.xz" -P /opt/wine/mono && sudo tar -xf /opt/wine/mono/wine-mono-8.0.0-x86.tar.xz -C /opt/wine/mono && sudo rm /opt/wine/mono/wine-mono-8.0.0-x86.tar.xz
wine --version
- uses: actions/checkout@v4
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 105a62d..6abb4e4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -23,7 +23,7 @@
sudo mkdir -pm755 /etc/apt/keyrings && sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -c -s)/winehq-$(lsb_release -c -s).sources
sudo apt-get update
- sudo apt install --install-recommends winehq-stable
+ sudo apt install --install-recommends winehq-stable || sudo apt install --install-recommends winehq-staging
sudo mkdir -p /opt/wine/mono && sudo wget "https://dl.winehq.org/wine/wine-mono/8.0.0/wine-mono-8.0.0-x86.tar.xz" -P /opt/wine/mono && sudo tar -xf /opt/wine/mono/wine-mono-8.0.0-x86.tar.xz -C /opt/wine/mono && sudo rm /opt/wine/mono/wine-mono-8.0.0-x86.tar.xz
wine --version
- uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e881ef6..034e8ae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@
sudo mkdir -pm755 /etc/apt/keyrings && sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -c -s)/winehq-$(lsb_release -c -s).sources
sudo apt-get update
- sudo apt install --install-recommends winehq-stable
+ sudo apt install --install-recommends winehq-stable || sudo apt install --install-recommends winehq-staging
sudo mkdir -p /opt/wine/mono && sudo wget "https://dl.winehq.org/wine/wine-mono/8.0.0/wine-mono-8.0.0-x86.tar.xz" -P /opt/wine/mono && sudo tar -xf /opt/wine/mono/wine-mono-8.0.0-x86.tar.xz -C /opt/wine/mono && sudo rm /opt/wine/mono/wine-mono-8.0.0-x86.tar.xz
wine --version
- uses: actions/checkout@v4
diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml
index d1a30c9..eb36e20 100644
--- a/opendj-cli/pom.xml
+++ b/opendj-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-cli</artifactId>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 4c49291..e0ea04b 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-config</artifactId>
<name>OpenDJ Configuration API</name>
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 9bd2c19..2ea42d5 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-core</artifactId>
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 0da2a8a..d85ca1d 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-generated-ref</artifactId>
diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml
index 1ea7e46..b7b163b 100644
--- a/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-doc-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-doc-maven-plugin</artifactId>
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 5b8adf8..14eee10 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-dsml-servlet</artifactId>
diff --git a/opendj-embedded-server-examples/pom.xml b/opendj-embedded-server-examples/pom.xml
index 07b6c76..250ce0d 100644
--- a/opendj-embedded-server-examples/pom.xml
+++ b/opendj-embedded-server-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-embedded-server-examples</artifactId>
diff --git a/opendj-embedded/pom.xml b/opendj-embedded/pom.xml
index 9b26f83..1c05031 100644
--- a/opendj-embedded/pom.xml
+++ b/opendj-embedded/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<name>OpenDJ Embedded Server</name>
<artifactId>opendj-embedded</artifactId>
diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml
index e0190c6..09fe751 100644
--- a/opendj-grizzly/pom.xml
+++ b/opendj-grizzly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-grizzly</artifactId>
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index 357755a..3d6d9e3 100644
--- a/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-ldap-sdk-examples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 4732d9e..74391df 100644
--- a/opendj-ldap-toolkit/pom.xml
+++ b/opendj-ldap-toolkit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
diff --git a/opendj-legacy/pom.xml b/opendj-legacy/pom.xml
index 9f552d0..5d5d17d 100644
--- a/opendj-legacy/pom.xml
+++ b/opendj-legacy/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-legacy</artifactId>
<name>OpenDJ Legacy</name>
diff --git a/opendj-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
index 49814d1..aef1307 100644
--- a/opendj-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-maven-plugin</artifactId>
diff --git a/opendj-openidm-account-change-notification-handler/pom.xml b/opendj-openidm-account-change-notification-handler/pom.xml
index b0c5482..441e958 100644
--- a/opendj-openidm-account-change-notification-handler/pom.xml
+++ b/opendj-openidm-account-change-notification-handler/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-openidm-account-change-notification-handler</artifactId>
<name>OpenDJ account change notification handler for OpenIDM</name>
diff --git a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml b/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
index 3fd7c7a..01b68f0 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/pom.xml
+++ b/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.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-deb-standard</artifactId>
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index 336dca6..b58ce08 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-docker/pom.xml b/opendj-packages/opendj-docker/pom.xml
index a0667bc..1a63a37 100644
--- a/opendj-packages/opendj-docker/pom.xml
+++ b/opendj-packages/opendj-docker/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<profiles>
diff --git a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml b/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
index ddb9d30..c8c5871 100644
--- a/opendj-packages/opendj-msi/opendj-msi-standard/pom.xml
+++ b/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.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi-standard</artifactId>
diff --git a/opendj-packages/opendj-msi/pom.xml b/opendj-packages/opendj-msi/pom.xml
index c127aae..62c170f 100644
--- a/opendj-packages/opendj-msi/pom.xml
+++ b/opendj-packages/opendj-msi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-msi</artifactId>
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 194aba7..f6b49e8 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/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.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-rpm-standard</artifactId>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index f27070a..b31e4fb 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
diff --git a/opendj-packages/opendj-svr4/pom.xml b/opendj-packages/opendj-svr4/pom.xml
index 307421f..46f50e8 100644
--- a/opendj-packages/opendj-svr4/pom.xml
+++ b/opendj-packages/opendj-svr4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-packages</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-svr4</artifactId>
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 576afaa..d324c41 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-packages</artifactId>
diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml
index 069b72d..0200445 100644
--- a/opendj-rest2ldap-servlet/pom.xml
+++ b/opendj-rest2ldap-servlet/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap-servlet</artifactId>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 7aec033..2b125af 100644
--- a/opendj-rest2ldap/pom.xml
+++ b/opendj-rest2ldap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.openidentityplatform.opendj</groupId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-rest2ldap</artifactId>
diff --git a/opendj-server-example-plugin/pom.xml b/opendj-server-example-plugin/pom.xml
index 5507da0..0cc7025 100644
--- a/opendj-server-example-plugin/pom.xml
+++ b/opendj-server-example-plugin/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-example-plugin</artifactId>
<name>OpenDJ Server Example Plugin</name>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index bb6405a..97008f7 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-legacy</artifactId>
<packaging>jar</packaging>
diff --git a/opendj-server-msad-plugin/pom.xml b/opendj-server-msad-plugin/pom.xml
index 3d3700c..67aba46 100644
--- a/opendj-server-msad-plugin/pom.xml
+++ b/opendj-server-msad-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-server-msad-plugin</artifactId>
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 71fd934..a21b164 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
</parent>
<artifactId>opendj-server</artifactId>
<name>OpenDJ Server NG</name>
diff --git a/pom.xml b/pom.xml
index 268a72a..a7b14ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.8.2-SNAPSHOT</version>
+ <version>4.8.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Services Project</name>
@@ -35,7 +35,7 @@
<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>
- <commons.version>2.2.2</commons.version>
+ <commons.version>2.2.3</commons.version>
<freemarker.version>2.3.31</freemarker.version>
<grizzly-framework.version>2.3.35</grizzly-framework.version>
<metrics-core.version>3.1.2</metrics-core.version>
--
Gitblit v1.10.0