Complete the UT

apache · cstamas · Jul 11, 2024 · Jul 11, 2024 · Jul 11, 2024 · Jul 11, 2024
commit 734cf47918b9ffe7fb37efd19a428a74b7460389
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
@@ -27,6  27,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
@@ -132,14  133,34 @@ private PluginInfo extractPluginInfo(Artifact artifact) {
                             String artifactId = root.getChild("artifactId").getValue();
                             String goalPrefix = root.getChild("goalPrefix").getValue();
                             String name = root.getChild("name").getValue();
-                            return new PluginInfo(groupId, artifactId, goalPrefix, name);
                             // sanity check: plugin descriptor extracted from artifact must have same GA
                             if (Objects.equals(artifact.getGroupId(), groupId)
                                     && Objects.equals(artifact.getArtifactId(), artifactId)) {
                                 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)");
                             }
                         }
                     }
                 } catch (RuntimeException e) {
                     throw e;
                 } catch (Exception e) {
                     // here we can have: IO. ZIP or Plexus Conf Ex: but we should not interfere with user intent
                 }
             }
         }
         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
@@ -146,8  146,11 @@ private PluginInfo extractPluginInfo(Artifact artifact) {
                                                   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)");
-                            }                        }
                             }
                         }
                     }
                 } catch (RuntimeException e) {
                     throw e;
                 } catch (Exception e) {
                     // here we can have: IO. ZIP or Plexus Conf Ex: but we should not interfere with user intent
                 }

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
@@ -227,8  227,8 @@ void testRoguePlugin() throws Exception {
         installRequest.addArtifact(artifactResult.getArtifact());
 
         DefaultRepositorySystemSession loc = new DefaultRepositorySystemSession(session);
-        loc.setLocalRepositoryManager(system.newLocalRepositoryManager(
-                session, new LocalRepository(Files.createTempDirectory("local"))));
         loc.setLocalRepositoryManager(
                 system.newLocalRepositoryManager(session, new LocalRepository(Files.createTempDirectory("local"))));
         try {
             system.install(loc, installRequest);
             fail("install should fail");

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
@@ -0,0  1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
   ~ distributed with this work for additional information
   ~ regarding copyright ownership.  The ASF licenses this file
   ~ to you under the Apache License, Version 2.0 (the
   ~ "License"); you may not use this file except in compliance
   ~ with the License.  You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
   ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   ~ KIND, either express or implied.  See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>ut.simple</groupId>
   <artifactId>rogue-plugin</artifactId>
   <version>1.0</version>
 
   <name>Simple Unit Test Rogue Plugin</name>
 </project>
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
@@ -0,0  1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
   ~ distributed with this work for additional information
   ~ regarding copyright ownership.  The ASF licenses this file
   ~ to you under the Apache License, Version 2.0 (the
   ~ "License"); you may not use this file except in compliance
   ~ with the License.  You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
   ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   ~ KIND, either express or implied.  See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
 -->
 
 <metadata xmlns="http://maven.apache.org/METADATA/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/METADATA/1.1.0 http://maven.apache.org/xsd/metadata-1.1.0.xsd">
   <groupId>ut.simple</groupId>
   <artifactId>rogue-plugin</artifactId>
   <versioning>
     <latest>1.0</latest>
     <release>1.0</release>
     <versions>
       <version>1.0</version>
     </versions>
     <lastUpdated>20111123122038</lastUpdated>
   </versioning>
 </metadata>