svn commit: r1771515 - in /maven/enforcer/trunk: ./ enforcer-rules/ enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/site/apt/ enforcer-rules/src/test/java/org/apache

2016-11-26 Thread gboue 
Author: gboue
Date: Sat Nov 26 21:56:24 2016
New Revision: 1771515

URL: http://svn.apache.org/viewvc?rev=1771515=rev
Log:
[MENFORCER-247] Add a "require file checksum" rule
Submitted by: Lyubomyr Shaydariv

New RequireFileChecksum, rule that is non cacheable and inherits from 
AbstractNonCacheableEnforcerRule. This closes #18.

Added:

maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
   (with props)
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireFileChecksum.apt.vm 
  (with props)

maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java
   (with props)

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/LICENSE

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml
   (with props)
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1771515=1771514=1771515=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Sat Nov 26 21:56:24 2016
@@ -67,6 +67,10 @@
   commons-lang
 
 
+  commons-codec
+  commons-codec
+
+
   org.apache.maven.enforcer
   enforcer-api
 

Added: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java?rev=1771515=auto
==
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
 (added)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
 Sat Nov 26 21:56:24 2016
@@ -0,0 +1,146 @@
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * 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.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.codehaus.plexus.util.IOUtil;
+
+/**
+ * Rule to validate a file to match the specified checksum.
+ *
+ * @author Edward Samson
+ * @author Lyubomyr Shaydariv
+ */
+public class RequireFileChecksum
+extends AbstractNonCacheableEnforcerRule
+{
+
+private File file;
+
+private String checksum;
+
+private String type;
+
+public void execute( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+if ( this.file == null )
+{
+throw new EnforcerRuleException( "Input file unspecified" );
+}
+
+if ( this.type == null )
+{
+throw new EnforcerRuleException( "Hash type unspecified" );
+}
+
+if ( this.checksum == null )
+{
+throw new EnforcerRuleException( "Checksum unspecified" );
+}
+
+InputStream inputStream = null;
+try
+{
+if ( this.file.isDirectory() || !this.file.canRead() )
+{
+throw new EnforcerRuleException( "Cannot read file: " + 
this.file.getAbsolutePath() );
+}
+
+inputStream = new FileInputStream( this.file );
+String checksum;
+if ( "md5".equals( this.type ) )
+{
+checksum = DigestUtils.md5Hex( inputStream );
+}
+else if ( "sha1".equals( this.type ) )
+{
+checksum = DigestUtils.shaHex( inputStream );
+}
+else

maven-integration-testing git commit: [MNG-6127] add integration test to suite

2016-11-26 Thread schulte 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 063f205c0 -> 9b71a0394


[MNG-6127] add integration test to suite

This closes #17


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/9b71a039
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/9b71a039
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/9b71a039

Branch: refs/heads/master
Commit: 9b71a03944b42fc04cbdce9bf2e0be0c79769cc2
Parents: 063f205
Author: Mario Krizmanic 
Authored: Sat Nov 26 09:38:18 2016 +0100
Committer: Christian Schulte 
Committed: Sat Nov 26 22:27:49 2016 +0100

--
 .../src/test/java/org/apache/maven/it/IntegrationTestSuite.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/9b71a039/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 2f288fa..4f3cdf3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -105,6 +105,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( 
MavenITmng6127PluginExecutionConfigurationInterferenceTest.class );
 suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
 suite.addTestSuite( 
MavenITmng6079DependencyManagementImportInterpolationTest.class );
 suite.addTestSuite( 
MavenITmng6049VersionRangeResultFilterExtensionTest.class );

svn commit: r1771461 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java

2016-11-26 Thread olamy 
Author: olamy
Date: Sat Nov 26 11:03:47 2016
New Revision: 1771461

URL: http://svn.apache.org/viewvc?rev=1771461=rev
Log:
make those private

Signed-off-by: olivier lamy 

Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.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=1771461=1771460=1771461=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
 Sat Nov 26 11:03:47 2016
@@ -45,9 +45,9 @@ public class GroovyResourceTransformer
 
 private List staticExtensionClassesList = new ArrayList();
 
-String extModuleName = "no-module-name";
+private String extModuleName = "no-module-name";
 
-String extModuleVersion = "1.0";
+private String extModuleVersion = "1.0";
 
 @Override
 public boolean canTransformResource( String resource )

svn commit: r1771460 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/ test/java/org/apache/maven/plugins/shade/relocation/ test/java/org/apache/mave

2016-11-26 Thread olamy 
Author: olamy
Date: Sat Nov 26 11:03:39 2016
New Revision: 1771460

URL: http://svn.apache.org/viewvc?rev=1771460=rev
Log:
formatting

Signed-off-by: olivier lamy 

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/relocation/SimpleRelocatorTest.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.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=1771460=1771459=1771460=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
 Sat Nov 26 11:03:39 2016
@@ -35,13 +35,18 @@ import java.util.jar.JarOutputStream;
 /**
  * @author mailto:jul...@julienviet.com;>Julien Viet
  */
-public class GroovyResourceTransformer implements ResourceTransformer
+public class GroovyResourceTransformer
+implements ResourceTransformer
 {
 
 static final String EXT_MODULE_NAME = 
"META-INF/services/org.codehaus.groovy.runtime.ExtensionModule";
+
 private List extensionClassesList = new ArrayList();
+
 private List staticExtensionClassesList = new ArrayList();
+
 String extModuleName = "no-module-name";
+
 String extModuleVersion = "1.0";
 
 @Override
@@ -51,27 +56,28 @@ public class GroovyResourceTransformer i
 }
 
 @Override
-public void processResource( String resource, InputStream is, 
List relocators ) throws IOException
+public void processResource( String resource, InputStream is, 
List relocators )
+throws IOException
 {
-  Properties out = new Properties();
-  try
-  {
- out.load( is );
-  }
-  finally
-  {
-  is.close();
-  }
-  String extensionClasses = out.getProperty( "extensionClasses" , "" 
).trim();
-  if ( extensionClasses.length() > 0 )
-  {
-  append( extensionClasses, extensionClassesList );
-  }
-  String staticExtensionClasses = out.getProperty( 
"staticExtensionClasses", "" ).trim();
-  if ( staticExtensionClasses.length() > 0 )
-  {
- append( staticExtensionClasses, staticExtensionClassesList );
-  }
+Properties out = new Properties();
+try
+{
+out.load( is );
+}
+finally
+{
+is.close();
+}
+String extensionClasses = out.getProperty( "extensionClasses", "" 
).trim();
+if ( extensionClasses.length() > 0 )
+{
+append( extensionClasses, extensionClassesList );
+}
+String staticExtensionClasses = out.getProperty( 
"staticExtensionClasses", "" ).trim();
+if ( staticExtensionClasses.length() > 0 )
+{
+append( staticExtensionClasses, staticExtensionClassesList );
+}
 }
 
 private void append( String entry, List list )
@@ -89,7 +95,8 @@ public class GroovyResourceTransformer i
 }
 
 @Override
-public void modifyOutputStream( JarOutputStream os ) throws IOException
+public void modifyOutputStream( JarOutputStream os )
+throws IOException
 {
 if ( hasTransformedResource() )
 {

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java?rev=1771460=1771459=1771460=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
 Sat Nov 26 11:03:39 2016
@@ -28,7 +28,7 @@ import java.util.Arrays;
  * Test for {@link SimpleRelocator}.
  *
  * @author Benjamin Bentmann
- * @version $Id$
+ *
  */
 public class SimpleRelocatorTest
 extends TestCase

Modified:

svn commit: r1771458 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/ site/apt/examples/ test/java/org/apache/maven/plugins/shade/resource/

2016-11-26 Thread olamy 
Author: olamy
Date: Sat Nov 26 11:03:21 2016
New Revision: 1771458

URL: http://svn.apache.org/viewvc?rev=1771458=rev
Log:
Groovy transformer for Maven Shade Plugin

Added:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
   (with props)

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
   (with props)
Modified:

maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm

Added: 
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=1771458=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
 (added)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
 Sat Nov 26 11:03:21 2016
@@ -0,0 +1,130 @@
+package org.apache.maven.plugins.shade.resource;
+
+/*
+ * 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 org.apache.maven.plugins.shade.relocation.Relocator;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
+/**
+ * @author mailto:jul...@julienviet.com;>Julien Viet
+ */
+public class GroovyResourceTransformer implements ResourceTransformer
+{
+
+static final String EXT_MODULE_NAME = 
"META-INF/services/org.codehaus.groovy.runtime.ExtensionModule";
+private List extensionClassesList = new ArrayList();
+private List staticExtensionClassesList = new ArrayList();
+String extModuleName = "no-module-name";
+String extModuleVersion = "1.0";
+
+@Override
+public boolean canTransformResource( String resource )
+{
+return EXT_MODULE_NAME.equals( resource );
+}
+
+@Override
+public void processResource( String resource, InputStream is, 
List relocators ) throws IOException
+{
+  Properties out = new Properties();
+  try
+  {
+ out.load( is );
+  }
+  finally
+  {
+  is.close();
+  }
+  String extensionClasses = out.getProperty( "extensionClasses" , "" 
).trim();
+  if ( extensionClasses.length() > 0 )
+  {
+  append( extensionClasses, extensionClassesList );
+  }
+  String staticExtensionClasses = out.getProperty( 
"staticExtensionClasses", "" ).trim();
+  if ( staticExtensionClasses.length() > 0 )
+  {
+ append( staticExtensionClasses, staticExtensionClassesList );
+  }
+}
+
+private void append( String entry, List list )
+{
+if ( entry != null )
+{
+Collections.addAll( list, entry.split( "\\s*,\\s*" ) );
+}
+}
+
+@Override
+public boolean hasTransformedResource()
+{
+return extensionClassesList.size() > 0 && 
staticExtensionClassesList.size() > 0;
+}
+
+@Override
+public void modifyOutputStream( JarOutputStream os ) throws IOException
+{
+if ( hasTransformedResource() )
+{
+os.putNextEntry( new JarEntry( EXT_MODULE_NAME ) );
+Properties desc = new Properties();
+desc.put( "moduleName", extModuleName );
+desc.put( "moduleVersion", extModuleVersion );
+if ( extensionClassesList.size() > 0 )
+{
+desc.put( "extensionClasses", join( extensionClassesList ) );
+}
+if ( staticExtensionClassesList.size() > 0 )
+{
+desc.put( "staticExtensionClasses", join( 
staticExtensionClassesList ) );
+}
+desc.store( os, null );
+}
+}
+
+private

svn commit: r1771459 - /maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java

2016-11-26 Thread olamy 
Author: olamy
Date: Sat Nov 26 11:03:29 2016
New Revision: 1771459

URL: http://svn.apache.org/viewvc?rev=1771459=rev
Log:
Update test author to myself

Modified:

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/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=1771459=1771458=1771459=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
 Sat Nov 26 11:03:29 2016
@@ -36,7 +36,7 @@ import java.util.zip.ZipEntry;
 /**
  * Test for {@link XmlAppendingTransformer}.
  * 
- * @author Benjamin Bentmann
+ * @author Julien Viet
  * @version $Id$
  */
 public class GroovyResourceTransformerTest