From 190ed8d22740e318efa062b5e3b87d6c17f79404 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 1 Jun 2024 19:24:06 +0200 Subject: [PATCH 1/3] Updating CHANGELOD.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ccb5f1..9321cfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v1.2.0] - 2024-06-01 ### Added - Additional modules that aren't fetched by jdeps can be added with `--add-modules module_1,...,module_n` @@ -26,6 +28,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://git.phoenix.ipv64.de/public/warp4j/compare/master...HEAD +[v1.2.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.1.0...v1.2.0 [v1.1.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.0.0...v1.1.0 [v1.0.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/stable...v1.0.0 [origin warp4j]: https://github.com/guziks/warp4j \ No newline at end of file -- 2.47.2 From 9c37c9d46caae0671e1683fb2ba28ea5266f7108 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 17 Jan 2025 07:41:33 +0100 Subject: [PATCH 2/3] fix: Improved transitive dependency detection for `jdeps` call --- warp4j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warp4j b/warp4j index 5a5bcd8..6db3691 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 --print-module-deps --ignore-missing-deps --multi-release $JAVA_VERSION_BASE $JAR | grep -v Warning) + 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, -) elif [ "$AUTO_CLASS_PATH" ] then echo "Extracting jar file to get classpath" -- 2.47.2 From 196ff0fd619098a1a520cfd7df894376305e44d3 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 17 Jan 2025 07:41:45 +0100 Subject: [PATCH 3/3] docs: Update `CHANGELOG.md` --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9321cfc..bb69a9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.2.1] - 2025-01-17 +### Fixed +- Improved transitive dependency detection for `jdeps` call + ## [v1.2.0] - 2024-06-01 ### Added - Additional modules that aren't fetched by jdeps can be added with `--add-modules module_1,...,module_n` @@ -28,6 +32,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://git.phoenix.ipv64.de/public/warp4j/compare/master...HEAD +[v1.2.1]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.2.0...v1.2.1 [v1.2.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.1.0...v1.2.0 [v1.1.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.0.0...v1.1.0 [v1.0.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/stable...v1.0.0 -- 2.47.2