From d8446722a8997d6364f9c2806e0022f363329071 Mon Sep 17 00:00:00 2001
From: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Date: Thu, 09 Apr 2026 07:42:02 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into copilot/fix-docker-lint-warning-root-password Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
opendj-server-legacy/pom.xml | 22 +++++++++++++++++++++-
.github/workflows/build.yml | 4 ++--
pom.xml | 2 +-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c90d4df..6f6e1a4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -282,7 +282,7 @@
runs-on: 'ubuntu-latest'
services:
registry:
- image: registry:2
+ image: registry:3
ports:
- 5000:5000
steps:
@@ -346,7 +346,7 @@
runs-on: 'ubuntu-latest'
services:
registry:
- image: registry:2
+ image: registry:3
ports:
- 5000:5000
steps:
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 530a32c..6001979 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -256,7 +256,6 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>java-driver-core</artifactId>
- <version>4.19.2</version>
<exclusions>
<exclusion>
<groupId>org.reactivestreams</groupId>
@@ -1136,6 +1135,27 @@
</target>
</configuration>
</execution>
+
+ <!-- Generate slim zip and attach artefact -->
+ <execution>
+ <id>attach-artifact-slim</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <zip destfile="${project.build.directory}/package/${product.archive.name}-slim.zip">
+ <zipfileset dir="${project.build.directory}/package/${product.name.lowercase}" includes="**/*" excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/universalJavaApplicationStub,Uninstall.app/Contents/MacOS/universalJavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/universalJavaApplicationStub,lib/org.apache.cassandra.*,lib/com.oracle.database.jdbc*,lib/com.mysql.mysql-connector*,lib/com.microsoft.sqlserver*,lib/org.postgresql.*" filemode="644" dirmode="755" prefix="opendj" />
+ <zipfileset dir="${project.build.directory}/package/${product.name.lowercase}" includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh" filemode="755" dirmode="755" prefix="opendj" />
+ <zipfileset dir="${project.build.directory}/package/${product.name.lowercase}" includes="bin/*" filemode="755" dirmode="755" prefix="opendj" />
+ <zipfileset dir="${project.build.directory}/package/${product.name.lowercase}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/universalJavaApplicationStub,Uninstall.app/Contents/MacOS/universalJavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/universalJavaApplicationStub" filemode="755" dirmode="755" prefix="opendj" />
+ <zipfileset dir="${project.build.directory}/package/${product.name.lowercase}" includes="template/**/*" filemode="444" dirmode="744" prefix="opendj" />
+ </zip>
+ <attachartifact file="${project.build.directory}/package/${product.archive.name}-slim.zip" classifier="slim" type="zip" />
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
diff --git a/pom.xml b/pom.xml
index 81b1726..209a235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>3.0.4</commons.version>
+ <commons.version>3.0.5-SNAPSHOT</commons.version>
<freemarker.version>2.3.34</freemarker.version>
<metrics-core.version>4.2.30</metrics-core.version>
<bc.fips.version>2.1.2</bc.fips.version>
--
Gitblit v1.10.0