-
Notifications
You must be signed in to change notification settings - Fork 2.9k
[MNG-7642] Restore compatibility with flatten-maven-plugin #947
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
4 commits
Select commit
Hold shift + click to select a range
69f09fe
[MNG-7642] Restore compatibility with flatten-maven-plugin
gnodet 0c6b70b
Add some comment about deprecation and remove the unused field
gnodet 0dc76ed
[MNG-7652] switch to Modello Velocity (#944)
gnodet 069c882
[MNG-7642] Explicit the fact that the class is now a no-op class
gnodet 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 was deleted.
Oops, something went wrong.
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
42 changes: 42 additions & 0 deletions
42
...-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.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,42 @@ | ||
| /* | ||
| * 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.model.plugin; | ||
|
|
||
| import javax.inject.Named; | ||
| import javax.inject.Singleton; | ||
|
|
||
| import org.apache.maven.model.Model; | ||
| import org.apache.maven.model.building.ModelBuildingRequest; | ||
| import org.apache.maven.model.building.ModelProblemCollector; | ||
|
|
||
| /** | ||
| * Handles conversion of the <code><reporting></code> section into the configuration of Maven Site Plugin 3.x, | ||
| * i.e. <code>reportPlugins</code> and <code>outputDirectory</code> parameters. | ||
| * | ||
| * @author Benjamin Bentmann | ||
| * @deprecated since maven 4.0, this class is now a no-op class and is only here for compatibility | ||
| */ | ||
| @Named | ||
| @Singleton | ||
| @Deprecated | ||
| public class DefaultReportingConverter implements ReportingConverter { | ||
|
|
||
| @Override | ||
| public void convertReporting(Model model, ModelBuildingRequest request, ModelProblemCollector problems) {} | ||
| } |
43 changes: 43 additions & 0 deletions
43
maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.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,43 @@ | ||
| /* | ||
| * 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.model.plugin; | ||
|
|
||
| import org.apache.maven.model.Model; | ||
| import org.apache.maven.model.building.ModelBuildingRequest; | ||
| import org.apache.maven.model.building.ModelProblemCollector; | ||
|
|
||
| /** | ||
| * Handles conversion of the <code><reporting></code> section into the configuration of Maven Site Plugin 3.x, | ||
| * i.e. <code>reportPlugins</code> and <code>outputDirectory</code> parameters. | ||
| * | ||
| * @author Benjamin Bentmann | ||
| * @deprecated since maven 4.0, this interface is not used anymore and is only here for compatibility | ||
| */ | ||
| @Deprecated | ||
| public interface ReportingConverter { | ||
|
|
||
| /** | ||
| * Converts values from model's reporting section into the configuration for Maven Site Plugin 3.x. | ||
| * | ||
| * @param model The model whose reporting section should be converted, must not be <code>null</code>. | ||
| * @param request The model building request that holds further settings, must not be {@code null}. | ||
| * @param problems The container used to collect problems that were encountered, must not be {@code null}. | ||
| */ | ||
| void convertReporting(Model model, ModelBuildingRequest request, ModelProblemCollector problems); | ||
| } |
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.
There is nothing to be seen there.
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.
All the
setXxxmethods have the same javadoc. The deprecation is not something new in this case.