From 7f3554690dc789d6d6de060769b5fb9eb7526f55 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 1 Feb 2025 08:49:25 +0100 Subject: [PATCH 1/4] fix: Submodules removed when Jdep collects necessary modules --- warp4j | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/warp4j b/warp4j index 6db3691..ff280ab 100755 --- a/warp4j +++ b/warp4j @@ -685,7 +685,7 @@ if [[ $JAVA_DISTRO_TYPE == $DISTRO_TYPE_JDK ]]; then if [ -n "$CLASS_PATH" ] then echo "Using given classpaths: $CLASS_PATH" - MODULES=$($JDEPS --class-path $CLASS_PATH --ignore-missing-deps --list-deps --multi-release $JAVA_VERSION_BASE $JAR | awk '{print $1}' | grep -Ev '^(Warning|Error:|Not\sfound|.*\.jar$|ch\.|com\.|org\.)' | sort -u | paste -sd, -) + MODULES=$($JDEPS --class-path $CLASS_PATH --ignore-missing-deps --list-deps --multi-release $JAVA_VERSION_BASE $JAR | awk '{print $1}' | grep -Ev '^(Warning|Error:|Not\sfound|.*\.jar$|ch\.|com\.|org\.)' | sed 's|/.*||' | sort -u | paste -sd, -) elif [ "$AUTO_CLASS_PATH" ] then echo "Extracting jar file to get classpath" @@ -706,6 +706,7 @@ if [[ $JAVA_DISTRO_TYPE == $DISTRO_TYPE_JDK ]]; then echo "Adding additional modules to optimized JDK: $ADD_MODULES" MODULES=$ADD_MODULES,$MODULES fi + echo "Collected modules: $MODULES" fi # creates minimized runtime for the platform From d4461b07cc7562929fe4b34dc1ec208344615f45 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 1 Feb 2025 08:55:23 +0100 Subject: [PATCH 2/4] fix: install.sh: Fix GitHubs warp4j download link --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 6191226..a409c72 100755 --- a/install.sh +++ b/install.sh @@ -128,7 +128,7 @@ get_missing_deps() { fi } -WARP4J_LINK="https://github.com/kirbylink/warp4j/raw/branch/master/warp4j" +WARP4J_LINK="https://github.com/kirbylink/warp4j/raw/refs/heads/master/warp4j" echo "Getting information about warp-packer releases..." WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE) From 2333e597b13f92b5809684cef403b023bda53fb2 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 1 Feb 2025 08:57:22 +0100 Subject: [PATCH 3/4] docs: README.md: Fix GitHubs install.sh download link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c29c280..9a5586b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Just put both `warp4j` and `warp-packer` somewhere in your PATH and run `warp4j Curl one-liner installs the latest versions of both `warp4j` and `warp-packer`: ``` -bash -c "$(curl -fsSL https://github.com/kirbylink/warp4j/raw/branch/master/install.sh)" +bash -c "$(curl -fsSL https://github.com/kirbylink/warp4j/raw/refs/heads/master/install.sh)" ``` This script will show missing dependencies (if there are any); they must be installed with your package manager. @@ -147,4 +147,4 @@ Downloaded runtimes and prepared bundles are here: - Linux: `$HOME/.local/share/warp4j` - macOS: `$HOME/Library/Application Support/warp4j` -To override cache path, set `WARP4J_CACHE` environment variable. \ No newline at end of file +To override cache path, set `WARP4J_CACHE` environment variable. From 7b57388299ad66acb50e7c32dd3e23de87a3a06d Mon Sep 17 00:00:00 2001 From: david Date: Sat, 1 Feb 2025 09:04:45 +0100 Subject: [PATCH 4/4] docs: Update `CHANGELOG.md` --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7849c9..7d4fdd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.2.2] - 2025-02-01 +### Fixed +- Submodules removed when Jdep collects necessary modules +- install.sh: Fix GitHubs warp4j download link + ## [v1.2.1] - 2025-01-17 ### Fixed - Improved transitive dependency detection for `jdeps` call @@ -32,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - See origin repository: https://github.com/guziks/warp4j [unreleased]: https://github.com/kirbylink/warp4j/compare/master...HEAD +[v1.2.2]: https://github.com/kirbylink/warp4j/compare/v1.2.1...v1.2.2 [v1.2.1]: https://github.com/kirbylink/warp4j/compare/v1.2.0...v1.2.1 [v1.2.0]: https://github.com/kirbylink/warp4j/compare/v1.1.0...v1.2.0 [v1.1.0]: https://github.com/kirbylink/warp4j/compare/v1.0.0...v1.1.0