[MSHADE-406] More tests pass.

Author: nielsbasjes

pom.xml

@@ -340,7 +340,11 @@
                 <setupInclude>setup/*/pom.xml</setupInclude>
               </setupIncludes>
               <pomIncludes>
+                <!-- FIXME: Revert back to all tests -->
                 <pomInclude>projects/*/pom.xml</pomInclude>
+                <!--                <pomInclude>projects/MSHADE-391_noRelocationKeepOriginalClasses/pom.xml</pomInclude>-->
+                <!--                <pomInclude>projects/MultiReleaseJar-*/pom.xml</pomInclude>-->
+                <!-- <pomInclude>projects/MultiReleaseJar-shade-relocate/pom.xml</pomInclude> -->
               </pomIncludes>
               <projectsDirectory>src/it</projectsDirectory>
               <settingsFile>src/it/mrm/settings.xml</settingsFile>

src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

@@ -70,6 +70,7 @@
 import org.objectweb.asm.commons.Remapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.vafer.jdependency.Clazz;
 
 /**
  * @author Jason van Zyl
@@ -593,8 +594,14 @@ private void addRemappedClass(
             renamedClass = originalClass;
         }
 
-        // Need to take the .class off for remapping evaluation
-        String mappedName = packageMapper.map(name.substring(0, name.indexOf('.')), true, false);
+        String mappedName;
+        if (Clazz.isMultiReleaseClassFile(name)) {
+            mappedName = packageMapper.map(name, true, false); // .substring(0, name.indexOf('.'));
+        } else {
+            // Need to take the .class off for remapping evaluation
+            mappedName = packageMapper.map(name.substring(0, name.indexOf('.')), true, false);
+        }
+        logger.debug("Rewrote class bytecode: >> TO MAPPED NAME: {}", mappedName);
 
         try {
             // Now we put it back on so the class file is written out with the right extension.
@@ -728,11 +735,19 @@ public String map(String entityName, boolean mapPaths, final boolean mapPackages
             String prefix = "";
             String suffix = "";
 
-            Matcher m = CLASS_PATTERN.matcher(entityName);
-            if (m.matches()) {
-                prefix = m.group(1) + "L";
-                suffix = ";";
-                entityName = m.group(2);
+            boolean isMultiReleaseClassFile = Clazz.isMultiReleaseClassFile(entityName);
+
+            if (isMultiReleaseClassFile) {
+                Clazz.ParsedFileName parsedFileName = Clazz.parseClassFileName(entityName);
+                prefix = "META-INF/versions/" + parsedFileName.forJava + "/";
+                entityName = parsedFileName.className.replace(".", "/");
+            } else {
+                Matcher m = CLASS_PATTERN.matcher(entityName);
+                if (m.matches()) {
+                    prefix = m.group(1) + "L";
+                    suffix = ";";
+                    entityName = m.group(2);
+                }
             }
 
             for (Relocator r : relocators) {
@@ -744,6 +759,7 @@ public String map(String entityName, boolean mapPaths, final boolean mapPackages
                     break;
                 }
             }
+
             return value;
         }
     }

src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java

@@ -182,7 +182,9 @@ public boolean canRelocatePath(String path) {
 
         if (path.endsWith(".class")) {
             Clazz.ParsedFileName parsedFileName = Clazz.parseClassFileName(path);
-            path = parsedFileName.className.replace(".", "/");
+            if (parsedFileName != null && parsedFileName.className != null) {
+                path = parsedFileName.className.replace(".", "/");
+            }
         }
 
         // Allow for annoying option of an extra / on the front of a path. See MSHADE-119; comes from