Skip to content

[MNG-7505] Remove ReportingConverter #906

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.

Sign up for GitHub

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
gnodet merged 3 commits into from
Dec 11, 2022
Merged

[MNG-7505] Remove ReportingConverter #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ad44b8
[MNG-7505] Disable reportPlugins processing if m-site-p >= 3.7.0 is used
gnodet Dec 9, 2022
1288288
[MNG-7505] Disable reportPlugins processing
gnodet Dec 9, 2022
fa79e52
Remove ReportingConverter and impl completely
gnodet Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,7 @@ public void testPluginInheritanceSimple() throws Exception {
@Test
public void testPluginManagementDuplicate() throws Exception {
PomTestWrapper pom = this.buildPom("plugin-management-duplicate/sub");
assertEquals(8, ((List<?>) pom.getValue("build/pluginManagement/plugins")).size());
assertEquals(7, ((List<?>) pom.getValue("build/pluginManagement/plugins")).size());
}

@Test
Expand Down
52 changes: 0 additions & 52 deletions maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
import org.apache.maven.model.plugin.LifecycleBindingsInjector;
import org.apache.maven.model.plugin.PluginConfigurationExpander;
import org.apache.maven.model.plugin.ReportConfigurationExpander;
import org.apache.maven.model.plugin.ReportingConverter;
import org.apache.maven.model.profile.DefaultProfileActivationContext;
import org.apache.maven.model.profile.ProfileActivationContext;
import org.apache.maven.model.profile.ProfileInjector;
Expand Down Expand Up @@ -118,7 +117,6 @@ public class DefaultModelBuilder implements ModelBuilder {
private final LifecycleBindingsInjector lifecycleBindingsInjector;
private final PluginConfigurationExpander pluginConfigurationExpander;
private final ReportConfigurationExpander reportConfigurationExpander;
private final ReportingConverter reportingConverter;
private final ProfileActivationFilePathInterpolator profileActivationFilePathInterpolator;
private final ModelVersionProcessor versionProcessor;

Expand All @@ -141,7 +139,6 @@ public DefaultModelBuilder(
@Nullable LifecycleBindingsInjector lifecycleBindingsInjector,
PluginConfigurationExpander pluginConfigurationExpander,
ReportConfigurationExpander reportConfigurationExpander,
ReportingConverter reportingConverter,
ProfileActivationFilePathInterpolator profileActivationFilePathInterpolator,
ModelVersionProcessor versionProcessor) {
this.modelProcessor = modelProcessor;
Expand All @@ -160,7 +157,6 @@ public DefaultModelBuilder(
this.lifecycleBindingsInjector = lifecycleBindingsInjector;
this.pluginConfigurationExpander = pluginConfigurationExpander;
this.reportConfigurationExpander = reportConfigurationExpander;
this.reportingConverter = reportingConverter;
this.profileActivationFilePathInterpolator = profileActivationFilePathInterpolator;
this.versionProcessor = versionProcessor;
}
Expand Down Expand Up @@ -188,7 +184,6 @@ public DefaultModelBuilder setModelProcessor(ModelProcessor modelProcessor) {
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -216,7 +211,6 @@ public DefaultModelBuilder setModelValidator(ModelValidator modelValidator) {
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -244,7 +238,6 @@ public DefaultModelBuilder setModelNormalizer(ModelNormalizer modelNormalizer) {
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -272,7 +265,6 @@ public DefaultModelBuilder setModelInterpolator(ModelInterpolator modelInterpola
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -300,7 +292,6 @@ public DefaultModelBuilder setModelPathTranslator(ModelPathTranslator modelPathT
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -328,7 +319,6 @@ public DefaultModelBuilder setModelUrlNormalizer(ModelUrlNormalizer modelUrlNorm
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -356,7 +346,6 @@ public DefaultModelBuilder setSuperPomProvider(SuperPomProvider superPomProvider
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -384,7 +373,6 @@ public DefaultModelBuilder setInheritanceAssembler(InheritanceAssembler inherita
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -412,7 +400,6 @@ public DefaultModelBuilder setProfileSelector(ProfileSelector profileSelector) {
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -440,7 +427,6 @@ public DefaultModelBuilder setProfileInjector(ProfileInjector profileInjector) {
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -468,7 +454,6 @@ public DefaultModelBuilder setPluginManagementInjector(PluginManagementInjector
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -497,7 +482,6 @@ public DefaultModelBuilder setDependencyManagementInjector(
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -526,7 +510,6 @@ public DefaultModelBuilder setDependencyManagementImporter(
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -554,7 +537,6 @@ public DefaultModelBuilder setLifecycleBindingsInjector(LifecycleBindingsInjecto
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -582,7 +564,6 @@ public DefaultModelBuilder setPluginConfigurationExpander(PluginConfigurationExp
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -610,35 +591,6 @@ public DefaultModelBuilder setReportConfigurationExpander(ReportConfigurationExp
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}

/**
* @deprecated since Maven 4
* @see DefaultModelBuilderFactory#setReportingConverter(ReportingConverter)
*/
@Deprecated
public DefaultModelBuilder setReportingConverter(ReportingConverter reportingConverter) {
return new DefaultModelBuilder(
modelProcessor,
modelValidator,
modelNormalizer,
modelInterpolator,
modelPathTranslator,
modelUrlNormalizer,
superPomProvider,
inheritanceAssembler,
profileSelector,
profileInjector,
pluginManagementInjector,
dependencyManagementInjector,
dependencyManagementImporter,
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -667,7 +619,6 @@ public DefaultModelBuilder setProfileActivationFilePathInterpolator(
lifecycleBindingsInjector,
pluginConfigurationExpander,
reportConfigurationExpander,
reportingConverter,
profileActivationFilePathInterpolator,
versionProcessor);
}
Expand Down Expand Up @@ -963,9 +914,6 @@ private ModelBuildingResult build(
// reports configuration
reportConfigurationExpander.expandPluginConfiguration(resultModel, request, problems);

// reports conversion to decoupled site plugin
reportingConverter.convertReporting(resultModel, request, problems);

// plugins configuration
pluginConfigurationExpander.expandPluginConfiguration(resultModel, request, problems);
}
Expand Down
13 changes: 0 additions & 13 deletions ...del-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@
import org.apache.maven.model.path.UrlNormalizer;
import org.apache.maven.model.plugin.DefaultPluginConfigurationExpander;
import org.apache.maven.model.plugin.DefaultReportConfigurationExpander;
import org.apache.maven.model.plugin.DefaultReportingConverter;
import org.apache.maven.model.plugin.LifecycleBindingsInjector;
import org.apache.maven.model.plugin.PluginConfigurationExpander;
import org.apache.maven.model.plugin.ReportConfigurationExpander;
import org.apache.maven.model.plugin.ReportingConverter;
import org.apache.maven.model.profile.DefaultProfileInjector;
import org.apache.maven.model.profile.DefaultProfileSelector;
import org.apache.maven.model.profile.ProfileInjector;
Expand Down Expand Up @@ -96,7 +94,6 @@ public class DefaultModelBuilderFactory {
private LifecycleBindingsInjector lifecycleBindingsInjector;
private PluginConfigurationExpander pluginConfigurationExpander;
private ReportConfigurationExpander reportConfigurationExpander;
private ReportingConverter reportingConverter;
private ProfileActivationFilePathInterpolator profileActivationFilePathInterpolator;
private ModelVersionProcessor versionProcessor;

Expand Down Expand Up @@ -185,11 +182,6 @@ public DefaultModelBuilderFactory setReportConfigurationExpander(
return this;
}

public DefaultModelBuilderFactory setReportingConverter(ReportingConverter reportingConverter) {
this.reportingConverter = reportingConverter;
return this;
}

public DefaultModelBuilderFactory setProfileActivationFilePathInterpolator(
ProfileActivationFilePathInterpolator profileActivationFilePathInterpolator) {
this.profileActivationFilePathInterpolator = profileActivationFilePathInterpolator;
Expand Down Expand Up @@ -301,10 +293,6 @@ protected ReportConfigurationExpander newReportConfigurationExpander() {
return new DefaultReportConfigurationExpander();
}

protected ReportingConverter newReportingConverter() {
return new DefaultReportingConverter();
}

private ModelSourceTransformer newModelSourceTransformer() {
return new DefaultModelSourceTransformer();
}
Expand Down Expand Up @@ -332,7 +320,6 @@ public DefaultModelBuilder newInstance() {
lifecycleBindingsInjector != null ? lifecycleBindingsInjector : newLifecycleBindingsInjector(),
pluginConfigurationExpander != null ? pluginConfigurationExpander : newPluginConfigurationExpander(),
reportConfigurationExpander != null ? reportConfigurationExpander : newReportConfigurationExpander(),
reportingConverter != null ? reportingConverter : newReportingConverter(),
profileActivationFilePathInterpolator != null
? profileActivationFilePathInterpolator
: newProfileActivationFilePathInterpolator(),
Expand Down
Loading