From 7750d0adcca5ca745650540a53d903dad6befc8b Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 21 Jun 2019 11:24:15 +0100
Subject: [PATCH 3/5] 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/embedder/ContextRepositorySystemSessionImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java
index 1b9bf84..c40cf38 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ContextRepositorySystemSessionImpl.java
@@ -34,7 +34,6 @@ import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
 import org.eclipse.aether.resolution.ResolutionErrorPolicy;
 import org.eclipse.aether.transfer.TransferListener;
-import org.eclipse.aether.transform.FileTransformerManager;
 
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
@@ -180,9 +179,4 @@ public class ContextRepositorySystemSessionImpl implements ContextRepositorySyst
     return getSession().getVersionFilter();
   }
 
-  @Override
-  public FileTransformerManager getFileTransformerManager() {
-    return getSession().getFileTransformerManager();
-  }
-
 }
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<PluginExecutionMetadata> result = new ArrayList<>();
     all_metadatas: for(PluginExecutionMetadata metadata : metadatas) {
       @SuppressWarnings("unchecked")
-      Map<String, String> parameters = metadata.getFilter().getParameters();
+      Map<Object, String> parameters = metadata.getFilter().getParameters();
       if(!parameters.isEmpty()) {
-        for(Entry<String, String> entry : parameters.entrySet()) {
+        for(Entry<Object, String> 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