|
20 | 20 |
|
21 | 21 | import java.io.File; |
22 | 22 | import java.util.Arrays; |
23 | | -import java.util.Collections; |
24 | 23 | import java.util.Deque; |
25 | 24 | import java.util.HashMap; |
26 | 25 | import java.util.HashSet; |
@@ -134,7 +133,6 @@ protected Activation.Builder transformActivation_ActiveByDefault( |
134 | 133 | protected Activation.Builder transformActivation_File( |
135 | 134 | Supplier<? extends Activation.Builder> creator, Activation.Builder builder, Activation target) { |
136 | 135 | stk.push(nextFrame("file", Activation::getFile)); |
137 | | - Optional.ofNullable(target.getFile()); |
138 | 136 | try { |
139 | 137 | return super.transformActivation_File(creator, builder, target); |
140 | 138 | } finally { |
@@ -333,7 +331,7 @@ public void validateFileModel(Model m, ModelBuilderRequest request, ModelProblem |
333 | 331 | if (request.getValidationLevel() == ModelBuilderRequest.VALIDATION_LEVEL_MINIMAL) { |
334 | 332 | // profiles: they are essential for proper model building (may contribute profiles, dependencies...) |
335 | 333 | HashSet<String> minProfileIds = new HashSet<>(); |
336 | | - for (org.apache.maven.api.model.Profile profile : m.getProfiles()) { |
| 334 | + for (Profile profile : m.getProfiles()) { |
337 | 335 | if (!minProfileIds.add(profile.getId())) { |
338 | 336 | addViolation( |
339 | 337 | problems, |
@@ -409,7 +407,6 @@ public void validateFileModel(Model m, ModelBuilderRequest request, ModelProblem |
409 | 407 | } |
410 | 408 | } |
411 | 409 |
|
412 | | - |
413 | 410 | Severity errOn30 = getSeverity(request, ModelBuilderRequest.VALIDATION_LEVEL_MAVEN_3_0); |
414 | 411 |
|
415 | 412 | // The file pom may not contain the modelVersion yet, as it may be set later by the |
@@ -693,10 +690,6 @@ public void validateEffectiveModel(Model m, ModelBuilderRequest request, ModelPr |
693 | 690 |
|
694 | 691 | validateStringNotEmpty("packaging", problems, Severity.ERROR, Version.BASE, m.getPackaging(), m); |
695 | 692 |
|
696 | | - // TODO: if the model is a 4.1.0: |
697 | | - // * modules should be empty, else issue a warning |
698 | | - // * validate subprojects |
699 | | - |
700 | 693 | if (!m.getModules().isEmpty()) { |
701 | 694 | if (!"pom".equals(m.getPackaging())) { |
702 | 695 | addViolation( |
@@ -963,7 +956,7 @@ private void validate20RawDependencies( |
963 | 956 |
|
964 | 957 | private void validate20RawDependenciesSelfReferencing( |
965 | 958 | ModelProblemCollector problems, |
966 | | - org.apache.maven.api.model.Model m, |
| 959 | + Model m, |
967 | 960 | List<Dependency> dependencies, |
968 | 961 | String prefix, |
969 | 962 | ModelBuilderRequest request) { |
@@ -994,7 +987,7 @@ private void validate20RawDependenciesSelfReferencing( |
994 | 987 |
|
995 | 988 | private void validateEffectiveDependencies( |
996 | 989 | ModelProblemCollector problems, |
997 | | - org.apache.maven.api.model.Model m, |
| 990 | + Model m, |
998 | 991 | List<Dependency> dependencies, |
999 | 992 | boolean management, |
1000 | 993 | ModelBuilderRequest request) { |
@@ -1057,7 +1050,7 @@ private void validateEffectiveDependencies( |
1057 | 1050 | private void validateEffectiveModelAgainstDependency( |
1058 | 1051 | String prefix, |
1059 | 1052 | ModelProblemCollector problems, |
1060 | | - org.apache.maven.api.model.Model m, |
| 1053 | + Model m, |
1061 | 1054 | Dependency d, |
1062 | 1055 | ModelBuilderRequest request) { |
1063 | 1056 | String key = d.getGroupId() + ":" + d.getArtifactId() + ":" + d.getVersion() |
|
0 commit comments