Author: hboutemy
Date: Sat Jun 10 21:07:34 2017
New Revision: 1798337
URL: http://svn.apache.org/viewvc?rev=1798337&view=rev
Log:
[MASSEMBLY-858] use plugin classloader instead of thread classloader
fixes issues caused by MNG-6209 fix: but currently, every m-assembly-p from 2.2
to 3.0.0 using descriptor from classloader will fail with Maven 3.5.1...
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java?rev=1798337&r1=1798336&r2=1798337&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
Sat Jun 10 21:07:34 2017
@@ -195,8 +195,7 @@ public class DefaultAssemblyReader
throws
AssemblyReadException,
InvalidAssemblerConfigurationException
{
- final InputStream resourceAsStream =
-
Thread.currentThread().getContextClassLoader().getResourceAsStream(
"assemblies/" + ref + ".xml" );
+ final InputStream resourceAsStream = getClass().getResourceAsStream(
"/assemblies/" + ref + ".xml" );
if ( resourceAsStream == null )
{
