hotfix/1.2.2 #35

Merged
David merged 2 commits from hotfix/1.2.2 into master 2025-02-01 08:33:38 +01:00
2 changed files with 7 additions and 1 deletions

View File

@ -7,6 +7,10 @@ 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
## [v1.2.1] - 2025-01-17
### Fixed
- Improved transitive dependency detection for `jdeps` call
@ -32,6 +36,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.2]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.2.1...v1.2.2
[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

3
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 --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