diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3af5fb7..ef70827 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,8 +28,8 @@ jobs: name: Build and test on ${{ matrix.os }}, JDK ${{ matrix.java }} strategy: matrix: - java: [ '17', '24' ] - os: [ 'ubuntu-24.04', 'windows-2022', 'macos-14' ] + java: [ '21', '25' ] + os: [ 'ubuntu-24.04', 'windows-2022', 'macos-15' ] runs-on: ${{ matrix.os }} steps: @@ -49,20 +49,20 @@ jobs: run: ./mvnw --batch-mode --no-transfer-progress clean verify - name: Install Linux dependencies - if: matrix.os == 'ubuntu-24.04' && matrix.java == '24' + if: matrix.os == 'ubuntu-24.04' && matrix.java == '25' run : | sudo apt update sudo apt install rpm - name: Test packaging - if: matrix.java == '24' + if: matrix.java == '25' env: INNOSETUP_PATH: 'C:\\Program Files (x86)\\Inno Setup 6\\iscc.exe' run : java .github/scripts/PackageTest.java - name: Upload test package artefacts - uses: actions/upload-artifact@v5 - if: matrix.java == '24' + uses: actions/upload-artifact@v6 + if: matrix.java == '25' with: name: ${{ matrix.os }}-test path: "target/package-test/output/" diff --git a/NOTICE b/NOTICE index b34bc72..4087496 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache NetBeans Packager (NBPackage) -Copyright 2025 The Apache Software Foundation +Copyright 2026 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index 8c4e9d2..3c86353 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ this is less useful there. ## Building from source -Building `nbpackage` requires JDK 11+. The project uses the Maven Wrapper. +Building `nbpackage` requires JDK 21+. The project uses the Maven Wrapper. Building in the IDE or executing `mvnw package` will build the tool. Output can be found in `target/nbpackage-/`, as well as adjacent source and binary archives. diff --git a/pom.xml b/pom.xml index ded7275..7eaea55 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. org.apache.netbeans nbpackage - 1.0-beta7-SNAPSHOT + 1.0-SNAPSHOT jar Apache NetBeans NBPackage @@ -84,9 +84,9 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 3.11.3 + 3.12.0 - 17 + 21 @@ -95,9 +95,9 @@ under the License. org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 - 17 + 21 -Xlint @@ -108,7 +108,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin - 3.5.3 + 3.5.4 org.apache.rat @@ -173,7 +173,7 @@ under the License. org.apache.maven.plugins maven-assembly-plugin - 3.7.1 + 3.8.0 make-src @@ -243,7 +243,7 @@ under the License. UTF-8 - 5.13.4 + 6.0.2 org.apache.maven.skins maven-fluido-skin 2.0.0-M8 diff --git a/src/assembly/bin/BINARY_NOTICE b/src/assembly/bin/BINARY_NOTICE index be749e2..018c3ba 100644 --- a/src/assembly/bin/BINARY_NOTICE +++ b/src/assembly/bin/BINARY_NOTICE @@ -1,5 +1,5 @@ Apache NetBeans Packager (NBPackage) -Copyright 2024 The Apache Software Foundation +Copyright 2026 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -19,8 +19,20 @@ THIRD PARTY COMPONENTS This software includes third party software subject to the following copyrights: +Apache Commons Codec +Copyright 2002-2026 The Apache Software Foundation +Licensed under the Apache License 2.0 + Apache Commons Compress -Copyright 2002-2021 The Apache Software Foundation +Copyright 2002-2026 The Apache Software Foundation +Licensed under the Apache License 2.0 + +Apache Commons IO +Copyright 2002-2026 The Apache Software Foundation +Licensed under the Apache License 2.0 + +Apache Commons Lang +Copyright 2001-2026 The Apache Software Foundation Licensed under the Apache License 2.0 Picocli diff --git a/src/main/java/org/apache/netbeans/nbpackage/appimage/AppImagePackager.java b/src/main/java/org/apache/netbeans/nbpackage/appimage/AppImagePackager.java index 526be24..1a29278 100644 --- a/src/main/java/org/apache/netbeans/nbpackage/appimage/AppImagePackager.java +++ b/src/main/java/org/apache/netbeans/nbpackage/appimage/AppImagePackager.java @@ -57,16 +57,6 @@ public class AppImagePackager implements Packager { MESSAGES.getString("option.category.default"), MESSAGES.getString("option.category.help")); - /** - * Architecture of AppImage to create. Defaults to parsing from appimagetool - * file name. - */ - @Deprecated(forRemoval = true) - static final Option APPIMAGE_ARCH - = Option.ofString("package.appimage.arch", - MESSAGES.getString("option.arch.help")) - .withStatus(Option.Status.DEPRECATED); - /** * Optional path to custom .desktop template. */ @@ -80,7 +70,7 @@ public class AppImagePackager implements Packager { static final Template DESKTOP_TEMPLATE = Template.of(DESKTOP_TEMPLATE_PATH, "AppImage.desktop.template", () -> AppImagePackager.class.getResourceAsStream("AppImage.desktop.template")); - + /** * Optional path to custom AppRun launcher template. */ @@ -97,8 +87,8 @@ public class AppImagePackager implements Packager { private static final List> APPIMAGE_OPTIONS = List.of(APPIMAGE_TOOL, APPIMAGE_ICON, APPIMAGE_CATEGORY, - APPIMAGE_ARCH, DESKTOP_TEMPLATE_PATH, LAUNCHER_TEMPLATE_PATH); - + DESKTOP_TEMPLATE_PATH, LAUNCHER_TEMPLATE_PATH); + private static final List