svn commit: r1771943 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java

[gboue]

Author: gboue
Date: Tue Nov 29 19:05:13 2016
New Revision: 1771943

URL: http://svn.apache.org/viewvc?rev=1771943&view=rev
Log:
Fixed compilation errors. The variables extModuleName and extModuleVersion in 
the GroovyResourceTransformer need setters to be changed properly in tests, 
instead of having reflection hacks.

Modified:
    
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
    
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java?rev=1771943&r1=1771942&r2=1771943&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
 Tue Nov 29 19:05:13 2016
@@ -134,4 +134,14 @@ public class GroovyResourceTransformer
                 return buff.toString();
         }
     }
+
+    public void setExtModuleName( String extModuleName )
+    {
+        this.extModuleName = extModuleName;
+    }
+
+    public void setExtModuleVersion( String extModuleVersion )
+    {
+        this.extModuleVersion = extModuleVersion;
+    }
 }

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java?rev=1771943&r1=1771942&r2=1771943&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
 Tue Nov 29 19:05:13 2016
@@ -78,13 +78,20 @@ public class GroovyResourceTransformerTe
         JarOutputStream jaos = new JarOutputStream( fos );
         transformer.modifyOutputStream( jaos );
         jaos.close();
-        JarFile jar = new JarFile( tempJar );
         Properties desc = null;
-        ZipEntry entry = jar.getEntry( 
GroovyResourceTransformer.EXT_MODULE_NAME );
-        if ( entry != null )
+        JarFile jar = new JarFile( tempJar );
+        try
+        {
+            ZipEntry entry = jar.getEntry( 
GroovyResourceTransformer.EXT_MODULE_NAME );
+            if ( entry != null )
+            {
+                desc = new Properties();
+                desc.load( jar.getInputStream( entry ) );
+            }
+        }
+        finally
         {
-            desc = new Properties();
-            desc.load( jar.getInputStream( entry ) );
+            jar.close();
         }
         return desc;
     }
@@ -110,8 +117,8 @@ public class GroovyResourceTransformerTe
         throws Exception
     {
         GroovyResourceTransformer transformer = new 
GroovyResourceTransformer();
-        transformer.extModuleName = "the-module-name";
-        transformer.extModuleVersion = "2.0";
+        transformer.setExtModuleName( "the-module-name" );
+        transformer.setExtModuleVersion( "2.0" );
         transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
                                      module( "mod1", "1.0", "some.ext", 
"some.staticExt" ),
                                      Collections.<Relocator>emptyList() );