From 6f2bffa1851f342490d2d214b791884988a4410a Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Wed, 28 Aug 2019 10:45:05 +0200 Subject: [PATCH 1/6] [MSHADE-326] Hide shaded dependencies from the rest of the reactor build --- .../commandline/pom.xml | 65 ++++++++++ .../src/main/java/nl/example/Main.java | 27 +++++ .../invoker.properties | 19 +++ .../library/pom.xml | 82 +++++++++++++ .../main/java/nl/example/StringTester.java | 29 +++++ .../java/nl/example/TestStringTester.java | 36 ++++++ .../pom.xml | 70 +++++++++++ .../verify.bsh | 113 ++++++++++++++++++ .../maven/plugins/shade/mojo/ShadeMojo.java | 28 +++++ 9 files changed, 469 insertions(+) create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/pom.xml create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml create mode 100644 src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/pom.xml b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/pom.xml new file mode 100644 index 00000000..b8a469dc --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/pom.xml @@ -0,0 +1,65 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.shade.drp + project-parent + 1.0 + + + commandline + jar + + MSHADE-326 + + Test to see that the reduced dependencies are gone from the reactor. + + + + + org.apache.maven.its.shade.drp + library + ${project.version} + + + + + + + org.apache.maven.plugins + maven-shade-plugin + @project.version@ + + + attach-shade + package + + shade + + + + + + + diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java new file mode 100644 index 00000000..3d942485 --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java @@ -0,0 +1,27 @@ +/* + * 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. + */ + +package nl.example; + +public class Main +{ + public static void main( String[] args ) { + System.out.println( "Hello World!" + ( StringTester.isEmpty("foo") ? " is empty!" : " -- ") ); + } +} diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties new file mode 100644 index 00000000..8c8f765b --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties @@ -0,0 +1,19 @@ +# 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. + +invoker.goals = clean package +invoker.java.version = 1.8+ diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml new file mode 100644 index 00000000..a556a834 --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml @@ -0,0 +1,82 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.shade.drp + project-parent + 1.0 + + + library + jar + + MSHADE-326 + + Test to see that the reduced dependencies are gone from the reactor. + + + + + org.codehaus.plexus + plexus-utils + 1.4.1 + + + + + + + org.apache.maven.plugins + maven-shade-plugin + @project.version@ + + + attach-shade + package + + shade + + + true + true + true + true + + + org.codehaus.plexus + nl.example.shaded.org.codehaus.plexus + + + + + org.codehaus.plexus:plexus-utils + + + + + + + + + diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java new file mode 100644 index 00000000..7d635125 --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java @@ -0,0 +1,29 @@ +/* + * 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. + */ + +package nl.example; + +import org.codehaus.plexus.util.StringUtils; + +public class StringTester +{ + public static boolean isEmpty( String input ) { + return StringUtils.isEmpty( input ); + } +} diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java new file mode 100644 index 00000000..f225775c --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java @@ -0,0 +1,36 @@ +/* + * 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. + */ + +package nl.example; + +import org.junit.Test; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + +public class TestStringTester +{ + @Test + public void runTest() + { + assertTrue(StringTester.isEmpty("")); + assertFalse(StringTester.isEmpty("FooBar")); + } + +} diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml new file mode 100644 index 00000000..af421440 --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml @@ -0,0 +1,70 @@ + + + + + + 4.0.0 + + + org.apache.maven.plugins.shade.its + shade-parent + 1.0 + ../setup-parent + + + org.apache.maven.its.shade.drp + project-parent + pom + + MSHADE-326 + + Test to see that the reduced dependencies are gone from the reactor. + + + + 1.8 + 1.8 + + + + + junit + junit + 4.12 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + + + + + library + commandline + + + diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh new file mode 100644 index 00000000..fdcf30ea --- /dev/null +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh @@ -0,0 +1,113 @@ +/* + * 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. + */ + +import java.io.*; +import java.util.jar.*; +import java.util.Arrays; +import org.codehaus.plexus.util.*; + +String[] libraryWanted = +{ + "nl/example/StringTester.class", + "nl/example/shaded/org/codehaus/plexus/util/StringUtils.class", +}; + +String[] libraryUnwanted = +{ + "org/codehaus/plexus/util/StringUtils.class", +}; + +JarFile libraryJarFile = null; +try +{ + libraryJarFile = new JarFile( new File( basedir, "library/target/library-1.0.jar" ) ); + + for ( String path : libraryWanted ) + { + if ( libraryJarFile.getEntry( path ) == null ) + { + throw new IllegalStateException( "Library: wanted path is missing: " + path ); + } + } + + for ( String path : libraryUnwanted ) + { + if ( libraryJarFile.getEntry( path ) != null ) + { + throw new IllegalStateException( "Library: unwanted path is present: " + path ); + } + } + + JarEntry jarEntry = libraryJarFile.getEntry( "META-INF/maven/org.apache.maven.its.shade.drp/library/pom.xml" ); + String pomFile = IOUtil.toString( libraryJarFile.getInputStream( jarEntry ), "UTF-8" ); + + if ( pomFile.contains( "org.codehaus.plexus" ) ) { + throw new IllegalStateException( "The pom.xml still contains a reference to the org.codehaus.plexus dependency"); + } +} +finally +{ + if ( libraryJarFile != null ) { + libraryJarFile.close(); + } +} + + +// ===================== + +String[] commandlineWanted = +{ + "nl/example/Main.class", + "nl/example/StringTester.class", + "nl/example/shaded/org/codehaus/plexus/util/StringUtils.class", +}; + +String[] commandlineUnwanted = +{ + "org/codehaus/plexus/util/Base64.class", + "org/codehaus/plexus/util/StringUtils.class", +}; + +JarFile commandlineJarFile = null; +try +{ + commandlineJarFile = new JarFile( new File( basedir, "commandline/target/commandline-1.0.jar" ) ); + + for ( String path : commandlineWanted ) + { + if ( commandlineJarFile.getEntry( path ) == null ) + { + throw new IllegalStateException( "Commandline: wanted path is missing: " + path ); + } + } + + for ( String path : commandlineUnwanted ) + { + if ( commandlineJarFile.getEntry( path ) != null ) + { + throw new IllegalStateException( "Commandline: unwanted path is present: " + path ); + } + } +} +finally +{ + if ( commandlineJarFile != null ) { + commandlineJarFile.close(); + } +} 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 index 7c524f80..afb02430 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java @@ -295,6 +295,15 @@ public class ShadeMojo @Parameter( defaultValue = "false" ) private boolean useDependencyReducedPomInJar; + /** + * Do we hide the shaded/removed dependencies from the rest of the reactor build. + * Requires both {@code createDependencyReducedPom} and {@code useDependencyReducedPomInJar} to be true. + * + * @since 3.3.0 + */ + @Parameter( defaultValue = "false" ) + private boolean hideReducedDependenciesInReactor; + /** * When true, dependencies are kept in the pom but with scope 'provided'; when false, the dependency is removed. */ @@ -469,6 +478,25 @@ public void execute() resourceTransformers = new ArrayList<>( resourceTransformers ); resourceTransformers.addAll( createPomReplaceTransformers( project, dependencyReducedPomLocation ) ); + + if ( hideReducedDependenciesInReactor ) + { + if ( !artifactIds.isEmpty() ) + { + getLog().info( "Hiding these shaded dependencies from the rest of the reactor build:" ); + getLog().info( artifactIds.toString() ); + List dependencies = new ArrayList<>(); + for ( Dependency dependency : project.getDependencies() ) + { + if ( !artifactIds.contains( getId( dependency ) ) ) + { + dependencies.add( dependency ); + } + } + project.setDependencies( dependencies ); + } + } + } } From 16cbe0645b2441b4103c57ac8443b3ed7660984a Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Thu, 17 Jun 2021 22:39:45 +0200 Subject: [PATCH 2/6] Change nl.example to com.example --- .../src/main/java/{nl => com}/example/Main.java | 2 +- .../invoker.properties | 1 - .../library/pom.xml | 2 +- .../main/java/{nl => com}/example/StringTester.java | 2 +- .../java/{nl => com}/example/TestStringTester.java | 2 +- .../verify.bsh | 10 +++++----- 6 files changed, 9 insertions(+), 10 deletions(-) rename src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/{nl => com}/example/Main.java (97%) rename src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/{nl => com}/example/StringTester.java (97%) rename src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/{nl => com}/example/TestStringTester.java (98%) diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/com/example/Main.java similarity index 97% rename from src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java rename to src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/com/example/Main.java index 3d942485..7a754e3a 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/nl/example/Main.java +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/commandline/src/main/java/com/example/Main.java @@ -17,7 +17,7 @@ * under the License. */ -package nl.example; +package com.example; public class Main { diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties index 8c8f765b..a644cb7e 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/invoker.properties @@ -16,4 +16,3 @@ # under the License. invoker.goals = clean package -invoker.java.version = 1.8+ diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml index a556a834..5c5657be 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/pom.xml @@ -65,7 +65,7 @@ under the License. org.codehaus.plexus - nl.example.shaded.org.codehaus.plexus + com.example.shaded.org.codehaus.plexus diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/com/example/StringTester.java similarity index 97% rename from src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java rename to src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/com/example/StringTester.java index 7d635125..33bcb53c 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/nl/example/StringTester.java +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/main/java/com/example/StringTester.java @@ -17,7 +17,7 @@ * under the License. */ -package nl.example; +package com.example; import org.codehaus.plexus.util.StringUtils; diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/com/example/TestStringTester.java similarity index 98% rename from src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java rename to src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/com/example/TestStringTester.java index f225775c..22f19461 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/nl/example/TestStringTester.java +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/library/src/test/java/com/example/TestStringTester.java @@ -17,7 +17,7 @@ * under the License. */ -package nl.example; +package com.example; import org.junit.Test; diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh index fdcf30ea..7010365b 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/verify.bsh @@ -24,8 +24,8 @@ import org.codehaus.plexus.util.*; String[] libraryWanted = { - "nl/example/StringTester.class", - "nl/example/shaded/org/codehaus/plexus/util/StringUtils.class", + "com/example/StringTester.class", + "com/example/shaded/org/codehaus/plexus/util/StringUtils.class", }; String[] libraryUnwanted = @@ -73,9 +73,9 @@ finally String[] commandlineWanted = { - "nl/example/Main.class", - "nl/example/StringTester.class", - "nl/example/shaded/org/codehaus/plexus/util/StringUtils.class", + "com/example/Main.class", + "com/example/StringTester.class", + "com/example/shaded/org/codehaus/plexus/util/StringUtils.class", }; String[] commandlineUnwanted = From 260df5eee5b82eeb338d448998c74e8295e6f375 Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Thu, 17 Jun 2021 22:48:13 +0200 Subject: [PATCH 3/6] Improve javadoc --- .../java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index afb02430..aaa1ed0f 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java @@ -296,8 +296,8 @@ public class ShadeMojo private boolean useDependencyReducedPomInJar; /** - * Do we hide the shaded/removed dependencies from the rest of the reactor build. - * Requires both {@code createDependencyReducedPom} and {@code useDependencyReducedPomInJar} to be true. + * Hide the shaded/removed dependencies from the rest of the reactor build. + * Requires both {@code createDependencyReducedPom} and {@code useDependencyReducedPomInJar} to be {@code true}. * * @since 3.3.0 */ From 9c8a3a7c02520228e3af72499695c9c0ca07e412 Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Thu, 17 Jun 2021 22:58:24 +0200 Subject: [PATCH 4/6] Removed needless directives --- .../MSHADE-326-Hide-dependencies-from-reactor/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml index af421440..8a192fc2 100644 --- a/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml +++ b/src/it/projects/MSHADE-326-Hide-dependencies-from-reactor/pom.xml @@ -38,11 +38,6 @@ under the License. Test to see that the reduced dependencies are gone from the reactor. - - 1.8 - 1.8 - - junit From 9d97ece331d06beabd7a1a69472be1e8c2866178 Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Tue, 29 Jun 2021 11:10:09 +0200 Subject: [PATCH 5/6] Revert code and leave the tests in place --- .../maven/plugins/shade/mojo/ShadeMojo.java | 28 ------------------- 1 file changed, 28 deletions(-) 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 index aaa1ed0f..7c524f80 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java @@ -295,15 +295,6 @@ public class ShadeMojo @Parameter( defaultValue = "false" ) private boolean useDependencyReducedPomInJar; - /** - * Hide the shaded/removed dependencies from the rest of the reactor build. - * Requires both {@code createDependencyReducedPom} and {@code useDependencyReducedPomInJar} to be {@code true}. - * - * @since 3.3.0 - */ - @Parameter( defaultValue = "false" ) - private boolean hideReducedDependenciesInReactor; - /** * When true, dependencies are kept in the pom but with scope 'provided'; when false, the dependency is removed. */ @@ -478,25 +469,6 @@ public void execute() resourceTransformers = new ArrayList<>( resourceTransformers ); resourceTransformers.addAll( createPomReplaceTransformers( project, dependencyReducedPomLocation ) ); - - if ( hideReducedDependenciesInReactor ) - { - if ( !artifactIds.isEmpty() ) - { - getLog().info( "Hiding these shaded dependencies from the rest of the reactor build:" ); - getLog().info( artifactIds.toString() ); - List dependencies = new ArrayList<>(); - for ( Dependency dependency : project.getDependencies() ) - { - if ( !artifactIds.contains( getId( dependency ) ) ) - { - dependencies.add( dependency ); - } - } - project.setDependencies( dependencies ); - } - } - } } From 0badac30287c9e48113dafa0bd315fc8a4ee8154 Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Tue, 29 Jun 2021 11:42:44 +0200 Subject: [PATCH 6/6] Fix failure of MSHADE-340 test --- src/it/projects/MSHADE-340_shadedTestJarArtifactAttached/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/it/projects/MSHADE-340_shadedTestJarArtifactAttached/pom.xml b/src/it/projects/MSHADE-340_shadedTestJarArtifactAttached/pom.xml index 6b2fc156..34c352a5 100644 --- a/src/it/projects/MSHADE-340_shadedTestJarArtifactAttached/pom.xml +++ b/src/it/projects/MSHADE-340_shadedTestJarArtifactAttached/pom.xml @@ -92,6 +92,7 @@ under the License. maven-jar-plugin + default-jar jar test-jar