From c4fceef8e2f7a03171eb703e4f6ffba0cd3e451f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 21 Jun 2019 11:24:15 +0100 Subject: [PATCH 3/6] Adapt to API change in aether --- .../embedder/ContextRepositorySystemSessionImpl.java | 6 ------ .../internal/lifecyclemapping/LifecycleMappingFactory.java | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) 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 index 416decc..630992a 100644 --- 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 @@ -686,12 +686,12 @@ public class LifecycleMappingFactory { List result = new ArrayList<>(); all_metadatas: for(PluginExecutionMetadata metadata : metadatas) { @SuppressWarnings("unchecked") - Map parameters = metadata.getFilter().getParameters(); + Map parameters = metadata.getFilter().getParameters(); if(!parameters.isEmpty()) { - for(Entry entry : parameters.entrySet()) { + for(Entry entry : parameters.entrySet()) { MojoExecution setupExecution = maven.setupMojoExecution(mavenProject, execution, monitor); if(!eq(entry.getValue(), - maven.getMojoParameterValue(mavenProject, setupExecution, entry.getKey(), String.class, monitor))) { + maven.getMojoParameterValue(mavenProject, setupExecution, (String)entry.getKey(), String.class, monitor))) { continue all_metadatas; } } -- 2.26.2