|
 |
998de9f |
From fc7bcc5a8a5548be7916b1aba5169d5644d7e3db Mon Sep 17 00:00:00 2001
|
|
|
6ea16d2 |
From: Mat Booth <mat.booth@redhat.com>
|
|
|
6ea16d2 |
Date: Fri, 21 Jun 2019 11:24:15 +0100
|
|
|
82aede6 |
Subject: [PATCH 3/6] Adapt to API change in aether
|
|
|
6ea16d2 |
|
|
|
6ea16d2 |
---
|
|
|
293108a |
.../internal/lifecyclemapping/LifecycleMappingFactory.java | 6 +++---
|
|
|
f789efe |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
6ea16d2 |
|
|
|
6ea16d2 |
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
|
|
|
293108a |
index 416decc..630992a 100644
|
|
|
6ea16d2 |
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
|
|
|
6ea16d2 |
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java
|
|
|
293108a |
@@ -686,12 +686,12 @@ public class LifecycleMappingFactory {
|
|
|
293108a |
List<PluginExecutionMetadata> result = new ArrayList<>();
|
|
 |
d92b1e7 |
all_metadatas: for(PluginExecutionMetadata metadata : metadatas) {
|
|
|
d92b1e7 |
@SuppressWarnings("unchecked")
|
|
|
d92b1e7 |
- Map<String, String> parameters = metadata.getFilter().getParameters();
|
|
|
d92b1e7 |
+ Map<Object, String> parameters = metadata.getFilter().getParameters();
|
|
|
d92b1e7 |
if(!parameters.isEmpty()) {
|
|
|
293108a |
- for(Entry<String, String> entry : parameters.entrySet()) {
|
|
|
293108a |
+ for(Entry<Object, String> entry : parameters.entrySet()) {
|
|
|
d92b1e7 |
MojoExecution setupExecution = maven.setupMojoExecution(mavenProject, execution, monitor);
|
|
|
293108a |
if(!eq(entry.getValue(),
|
|
|
293108a |
- maven.getMojoParameterValue(mavenProject, setupExecution, entry.getKey(), String.class, monitor))) {
|
|
|
293108a |
+ maven.getMojoParameterValue(mavenProject, setupExecution, (String)entry.getKey(), String.class, monitor))) {
|
|
|
d92b1e7 |
continue all_metadatas;
|
|
|
d92b1e7 |
}
|
|
|
d92b1e7 |
}
|
|
|
6ea16d2 |
--
|
|
|
f789efe |
2.28.0
|
|
|
6ea16d2 |
|