diff --git a/pom.xml b/pom.xml
index d2ab0c03c..f11858bed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@ under the License.
org.apache.maven.shared
maven-common-artifact-filters
- 3.2.0
+ 3.3.0
org.apache.maven.shared
diff --git a/src/it/projects/dependency-sets/massembly-955/pom.xml b/src/it/projects/dependency-sets/massembly-955/pom.xml
new file mode 100644
index 000000000..d50b121ad
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-955/pom.xml
@@ -0,0 +1,70 @@
+
+
+
+ 4.0.0
+
+ org.apache.maven.plugin.assembly.test
+ it-project-parent
+ 1
+
+
+ test
+ massembly-955
+ 1
+
+ UTF-8
+
+
+
+ org.python
+ jython-standalone
+ 2.7.2
+
+
+ org.teiid
+ teiid
+ 10.0.5
+ jdbc
+ jar
+
+
+
+
+
+ maven-assembly-plugin
+ ${testVersion}
+
+
+ assembly
+ package
+
+ single
+
+
+
+ src/main/assembly/bin.xml
+
+
+
+
+
+
+
+
diff --git a/src/it/projects/dependency-sets/massembly-955/src/main/assembly/bin.xml b/src/it/projects/dependency-sets/massembly-955/src/main/assembly/bin.xml
new file mode 100644
index 000000000..29852cf29
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-955/src/main/assembly/bin.xml
@@ -0,0 +1,34 @@
+
+
+ bin
+
+ dir
+
+ false
+
+
+
+
+ org.teiid:teiid:*:jdbc:*
+ org.python:jython-standalone
+
+
+
+
\ No newline at end of file
diff --git a/src/it/projects/dependency-sets/massembly-955/verify.bsh b/src/it/projects/dependency-sets/massembly-955/verify.bsh
new file mode 100644
index 000000000..85c1233e2
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-955/verify.bsh
@@ -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.
+ */
+
+import java.io.*;
+
+boolean result = true;
+
+result = result && new File( basedir, "target/massembly-955-1-bin/teiid-10.0.5-jdbc.jar" ).exists();
+result = result && new File( basedir, "target/massembly-955-1-bin/jython-standalone-2.7.2.jar" ).exists();
+
+return result;
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java
index d2867683d..8f0ec5497 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java
@@ -33,7 +33,6 @@
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugins.assembly.internal.PlexusLoggingHelper;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
@@ -91,7 +90,7 @@ public static Set filterProjects( final Set projects
{
if ( f != null )
{
- f.reportMissedCriteria( PlexusLoggingHelper.wrap( logger ) );
+ f.reportMissedCriteria( logger );
}
}
return result;
@@ -187,8 +186,8 @@ public static void reportFilteringStatistics( final Collection f
logger.debug( "Statistics for " + sFilter + "\n" );
}
- sFilter.reportMissedCriteria( PlexusLoggingHelper.wrap( logger ) );
- sFilter.reportFilteredArtifacts( PlexusLoggingHelper.wrap( logger ) );
+ sFilter.reportMissedCriteria( logger );
+ sFilter.reportFilteredArtifacts( logger );
}
}
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
index 21cdaa6a7..da7903dfb 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
@@ -388,7 +388,6 @@ public void testGetDependencyArtifacts_ShouldFilterOneDependencyArtifactViaInclu
Artifact am2 = mock( Artifact.class );
when( am2.getGroupId() ).thenReturn( "group2" );
- when( am2.getArtifactId() ).thenReturn( "artifact2" );
when( am2.getId() ).thenReturn( "group2:artifact2:1.0:jar" );
artifacts.add( am2 );
@@ -422,7 +421,6 @@ public void testGetDependencyArtifacts_ShouldIgnoreTransitivePathFilteringWhenIn
Artifact am2 = mock( Artifact.class );
when( am2.getGroupId() ).thenReturn( "group2" );
- when( am2.getArtifactId() ).thenReturn( "artifact2" );
when( am2.getId() ).thenReturn( "group2:artifact2:1.0:jar" );
artifacts.add( am2 );