From 661f3c8e6c4ab59365c34fd447acc41869acee4e Mon Sep 17 00:00:00 2001 From: Norbert Klasen Date: Wed, 5 Feb 2025 09:43:08 +0100 Subject: [PATCH 01/19] DIRSTUDIO-1287 Bump mina from 2.1.3 to 2.1.10 With mina 2.1.3 connections to TLS 1.3 enabled servers fail with `ERR_04169_RESPONSE_QUEUE_EMPTIED`. See - https://issues.apache.org/jira/browse/DIRSTUDIO-1287 - https://issues.apache.org/jira/browse/DIRAPI-381 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9f1ecb365..3aa436252 100644 --- a/pom.xml +++ b/pom.xml @@ -99,8 +99,8 @@ 2.1.0 2.1.0 2.0.0.AM26 - 2.1.3 - 2.1.3 + 2.1.10 + 2.1.10 5.2.5 5.2.5 2.9 From 67fbfd606d88611dff0e9aa3534d052f0cd87a0c Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:20:18 +0200 Subject: [PATCH 02/19] Add autobuilt packages --- .github/workflows/release.yml | 81 +++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..6cb9bfe71 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,81 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: "Build and Test" + +on: + pull_request: + branches: ['master'] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: read + timeout-minutes: 130 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - name: Set up JDK 11 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Apache Maven + run: mvn -f pom-first.xml -U clean install && mvn clean install + - name: Package releases + run: | + mkdir ${{ github.workspace }}/packages + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/linux/gtk/x86_64 + tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-linux-x86_64.tar.gz ApacheDirectoryStudio + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64 + tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.tar.gz ApacheDirectoryStudio + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 + tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.tar.gz ApacheDirectoryStudio + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64 + tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-windows-x86_64.tar.gz ApacheDirectoryStudio + - name: Archive packages + uses: actions/upload-artifact@v4 + with: + name: packages + retention-days: 1 + path: ${{ github.workspace }}/packages + env: + MAVEN_OPTS: "-Xmx1024M" + release-to-github: + # Forks don't need to release packages, just have the artifacts available + #if: github.repository_owner == 'nxadm' && startsWith(github.ref, 'refs/tags/v') + needs: build + runs-on: ubuntu-latest + steps: + - name: Download packages + uses: actions/download-artifact@v4 + with: + path: packages + pattern: * + merge-multiple: true + - run: ls -R packages + - name: Upload to Github Releases + uses: ncipollo/release-action@v1 + with: + artifacts: "packages/*.tar.gz" + token: ${{ secrets.GITHUB_TOKEN }} + draft: true + body: "Apache Directory Studio Releases for Linux, MacOS and Windows. Enhancements: support for MacOS ARM + fix TLS 1.3 bug" + From a4b81177c28ae0af13ffa41f20bb6d8dabd9ca23 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:22:24 +0200 Subject: [PATCH 03/19] Add autobuilt packages --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6cb9bfe71..0f6f3e389 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,6 @@ jobs: env: MAVEN_OPTS: "-Xmx1024M" release-to-github: - # Forks don't need to release packages, just have the artifacts available #if: github.repository_owner == 'nxadm' && startsWith(github.ref, 'refs/tags/v') needs: build runs-on: ubuntu-latest @@ -69,7 +68,6 @@ jobs: with: path: packages pattern: * - merge-multiple: true - run: ls -R packages - name: Upload to Github Releases uses: ncipollo/release-action@v1 From 06b92a4e8fdea6c4f31f64dcf8758ca6eb7f8e37 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:23:32 +0200 Subject: [PATCH 04/19] Add autobuilt packages --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f6f3e389..44d6357e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,6 @@ jobs: uses: actions/download-artifact@v4 with: path: packages - pattern: * - run: ls -R packages - name: Upload to Github Releases uses: ncipollo/release-action@v1 From a8ca9fb44c49ba8c8245758b41c98eb069c63680 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:25:59 +0200 Subject: [PATCH 05/19] Add autobuilt packages --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44d6357e7..a4b17b050 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: "Build and Test" +name: "Release" -on: - pull_request: - branches: ['master'] +#on: +# pull_request: +# branches: ['master'] permissions: contents: read From 75a14260435312435d871e053dd06f471162a076 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:26:59 +0200 Subject: [PATCH 06/19] Add autobuilt packages --- .github/workflows/release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4b17b050..d7704510a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,7 @@ # limitations under the License. name: "Release" - -#on: -# pull_request: -# branches: ['master'] +on: [push, pull_request] permissions: contents: read From 0a5c32ad237059685265f97fedf3e078e9da42ea Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:35:24 +0200 Subject: [PATCH 07/19] Add autobuilt packages --- .github/workflows/release.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7704510a..01b547955 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,15 +38,23 @@ jobs: run: mvn -f pom-first.xml -U clean install && mvn clean install - name: Package releases run: | + set -xv mkdir ${{ github.workspace }}/packages cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/linux/gtk/x86_64 - tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-linux-x86_64.tar.gz ApacheDirectoryStudio + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-linux-x86_64.tar.gz + tar cvzf $PKGNAME ApacheDirectoryStudio + sha512sum $PKGNAME > $PKGNAME.sha512 cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64 - tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.tar.gz ApacheDirectoryStudio + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.tar.gz + tar cvzf $PKGNAME ApacheDirectoryStudio + sha512sum $PKGNAME > $PKGNAME.sha512 cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 - tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.tar.gz ApacheDirectoryStudio + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.tar.gz + tar cvzf $PKGNAME ApacheDirectoryStudio + sha512sum $PKGNAME > $PKGNAME.sha512 cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64 - tar cvzf ${{ github.workspace }}/packages/ApacheDirectoryStudio-windows-x86_64.tar.gz ApacheDirectoryStudio + tar cvzf $PKGNAME ApacheDirectoryStudio + sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages uses: actions/upload-artifact@v4 with: @@ -68,7 +76,7 @@ jobs: - name: Upload to Github Releases uses: ncipollo/release-action@v1 with: - artifacts: "packages/*.tar.gz" + artifacts: "packages/*.tar.gz*" token: ${{ secrets.GITHUB_TOKEN }} draft: true body: "Apache Directory Studio Releases for Linux, MacOS and Windows. Enhancements: support for MacOS ARM + fix TLS 1.3 bug" From a06805f1622d963df85499aac5b83acddb146330 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:42:15 +0200 Subject: [PATCH 08/19] Add autobuilt packages --- .github/workflows/release.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01b547955..e7e9099e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,19 +40,24 @@ jobs: run: | set -xv mkdir ${{ github.workspace }}/packages - cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/linux/gtk/x86_64 export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-linux-x86_64.tar.gz + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/linux/gtk/x86_64 + ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64 export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.tar.gz + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64 + ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.tar.gz + cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 + ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-win32-x86_64.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64 + ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages From 12b5fd2d5dac6e61010f280036b597e0d2baf7ed Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:49:30 +0200 Subject: [PATCH 09/19] Add autobuilt packages --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7e9099e0..48d120935 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,15 +50,15 @@ jobs: ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.app.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 ls -la - tar cvzf $PKGNAME ApacheDirectoryStudio + tar cvzf $PKGNAME ApacheDirectoryStudio.app sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-win32-x86_64.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-win32-x86_64.app.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64 ls -la - tar cvzf $PKGNAME ApacheDirectoryStudio + tar cvzf $PKGNAME ApacheDirectoryStudio.app sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages uses: actions/upload-artifact@v4 From 752635d82952a6edd51ddd525fc143c049b70ea4 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 22 Sep 2025 23:58:18 +0200 Subject: [PATCH 10/19] Add autobuilt packages --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48d120935..6b8448c22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,20 +45,20 @@ jobs: ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.app.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64 ls -la - tar cvzf $PKGNAME ApacheDirectoryStudio + tar cvzf $PKGNAME ApacheDirectoryStudio.app sha512sum $PKGNAME > $PKGNAME.sha512 export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.app.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 ls -la tar cvzf $PKGNAME ApacheDirectoryStudio.app sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-win32-x86_64.app.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-win32-x86_64.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64 ls -la - tar cvzf $PKGNAME ApacheDirectoryStudio.app + tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages uses: actions/upload-artifact@v4 From 47e8ad259a51a5a6b0d6d7e6f0d9e017889cd4a1 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 23 Sep 2025 00:08:31 +0200 Subject: [PATCH 11/19] Build on tag --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b8448c22..adb79327e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: env: MAVEN_OPTS: "-Xmx1024M" release-to-github: - #if: github.repository_owner == 'nxadm' && startsWith(github.ref, 'refs/tags/v') + if: startsWith(github.ref, 'refs/tags/M') needs: build runs-on: ubuntu-latest steps: From ba6c8e4583fe99a7bd8bbc073719991157b0a82a Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 23 Sep 2025 00:12:03 +0200 Subject: [PATCH 12/19] Build on tag --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index adb79327e..da520c4c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,30 +37,32 @@ jobs: - name: Build with Apache Maven run: mvn -f pom-first.xml -U clean install && mvn clean install - name: Package releases + if: startsWith(github.ref, 'refs/tags/M') run: | set -xv mkdir ${{ github.workspace }}/packages - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-linux-x86_64.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-linux-x86_64.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/linux/gtk/x86_64 ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-aarch64.app.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-macos-aarch64.app.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/aarch64 ls -la tar cvzf $PKGNAME ApacheDirectoryStudio.app sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-macos-x86_64.app.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-macos-x86_64.app.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/macosx/cocoa/x86_64 ls -la tar cvzf $PKGNAME ApacheDirectoryStudio.app sha512sum $PKGNAME > $PKGNAME.sha512 - export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-win32-x86_64.tar.gz + export PKGNAME=${{ github.workspace }}/packages/ApacheDirectoryStudio-$GITHUB_REF_NAME-win32-x86_64.tar.gz cd ${{ github.workspace }}/product/target/products/org.apache.directory.studio.product/win32/win32/x86_64 ls -la tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages + if: startsWith(github.ref, 'refs/tags/M') uses: actions/upload-artifact@v4 with: name: packages From 74a468586084d7950499620c4e886b87d780acf4 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 23 Sep 2025 20:55:33 +0200 Subject: [PATCH 13/19] give write permission to releases --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da520c4c5..be75f51e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,8 @@ name: "Release" on: [push, pull_request] -permissions: - contents: read +#permissions: +# contents: read jobs: build: @@ -82,6 +82,8 @@ jobs: - run: ls -R packages - name: Upload to Github Releases uses: ncipollo/release-action@v1 + permissions: + contents: write with: artifacts: "packages/*.tar.gz*" token: ${{ secrets.GITHUB_TOKEN }} From ce5fcee5156d43a29858b2748c8ccd24ef0d9772 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 23 Sep 2025 20:57:07 +0200 Subject: [PATCH 14/19] give write permission to releases --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index be75f51e6..5ea042d82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,8 @@ name: "Release" on: [push, pull_request] -#permissions: -# contents: read +permissions: + contents: write jobs: build: @@ -82,8 +82,6 @@ jobs: - run: ls -R packages - name: Upload to Github Releases uses: ncipollo/release-action@v1 - permissions: - contents: write with: artifacts: "packages/*.tar.gz*" token: ${{ secrets.GITHUB_TOKEN }} From 7d9df6bdda71d6c442302c40a0d017492ce6af49 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Mon, 6 Oct 2025 19:11:50 +0200 Subject: [PATCH 15/19] Test release --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5ea042d82..4e73ce9ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages - if: startsWith(github.ref, 'refs/tags/M') + #if: startsWith(github.ref, 'refs/tags/M') uses: actions/upload-artifact@v4 with: name: packages @@ -71,7 +71,7 @@ jobs: env: MAVEN_OPTS: "-Xmx1024M" release-to-github: - if: startsWith(github.ref, 'refs/tags/M') + #if: startsWith(github.ref, 'refs/tags/M') needs: build runs-on: ubuntu-latest steps: @@ -83,7 +83,7 @@ jobs: - name: Upload to Github Releases uses: ncipollo/release-action@v1 with: - artifacts: "packages/*.tar.gz*" + artifacts: "packages/packages/*.tar.gz*" token: ${{ secrets.GITHUB_TOKEN }} draft: true body: "Apache Directory Studio Releases for Linux, MacOS and Windows. Enhancements: support for MacOS ARM + fix TLS 1.3 bug" From d862b26c434cdcd46effa4aa8d464dfc5785640e Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 7 Oct 2025 17:36:51 +0200 Subject: [PATCH 16/19] Disable download path --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e73ce9ac..4fe043014 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,13 +77,13 @@ jobs: steps: - name: Download packages uses: actions/download-artifact@v4 - with: - path: packages +# with: +# path: packages - run: ls -R packages - name: Upload to Github Releases uses: ncipollo/release-action@v1 with: - artifacts: "packages/packages/*.tar.gz*" + artifacts: "packages/*.tar.gz*" token: ${{ secrets.GITHUB_TOKEN }} draft: true body: "Apache Directory Studio Releases for Linux, MacOS and Windows. Enhancements: support for MacOS ARM + fix TLS 1.3 bug" From e890bf9406d45e2c5b9baa919d378d17819c7c5c Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 7 Oct 2025 17:53:13 +0200 Subject: [PATCH 17/19] Disable download path --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4fe043014..1a64a44a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - name: Build with Apache Maven run: mvn -f pom-first.xml -U clean install && mvn clean install - name: Package releases - if: startsWith(github.ref, 'refs/tags/M') + #if: startsWith(github.ref, 'refs/tags/M') run: | set -xv mkdir ${{ github.workspace }}/packages From c38e20e0acd391c759821ced80f0dff5d89653e1 Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 7 Oct 2025 18:20:22 +0200 Subject: [PATCH 18/19] Release M17 with TLS1.3 fix for all platforms and a build for MacOS ARM --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a64a44a8..9f9e5e2c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - name: Build with Apache Maven run: mvn -f pom-first.xml -U clean install && mvn clean install - name: Package releases - #if: startsWith(github.ref, 'refs/tags/M') + if: startsWith(github.ref, 'refs/tags/M') run: | set -xv mkdir ${{ github.workspace }}/packages @@ -62,7 +62,7 @@ jobs: tar cvzf $PKGNAME ApacheDirectoryStudio sha512sum $PKGNAME > $PKGNAME.sha512 - name: Archive packages - #if: startsWith(github.ref, 'refs/tags/M') + if: startsWith(github.ref, 'refs/tags/M') uses: actions/upload-artifact@v4 with: name: packages @@ -71,7 +71,7 @@ jobs: env: MAVEN_OPTS: "-Xmx1024M" release-to-github: - #if: startsWith(github.ref, 'refs/tags/M') + if: startsWith(github.ref, 'refs/tags/M') needs: build runs-on: ubuntu-latest steps: From fae2016c0e52e23ab9948f1fe5a2b906aa47f5df Mon Sep 17 00:00:00 2001 From: Claudio Ramirez Date: Tue, 7 Oct 2025 18:41:46 +0200 Subject: [PATCH 19/19] Support for MacOS Arm + fix TLS 1.3 bug --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index fcbc8c823..a964fea80 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,13 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> +# Fork: M17 release + +This is a fork of Apache Directory Studio 2.0.0-M17, with the following changes: +- Fixed TLS 1.3 bug by updating dependency (@klasen). +- Support for MacOS ARM (M1/M2) architecture (M17 only released MacOS Intel binaries). + +The new binaries can be found in the [releases section](https://github.com/nxadm/directory-studio/releases). [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/directory-studio/badge)](https://api.securityscorecards.dev/projects/github.com/apache/directory-studio)