[MNG-8180] Back out from failing the build (#1645)

Just warn the user for now. Port of accepted change from 3.9.x: #1642 --- https://issues.apache.org/jira/browse/MNG-8180
apache · Aug 12, 2024 · ad04d2c · ad04d2c
1 parent da7c211
commit ad04d2c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 127 deletions.
diff --git a/...-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java b/...-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java
@@ -41,6 +41,8 @@
 import org.eclipse.aether.installation.InstallRequest;
 import org.eclipse.aether.metadata.Metadata;
 import org.eclipse.aether.util.ConfigUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Maven G level metadata generator.
@@ -50,6 +52,8 @@
 class PluginsMetadataGenerator implements MetadataGenerator {
     private static final String PLUGIN_DESCRIPTOR_LOCATION = "META-INF/maven/plugin.xml";
 
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
     private final Map<Object, PluginsMetadata> processedPlugins;
 
     private final Date timestamp;
@@ -139,20 +143,20 @@ private PluginInfo extractPluginInfo(Artifact artifact) {
                                 // here groupId and artifactId cannot be null
                                 return new PluginInfo(groupId, artifactId, goalPrefix, name);
                             } else {
-                                throw new InvalidArtifactPluginMetadataException(
-                                        "Artifact " + artifact.getGroupId() + ":"
-                                                + artifact.getArtifactId()
-                                                + " JAR (to be installed/deployed) contains Maven Plugin metadata for plugin "
-                                                + groupId + ":" + artifactId + "; coordinates are conflicting. "
-                                                + "Most probably your JAR contains rogue Maven Plugin metadata, "
-                                                + "possible causes may be: shaded in Maven Plugin or some rogue resource)");
+                                logger.warn(
+                                        "Artifact {}:{}"
+                                                + " JAR (about to be installed/deployed) contains Maven Plugin metadata for"
+                                                + " conflicting coordinates: {}:{}."
+                                                + " Your JAR contains rogue Maven Plugin metadata."
+                                                + " Possible causes may be: shaded into this JAR some Maven Plugin or some rogue resource.",
+                                        artifact.getGroupId(),
+                                        artifact.getArtifactId(),
+                                        groupId,
+                                        artifactId);
                             }
                         }
                     }
                 } catch (Exception e) {
-                    if (e instanceof InvalidArtifactPluginMetadataException iapme) {
-                        throw iapme;
-                    }
                     // here we can have: IO. ZIP or Plexus Conf Ex: but we should not interfere with user intent
                 }
             }
@@ -167,10 +171,4 @@ private static String mayGetChild(XmlNode node, String child) {
         }
         return null;
     }
-
-    public static final class InvalidArtifactPluginMetadataException extends IllegalArgumentException {
-        InvalidArtifactPluginMetadataException(String s) {
-            super(s);
-        }
-    }
 }
diff --git a/...provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java b/...provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java
@@ -41,6 +41,8 @@
 import org.eclipse.aether.installation.InstallRequest;
 import org.eclipse.aether.metadata.Metadata;
 import org.eclipse.aether.util.ConfigUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Maven G level metadata generator.
@@ -50,6 +52,8 @@
 class PluginsMetadataGenerator implements MetadataGenerator {
     private static final String PLUGIN_DESCRIPTOR_LOCATION = "META-INF/maven/plugin.xml";
 
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
     private final Map<Object, PluginsMetadata> processedPlugins;
 
     private final Date timestamp;
@@ -140,20 +144,20 @@ private PluginInfo extractPluginInfo(Artifact artifact) {
                                 // here groupId and artifactId cannot be null
                                 return new PluginInfo(groupId, artifactId, goalPrefix, name);
                             } else {
-                                throw new InvalidArtifactPluginMetadataException(
-                                        "Artifact " + artifact.getGroupId() + ":"
-                                                + artifact.getArtifactId()
-                                                + " JAR (to be installed/deployed) contains Maven Plugin metadata for plugin "
-                                                + groupId + ":" + artifactId + "; coordinates are conflicting. "
-                                                + "Most probably your JAR contains rogue Maven Plugin metadata, "
-                                                + "possible causes may be: shaded in Maven Plugin or some rogue resource)");
+                                logger.warn(
+                                        "Artifact {}:{}"
+                                                + " JAR (about to be installed/deployed) contains Maven Plugin metadata for"
+                                                + " conflicting coordinates: {}:{}."
+                                                + " Your JAR contains rogue Maven Plugin metadata."
+                                                + " Possible causes may be: shaded into this JAR some Maven Plugin or some rogue resource.",
+                                        artifact.getGroupId(),
+                                        artifact.getArtifactId(),
+                                        groupId,
+                                        artifactId);
                             }
                         }
                     }
                 } catch (Exception e) {
-                    if (e instanceof InvalidArtifactPluginMetadataException iapme) {
-                        throw iapme;
-                    }
                     // here we can have: IO. ZIP or Plexus Conf Ex: but we should not interfere with user intent
                 }
             }
@@ -168,10 +172,4 @@ private static String mayGetChild(XmlNode node, String child) {
         }
         return null;
     }
-
-    public static final class InvalidArtifactPluginMetadataException extends IllegalArgumentException {
-        InvalidArtifactPluginMetadataException(String s) {
-            super(s);
-        }
-    }
 }
diff --git a/...ver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/...ver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
@@ -18,19 +18,15 @@
  */
 package org.apache.maven.repository.internal;
 
-import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.collection.CollectResult;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.installation.InstallRequest;
-import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
 import org.eclipse.aether.resolution.ArtifactDescriptorResult;
 import org.eclipse.aether.resolution.ArtifactRequest;
@@ -211,30 +207,4 @@ void testNewLocalRepositoryManager() throws Exception {
     void testNewSyncContext() throws Exception {
         // SyncContext newSyncContext( RepositorySystemSession session, boolean shared );
     }
-
-    @Test
-    void testRoguePlugin() throws Exception {
-        Artifact artifact = new DefaultArtifact("ut.simple:rogue-plugin:1.0");
-
-        ArtifactRequest artifactRequest = new ArtifactRequest();
-        artifactRequest.setArtifact(artifact);
-        artifactRequest.addRepository(newTestRepository());
-
-        ArtifactResult artifactResult = system.resolveArtifact(session, artifactRequest);
-        checkArtifactResult(artifactResult, "rogue-plugin-1.0.jar");
-
-        InstallRequest installRequest = new InstallRequest();
-        installRequest.addArtifact(artifactResult.getArtifact());
-
-        DefaultRepositorySystemSession loc = new DefaultRepositorySystemSession(session);
-        loc.setLocalRepositoryManager(
-                system.newLocalRepositoryManager(session, new LocalRepository(Files.createTempDirectory("local"))));
-        try {
-            system.install(loc, installRequest);
-            fail("install should fail");
-        } catch (Exception e) {
-            assertInstanceOf(PluginsMetadataGenerator.InvalidArtifactPluginMetadataException.class, e);
-            assertTrue(e.getMessage().contains("coordinates are conflicting"));
-        }
-    }
 }
diff --git a/...resolver-provider/src/test/resources/repo/ut/simple/rogue-plugin/1.0/rogue-plugin-1.0.jar b/...resolver-provider/src/test/resources/repo/ut/simple/rogue-plugin/1.0/rogue-plugin-1.0.jar
diff --git a/...resolver-provider/src/test/resources/repo/ut/simple/rogue-plugin/1.0/rogue-plugin-1.0.pom b/...resolver-provider/src/test/resources/repo/ut/simple/rogue-plugin/1.0/rogue-plugin-1.0.pom
diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/rogue-plugin/maven-metadata.xml b/maven-resolver-provider/src/test/resources/repo/ut/simple/rogue-plugin/maven-metadata.xml