[MJAR-62] Set Build-Jdk according to used toolchain #73
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elharo
requested changes
Mar 20, 2024
src/main/java/org/apache/maven/plugins/jar/ToolchainsJdkSpecification.java
Outdated
Show resolved
Hide resolved
src/test/java/org/apache/maven/plugins/jar/ToolchainsJdkVersionTest.java
Outdated
Show resolved
Hide resolved
slawekjaranowski
force-pushed
the
MJAR-62
branch
from
4cf84bb
to
691e0a1
Compare
elharo
requested changes
Mar 21, 2024
src/main/java/org/apache/maven/plugins/jar/ToolchainsJdkSpecification.java
Outdated
Show resolved
Hide resolved
slawekjaranowski
force-pushed
the
MJAR-62
branch
from
691e0a1
to
68ac9fc
Compare
slawekjaranowski
force-pushed
the
MJAR-62
branch
from
68ac9fc
to
ce7ba4f
Compare
elharo
requested changes
Mar 22, 2024
| if (version.isEmpty()) { | ||
| version = err.getOutput().trim(); | ||
| } | ||
| if (version.startsWith("javac ")) { |
There was a problem hiding this comment.
This seems somewhat prone to unexpected results from javac -v, either in a different JDK than normal or in a future JDK version. Can you add a a catch for IndexOutOfBoundsException and perhaps return null in that case?
| return null; | ||
| } | ||
| } catch (CommandLineException e) { | ||
| throw new UncheckedCommandLineException(e); |
There was a problem hiding this comment.
Since you're already returning null in line 93, it might make sense to return null here as well.
There was a problem hiding this comment.
It is idea .... but we should log a warning about it
There was a problem hiding this comment.
ok, no exception - only warn about something wrong as it is not critical build should not be broken
slawekjaranowski
force-pushed
the
MJAR-62
branch
from
ce7ba4f
to
5269ec0
Compare
elharo
requested changes
Mar 23, 2024
| logger.warn("Unrecognized output form " + path + " -version - " + version); | ||
| return null; | ||
| } | ||
| } catch (CommandLineException e) { |
There was a problem hiding this comment.
CommandLineException | IndexOutOfBoundsException
slawekjaranowski
force-pushed
the
MJAR-62
branch
from
5269ec0
to
3002a3a
Compare
elharo
approved these changes
Mar 24, 2024
dongjoon-hyun
pushed a commit
to apache/spark
that referenced
this pull request
Apr 16, 2024
### What changes were proposed in this pull request? ### Why are the changes needed? - `exec-maven-plugin` from `3.1.0` to `3.2.0` https://github.com/mojohaus/exec-maven-plugin/releases/tag/3.2.0 https://github.com/mojohaus/exec-maven-plugin/releases/tag/3.1.1 Bug Fixes: 1.Fix mojohaus/exec-maven-plugin#158 - Fix non ascii character handling (mojohaus/exec-maven-plugin#372) 2.[mojohaus/exec-maven-plugin#323] exec arguments missing (mojohaus/exec-maven-plugin#324) - `build-helper-maven-plugin` from `3.4.0` to `3.5.0` https://github.com/mojohaus/build-helper-maven-plugin/releases/tag/3.5.0 - `maven-compiler-plugin` from `3.12.1` to `3.13.0` https://github.com/apache/maven-compiler-plugin/releases/tag/maven-compiler-plugin-3.13.0 - `maven-jar-plugin` from `3.3.0` to `3.4.0` https://github.com/apache/maven-jar-plugin/releases/tag/maven-jar-plugin-3.4.0 [[MJAR-62]](https://issues.apache.org/jira/browse/MJAR-62) - Set Build-Jdk according to used toolchain (apache/maven-jar-plugin#73) - `maven-source-plugin` from `3.3.0` to `3.3.1` https://github.com/apache/maven-source-plugin/releases/tag/maven-source-plugin-3.3.1 - `maven-assembly-plugin` from `3.6.0` to `3.7.1` https://github.com/apache/maven-assembly-plugin/releases/tag/maven-assembly-plugin-3.7.1 https://github.com/apache/maven-assembly-plugin/releases/tag/maven-assembly-plugin-3.7.0 Bug Fixes: 1.[[MASSEMBLY-967](https://issues.apache.org/jira/browse/MASSEMBLY-967)] - maven-assembly-plugin doesn't add target/class artifacts in generated jarfat but META-INF/MANIFEST.MF seems to be correct 2.[[MASSEMBLY-994](https://issues.apache.org/jira/browse/MASSEMBLY-994)] - Items from unpacked dependency are not refreshed 3.[[MASSEMBLY-998](https://issues.apache.org/jira/browse/MASSEMBLY-998)] - Transitive dependencies are not properly excluded as of 3.1.1 4.[[MASSEMBLY-1008](https://issues.apache.org/jira/browse/MASSEMBLY-1008)] - Assembly plugin handles scopes wrongly 5.[[MASSEMBLY-1020](https://issues.apache.org/jira/browse/MASSEMBLY-1020)] - Cannot invoke "java.io.File.isFile()" because "this.inputFile" is null 6.[[MASSEMBLY-1021](https://issues.apache.org/jira/browse/MASSEMBLY-1021)] - Nullpointer in assembly:single when upgrading to 3.7.0 7.[[MASSEMBLY-1022](https://issues.apache.org/jira/browse/MASSEMBLY-1022)] - Unresolved artifacts should be not processed - `cyclonedx-maven-plugin` from `2.7.9` to `2.8.0` https://github.com/CycloneDX/cyclonedx-maven-plugin/releases/tag/cyclonedx-maven-plugin-2.8.0 https://github.com/CycloneDX/cyclonedx-maven-plugin/releases/tag/cyclonedx-maven-plugin-2.7.11 https://github.com/CycloneDX/cyclonedx-maven-plugin/releases/tag/cyclonedx-maven-plugin-2.7.10 Bug Fixes: 1.check if configured schemaVersion is supported (CycloneDX/cyclonedx-maven-plugin#479) 2.ignore bomGenerator.generate() call (CycloneDX/cyclonedx-maven-plugin#376) ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #46043 from panbingkun/update_maven_plugins. Authored-by: panbingkun <panbingkun@baidu.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.apache.org/jira/browse/MJAR-62