Fixing the build

nielsbasjes · nielsbasjes · commit 031ec4a2db3e · 2021-06-16T10:53:49.000+02:00
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
@@ -289,11 +289,7 @@ public class ShadeMojo
     /**
      * Do we put the dependency reduced pom in the jar instead of the jar file provided by the project.
      *
-<<<<<<< Updated upstream
-     * @since 3.2.2
-=======
      * @since 3.2.5
->>>>>>> Stashed changes
      */
     @Parameter( defaultValue = "false" )
     private boolean useDependencyReducedPomInJar;
@@ -619,11 +615,6 @@ else if ( !renamed )
                         }
                     }
                 }
-
-                if ( createDependencyReducedPom )
-                {
-                    createDependencyReducedPom( artifactIds );
-                }
             }
         }
         catch ( Exception e )

Original file line number	Diff line number	Diff line change
`@@ -289,11 +289,7 @@ public class ShadeMojo`
`289`	`289`	`/**`
`290`	`290`	`* Do we put the dependency reduced pom in the jar instead of the jar file provided by the project.`
`291`	`291`	`*`
`292`		`-<<<<<<< Updated upstream`
`293`		`- * @since 3.2.2`
`294`		`-=======`
`295`	`292`	`* @since 3.2.5`
`296`		`->>>>>>> Stashed changes`
`297`	`293`	`*/`
`298`	`294`	`@Parameter( defaultValue = "false" )`
`299`	`295`	`private boolean useDependencyReducedPomInJar;`
`@@ -619,11 +615,6 @@ else if ( !renamed )`
`619`	`615`	`}`
`620`	`616`	`}`
`621`	`617`	`}`
`622`		`-`
`623`		`- if ( createDependencyReducedPom )`
`624`		`- {`
`625`		`- createDependencyReducedPom( artifactIds );`
`626`		`- }`
`627`	`618`	`}`
`628`	`619`	`}`
`629`	`620`	`catch ( Exception e )`