Merge master into develop branch #33

Merged
David merged 5 commits from master into develop 2025-01-17 11:36:41 +01:00
2 changed files with 9 additions and 1 deletions

View File

@ -6,6 +6,12 @@ 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.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`
@ -26,6 +32,8 @@ 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
[origin warp4j]: https://github.com/guziks/warp4j

2
warp4j
View File

@ -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"