-
Notifications
You must be signed in to change notification settings - Fork 68
Add support for Maven 4 PluginDescriptor.getRequiredJavaVersion() method #401
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
100 changes: 100 additions & 0 deletions
100
...-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginDescriptorHelper.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.tools.plugin; | ||
|
|
||
| import java.lang.reflect.Method; | ||
|
|
||
| import org.apache.maven.plugin.descriptor.PluginDescriptor; | ||
|
|
||
| public class PluginDescriptorHelper { | ||
|
|
||
| private static final Method GET_REQUIRED_JAVA_VERSION_METHOD; | ||
| private static final Method SET_REQUIRED_JAVA_VERSION_METHOD; | ||
|
|
||
| static { | ||
| Method getMethod = null; | ||
| Method setMethod = null; | ||
| try { | ||
| getMethod = PluginDescriptor.class.getMethod("getRequiredJavaVersion"); | ||
| setMethod = PluginDescriptor.class.getMethod("setRequiredJavaVersion", String.class); | ||
| } catch (NoSuchMethodException e) { | ||
| // Methods don't exist in this version of Maven | ||
| } | ||
| GET_REQUIRED_JAVA_VERSION_METHOD = getMethod; | ||
| SET_REQUIRED_JAVA_VERSION_METHOD = setMethod; | ||
| } | ||
|
|
||
| public static String getRequiredJavaVersion(PluginDescriptor descriptor) { | ||
| if (descriptor == null) { | ||
| return null; | ||
| } | ||
|
|
||
| // First try to use the direct method if available in Maven 4 | ||
| if (GET_REQUIRED_JAVA_VERSION_METHOD != null) { | ||
| try { | ||
| return (String) GET_REQUIRED_JAVA_VERSION_METHOD.invoke(descriptor); | ||
| } catch (Exception e) { | ||
| // Fall back to the wrapper approach | ||
| } | ||
| } | ||
|
|
||
| // Fall back to the wrapper approach for Maven 3 | ||
| if (descriptor instanceof ExtendedPluginDescriptor) { | ||
| return ((ExtendedPluginDescriptor) descriptor).getRequiredJavaVersion(); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the required Java version on a plugin descriptor. | ||
| * <p> | ||
| * This method works with both Maven 3 and Maven 4: | ||
| * <ul> | ||
| * <li>In Maven 4, it uses the direct method on the PluginDescriptor class</li> | ||
| * <li>In Maven 3, it uses the ExtendedPluginDescriptor wrapper</li> | ||
| * </ul> | ||
| * | ||
| * @param descriptor the plugin descriptor | ||
| * @param requiredJavaVersion the required Java version to set | ||
| * @return the modified plugin descriptor, or null if the input descriptor was null | ||
| */ | ||
| public static PluginDescriptor setRequiredJavaVersion(PluginDescriptor descriptor, String requiredJavaVersion) { | ||
| if (descriptor == null) { | ||
| return null; | ||
| } | ||
|
|
||
| // First try to use the direct method if available in Maven 4 | ||
| if (SET_REQUIRED_JAVA_VERSION_METHOD != null) { | ||
| try { | ||
| SET_REQUIRED_JAVA_VERSION_METHOD.invoke(descriptor, requiredJavaVersion); | ||
| return descriptor; | ||
| } catch (Exception e) { | ||
| // Fall back to the wrapper approach | ||
| } | ||
| } | ||
|
|
||
| // Fall back to the wrapper approach for Maven 3 | ||
| if (!(descriptor instanceof ExtendedPluginDescriptor)) { | ||
| descriptor = new ExtendedPluginDescriptor(descriptor); | ||
| } | ||
| ((ExtendedPluginDescriptor) descriptor).setRequiredJavaVersion(requiredJavaVersion); | ||
| return descriptor; | ||
| } | ||
| } |
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How it will be used?
Why not direct use class from Maven core ... such master branch will be dedicated to Maven 4?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could, but I still think being able to build a maximum of projects targeting Maven 3 with Maven 4 is a good idea. We do want maximum compatibility when possible.
Also, if we target Maven 4, we should move to the new API, but that's more work imho.
So I'd rather to a micro release, and then start migrating this plugin to target Maven 4.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so should we do it in branch: maven-plugin-tools-3.x ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I suppose. Not sure we need to do it now, unless someone wants to start the migration asap though.