svn commit: r1805519 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
Author: khmarbaise
Date: Sat Aug 19 19:08:43 2017
New Revision: 1805519
URL: http://svn.apache.org/viewvc?rev=1805519=rev
Log:
Simplified logic.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java?rev=1805519=1805518=1805519=diff
==
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
Sat Aug 19 19:08:43 2017
@@ -75,14 +75,14 @@ public class DefaultProjectDeployer
// Deploy the POM
boolean isPomArtifact = "pom".equals( packaging );
-if ( !isPomArtifact )
+if ( isPomArtifact )
{
-ProjectArtifactMetadata metadata = new ProjectArtifactMetadata(
artifact, pomFile );
-artifact.addMetadata( metadata );
+artifact.setFile( pomFile );
}
else
{
-artifact.setFile( pomFile );
+ProjectArtifactMetadata metadata = new ProjectArtifactMetadata(
artifact, pomFile );
+artifact.addMetadata( metadata );
}
if ( request.isUpdateReleaseInfo() )
svn commit: r1017014 - in /websites/production/maven/components/plugins-archives/maven-shade-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/shade/ apidocs/org/apache/maven/plugins/shade/c
Author: rfscholte Date: Sat Aug 19 13:52:41 2017 New Revision: 1017014 Log: Site checkin for project Apache Maven Shade Plugin [This commit notification would consist of 89 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1805513 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: rfscholte Date: Sat Aug 19 13:43:29 2017 New Revision: 1805513 URL: http://svn.apache.org/viewvc?rev=1805513=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805513=1805512=1805513=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:43:29 2017 @@ -30,7 +30,7 @@ maven-shade-plugin - 3.1.0 + 3.1.1-SNAPSHOT maven-plugin Apache Maven Shade Plugin @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-shade-plugin-3.1.0 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin jira
svn commit: r1805512 - /maven/plugins/tags/maven-shade-plugin-3.1.0/
Author: rfscholte Date: Sat Aug 19 13:43:27 2017 New Revision: 1805512 URL: http://svn.apache.org/viewvc?rev=1805512=rev Log: [maven-release-plugin] copy for tag maven-shade-plugin-3.1.0 Added: maven/plugins/tags/maven-shade-plugin-3.1.0/ - copied from r1805511, maven/plugins/trunk/maven-shade-plugin/
svn commit: r1805511 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: rfscholte Date: Sat Aug 19 13:43:14 2017 New Revision: 1805511 URL: http://svn.apache.org/viewvc?rev=1805511=rev Log: [maven-release-plugin] prepare release maven-shade-plugin-3.1.0 Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805511=1805510=1805511=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:43:14 2017 @@ -30,7 +30,7 @@ maven-shade-plugin - 3.1.0-SNAPSHOT + 3.1.0 maven-plugin Apache Maven Shade Plugin @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-shade-plugin-3.1.0 jira
svn commit: r1805510 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: rfscholte Date: Sat Aug 19 13:42:27 2017 New Revision: 1805510 URL: http://svn.apache.org/viewvc?rev=1805510=rev Log: Lock maven-plugin-plugin to 3.5 so its report can be generated Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805510=1805509=1805510=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:42:27 2017 @@ -30,7 +30,7 @@ maven-shade-plugin - 3.1.1-SNAPSHOT + 3.1.0-SNAPSHOT maven-plugin Apache Maven Shade Plugin @@ -240,10 +240,18 @@ - + + + +maven-plugin-plugin +3.5 + + + + run-its
svn commit: r1805509 - /maven/plugins/tags/maven-shade-plugin-3.1.0/
Author: rfscholte Date: Sat Aug 19 13:40:08 2017 New Revision: 1805509 URL: http://svn.apache.org/viewvc?rev=1805509=rev Log: Invalid tag due to failing maven-plugin-plugin report Removed: maven/plugins/tags/maven-shade-plugin-3.1.0/
svn commit: r1805508 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: rfscholte Date: Sat Aug 19 13:25:00 2017 New Revision: 1805508 URL: http://svn.apache.org/viewvc?rev=1805508=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805508=1805507=1805508=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:25:00 2017 @@ -30,7 +30,7 @@ maven-shade-plugin - 3.1.0 + 3.1.1-SNAPSHOT maven-plugin Apache Maven Shade Plugin @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-shade-plugin-3.1.0 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin jira
svn commit: r1805506 - /maven/plugins/trunk/maven-shade-plugin/pom.xml
Author: rfscholte Date: Sat Aug 19 13:24:45 2017 New Revision: 1805506 URL: http://svn.apache.org/viewvc?rev=1805506=rev Log: [maven-release-plugin] prepare release maven-shade-plugin-3.1.0 Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805506=1805505=1805506=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:24:45 2017 @@ -30,7 +30,7 @@ maven-shade-plugin - 3.0.1-SNAPSHOT + 3.1.0 maven-plugin Apache Maven Shade Plugin @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-shade-plugin-3.1.0 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-shade-plugin-3.1.0 jira
svn commit: r1805507 - /maven/plugins/tags/maven-shade-plugin-3.1.0/
Author: rfscholte Date: Sat Aug 19 13:24:58 2017 New Revision: 1805507 URL: http://svn.apache.org/viewvc?rev=1805507=rev Log: [maven-release-plugin] copy for tag maven-shade-plugin-3.1.0 Added: maven/plugins/tags/maven-shade-plugin-3.1.0/ - copied from r1805506, maven/plugins/trunk/maven-shade-plugin/
svn commit: r1805505 - in /maven/plugins/trunk/maven-shade-plugin: ./ src/it/MSHADE-185/ src/it/component-descriptor-relocation/ src/it/mini-jar-package-info/ src/it/mini-jar/ src/it/project-with-reac
Author: rfscholte Date: Sat Aug 19 13:13:47 2017 New Revision: 1805505 URL: http://svn.apache.org/viewvc?rev=1805505=rev Log: Ensure plugin builds fine with Java9 as well Added: maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/ maven/plugins/trunk/maven-shade-plugin/src/it/setup-parent/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/reloc-abs-resource-path/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/reloc-enum-ref-from-anno/pom.xml maven/plugins/trunk/maven-shade-plugin/src/it/users-shader-impl/pom.xml Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805505=1805504=1805505=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 13:13:47 2017 @@ -230,6 +230,7 @@ org.codehaus.plexus plexus-component-metadata +1.7.1 Added: maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties?rev=1805505=auto == --- maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties (added) +++ maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-185/invoker.properties Sat Aug 19 13:13:47 2017 @@ -0,0 +1,18 @@ +# 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.java.version = 9- Modified: maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml?rev=1805505=1805504=1805505=diff == --- maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/component-descriptor-relocation/pom.xml Sat Aug 19 13:13:47 2017 @@ -22,6 +22,13 @@ under the License. http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 + +org.apache.maven.plugins.shade.its +shade-parent +1.0 +../setup-parent + + org.apache.maven.its.shade.cdr test 1.0 @@ -44,6 +51,11 @@ under the License. + + +1.4 +1.4 + @@ -70,10 +82,6 @@ under the License. org.apache.maven.plugins maven-compiler-plugin 2.0.2 - - 1.4 - 1.4 - org.apache.maven.plugins Modified: maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml?rev=1805505=1805504=1805505=diff == --- maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar-package-info/pom.xml Sat Aug 19 13:13:47 2017 @@ -19,15 +19,26 @@ under the License. --> 4.0.0 + + + org.apache.maven.plugins.shade.its + shade-parent + 1.0 + ../setup-parent + + org.apache.maven.its.shade.mjpi test-package-info 1 pom
svn commit: r1805504 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Author: rfscholte
Date: Sat Aug 19 11:57:11 2017
New Revision: 1805504
URL: http://svn.apache.org/viewvc?rev=1805504=rev
Log:
[MSHADE-257] Bad zero length source jars published by 3rd parties cause source
jar creation to fail.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1805504=1805503=1805504=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Sat Aug 19 11:57:11 2017
@@ -627,7 +627,14 @@ public class ShadeMojo
File file = resolveArtifactSources( artifact );
if ( file != null )
{
-sourceArtifacts.add( file );
+if ( file.length() > 0 )
+{
+sourceArtifacts.add( file );
+}
+else
+{
+getLog().warn( "Skipping empty source jar " +
artifact.getId() + "." );
+}
}
}
}
svn commit: r1805503 - in /maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation: ./ pom.xml verify.groovy
Author: rfscholte
Date: Sat Aug 19 11:42:02 2017
New Revision: 1805503
URL: http://svn.apache.org/viewvc?rev=1805503=rev
Log:
[MSHADE-258] RemappingClassAdapter is deprecated and throws an exception with
ASM 6.0 beta
Provide IT
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/verify.groovy
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/pom.xml?rev=1805503=auto
==
---
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/pom.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/pom.xml
Sat Aug 19 11:42:02 2017
@@ -0,0 +1,65 @@
+
+
+
+
+
+ 4.0.0
+ org.apache.maven.its.shade.csj
+ mshade-258
+ 1.0-SNAPSHOT
+ https://issues.apache.org/jira/browse/MSHADE-258
+
+RemappingClassAdapter is deprecated and throws an exception with ASM 6.0
beta
+
+
+
+
+ org.ow2.asm
+ asm
+ @asmVersion@
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+
+shade
+
+ shade
+
+
+
+
+ org.objectweb.asm
+ org.shaded.objectweb.asm
+
+
+
+
+
+
+
+
+
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/verify.groovy?rev=1805503=auto
==
---
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/verify.groovy
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-258_module_relocation/verify.groovy
Sat Aug 19 11:42:02 2017
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+def buildLog = new File ( basedir , "build.log" )
+assert buildLog.text.contains( "[WARNING] Discovered module-info.class.
Shading will break its strong encapsulation." )
+
+def jarFile = new java.util.jar.JarFile( new File( basedir,
"target/mshade-258-1.0-SNAPSHOT.jar" ) )
+try
+{
+ assert null == jarFile.getJarEntry( "module-info.class" )
+}
+finally
+{
+ jarFile.close()
+}
svn commit: r1805502 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade: pom/MavenJDOMWriter.java resource/IncludeResourceTransformer.java
Author: rfscholte
Date: Sat Aug 19 11:40:34 2017
New Revision: 1805502
URL: http://svn.apache.org/viewvc?rev=1805502=rev
Log:
Apply generics
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformer.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java?rev=1805502=1805501=1805502=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java
Sat Aug 19 11:40:34 2017
@@ -178,23 +178,21 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
-protected Element findAndReplaceSimpleLists( Counter counter, Element
parent, java.util.Collection list,
+protected Element findAndReplaceSimpleLists( Counter counter, Element
parent, java.util.Collection list,
String parentName, String
childName )
{
boolean shouldExist = list != null && list.size() > 0;
Element element = updateElement( counter, parent, parentName,
shouldExist );
if ( shouldExist )
{
-Iterator it = list.iterator();
-Iterator elIt = element.getChildren( childName,
element.getNamespace() ).iterator();
+Iterator elIt = element.getChildren( childName,
element.getNamespace() ).iterator();
if ( !elIt.hasNext() )
{
elIt = null;
}
Counter innerCount = new Counter( counter.getDepth() + 1 );
-while ( it.hasNext() )
+for ( String value : list )
{
-String value = (String) it.next();
Element el;
if ( elIt != null && elIt.hasNext() )
{
@@ -304,23 +302,21 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
-protected void iterateContributor( Counter counter, Element parent,
java.util.Collection list,
+protected void iterateContributor( Counter counter, Element parent,
Collection list,
java.lang.String parentTag,
java.lang.String childTag )
{
boolean shouldExist = list != null && list.size() > 0;
Element element = updateElement( counter, parent, parentTag,
shouldExist );
if ( shouldExist )
{
-Iterator it = list.iterator();
-Iterator elIt = element.getChildren( childTag,
element.getNamespace() ).iterator();
+Iterator elIt = element.getChildren( childTag,
element.getNamespace() ).iterator();
if ( !elIt.hasNext() )
{
elIt = null;
}
Counter innerCount = new Counter( counter.getDepth() + 1 );
-while ( it.hasNext() )
+for ( Contributor value : list )
{
-Contributor value = (Contributor) it.next();
Element el;
if ( elIt != null && elIt.hasNext() )
{
@@ -358,23 +354,21 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
-protected void iterateDependency( Counter counter, Element parent,
java.util.Collection list,
+protected void iterateDependency( Counter counter, Element parent,
Collection list,
java.lang.String parentTag,
java.lang.String childTag )
{
boolean shouldExist = list != null && list.size() > 0;
Element element = updateElement( counter, parent, parentTag,
shouldExist );
if ( shouldExist )
{
-Iterator it = list.iterator();
-Iterator elIt = element.getChildren( childTag,
element.getNamespace() ).iterator();
+Iterator elIt = element.getChildren( childTag,
element.getNamespace() ).iterator();
if ( !elIt.hasNext() )
{
elIt = null;
}
Counter innerCount = new Counter( counter.getDepth() + 1 );
-while ( it.hasNext() )
+for ( Dependency value : list )
{
-Dependency value = (Dependency) it.next();
Element el;
if ( elIt != null && elIt.hasNext() )
{
@@ -412,23 +406,21 @@ public class MavenJDOMWriter
* @param list
* @param parent
*/
-protected void iterateDeveloper( Counter counter, Element parent,
svn commit: r1805501 - in /maven/plugins/trunk/maven-shade-plugin: pom.xml src/main/java/org/apache/maven/plugins/shade/DefaultShader.java src/main/java/org/apache/maven/plugins/shade/filter/MinijarFi
Author: rfscholte
Date: Sat Aug 19 11:38:02 2017
New Revision: 1805501
URL: http://svn.apache.org/viewvc?rev=1805501=rev
Log:
[MSHADE-242] Plugin does not work with Java 9
Upgraded ASM + JDependency
Adjust code due to dependency upgrades
Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1805501=1805500=1805501=diff
==
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat Aug 19 11:38:02 2017
@@ -62,7 +62,7 @@
3.0
${project.version}
-5.1
+6.0_BETA
@@ -112,7 +112,7 @@
org.apache.maven.shared
maven-artifact-transfer
- 0.9.0
+ 0.9.1
@@ -143,7 +143,7 @@
org.vafer
jdependency
- 1.1
+ 1.2
org.codehaus.plexus
@@ -200,6 +200,29 @@
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+
+ enforce-bytecode-version
+
+
+
+
+ module-info
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-plugin-plugin
+3.5
+
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1805501=1805500=1805501=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Sat Aug 19 11:38:02 2017
@@ -19,23 +19,6 @@ package org.apache.maven.plugins.shade;
* under the License.
*/
-import com.google.common.base.Joiner;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.shade.filter.Filter;
-import org.apache.maven.plugins.shade.relocation.Relocator;
-import org.apache.maven.plugins.shade.resource.ManifestResourceTransformer;
-import org.apache.maven.plugins.shade.resource.ResourceTransformer;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
-
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -59,6 +42,25 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipException;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.shade.filter.Filter;
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.apache.maven.plugins.shade.resource.ManifestResourceTransformer;
+import org.apache.maven.plugins.shade.resource.ResourceTransformer;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.IOUtil;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.commons.ClassRemapper;
+import org.objectweb.asm.commons.Remapper;
+
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
/**
* @author Jason van Zyl
*/
@@ -175,6 +177,13 @@ public class DefaultShader
// later
continue;
}
+
+if ( "module-info.class".equals( name ) )
+{
+getLogger().warn( "Discovered module-info.class. "
++ "Shading will break its strong encapsulation." );
+continue;
+}
if ( !entry.isDirectory() && !isFiltered( jarFilters, name
) )
{
@@
svn commit: r1805500 - /maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm
Author: andham Date: Sat Aug 19 11:08:12 2017 New Revision: 1805500 URL: http://svn.apache.org/viewvc?rev=1805500=rev Log: Fixed visual defects in example page Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm?rev=1805500=1805499=1805500=diff == --- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm (original) +++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt.vm Sat Aug 19 11:08:12 2017 @@ -37,6 +37,7 @@ Generating an EJB client To generate the ejb-client JAR, you need to set <<>> to <<>> in the plugin's configuration: ++ + [...] [...] @@ -54,6 +55,7 @@ Generating an EJB client [...] [...] + +-+ * Client inclusions and exclusions @@ -75,6 +77,7 @@ Generating an EJB client To customize this, use the <<>> and <<>> elements: ++ + [...] [...] @@ -105,6 +108,7 @@ Generating an EJB client [...] [...] + +-+ <> Be careful when mixing excludes and includes, excludes will have a higher priority than includes.
svn commit: r1805499 - /maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Author: andham
Date: Sat Aug 19 10:59:34 2017
New Revision: 1805499
URL: http://svn.apache.org/viewvc?rev=1805499=rev
Log:
minor formatting fix of parameter name in Usage page
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm?rev=1805499=1805498=1805499=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm Sat Aug 19
10:59:34 2017
@@ -64,7 +64,7 @@ Usage
* Specifying the EJB version to use
- The plugin generates according to the EJB version specified by the
{{{./ejb-mojo.html#ejbVersion}ejbVersion}}
+ The plugin generates according to the EJB version specified by the
{{{./ejb-mojo.html#ejbVersion}<<>>}}
parameter. To use some other version than the default, configure the plugin
as in the example below:
+
svn commit: r1805498 - /maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Author: andham
Date: Sat Aug 19 10:52:32 2017
New Revision: 1805498
URL: http://svn.apache.org/viewvc?rev=1805498=rev
Log:
[MEJB-115] Wrong default EJB version stated on Usage page
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm?rev=1805498=1805497=1805498=diff
==
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt.vm Sat Aug 19
10:52:32 2017
@@ -64,20 +64,22 @@ Usage
* Specifying the EJB version to use
- In EJB3, the <<>> deployment descriptor is not mandatory
anymore. By default
- the plugin assumes version 2.1. To use another version, configure the plugin
as follows:
+ The plugin generates according to the EJB version specified by the
{{{./ejb-mojo.html#ejbVersion}ejbVersion}}
+ parameter. To use some other version than the default, configure the plugin
as in the example below:
+
-
-
-org.apache.maven.plugins
-maven-ejb-plugin
-${project.version}
-
- 3.0
-
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-ejb-plugin
+ ${project.version}
+
+3.0
+
+
+
+
+-
svn commit: r1805497 - /maven/plugins/trunk/maven-jmod-plugin/src/main/filtered-resources/META-INF/plexus/components.xml
Author: khmarbaise
Date: Sat Aug 19 10:43:46 2017
New Revision: 1805497
URL: http://svn.apache.org/viewvc?rev=1805497=rev
Log:
[MJMOD-1] Upgrade dependencies in component
o maven-compiler-plugin from 3.5.1 to 3.6.2
o maven-resources-plugin from 3.0.1 to 3.0.2
o maven-surefire-plugin from 2.19.1 to 2.20
Modified:
maven/plugins/trunk/maven-jmod-plugin/src/main/filtered-resources/META-INF/plexus/components.xml
Modified:
maven/plugins/trunk/maven-jmod-plugin/src/main/filtered-resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jmod-plugin/src/main/filtered-resources/META-INF/plexus/components.xml?rev=1805497=1805496=1805497=diff
==
---
maven/plugins/trunk/maven-jmod-plugin/src/main/filtered-resources/META-INF/plexus/components.xml
(original)
+++
maven/plugins/trunk/maven-jmod-plugin/src/main/filtered-resources/META-INF/plexus/components.xml
Sat Aug 19 10:43:46 2017
@@ -55,19 +55,19 @@
-org.apache.maven.plugins:maven-resources-plugin:3.0.1:resources
+org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
-org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
+org.apache.maven.plugins:maven-compiler-plugin:3.6.2:compile
-
org.apache.maven.plugins:maven-resources-plugin:3.0.1:testResources
+
org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
-
org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
+
org.apache.maven.plugins:maven-compiler-plugin:3.6.2:testCompile
-org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test
+org.apache.maven.plugins:maven-surefire-plugin:2.20:test
org.apache.maven.plugins:maven-jmod-plugin:${project.version}:create
svn commit: r1017007 - /websites/production/maven/content/
Author: khmarbaise Date: Sat Aug 19 10:19:40 2017 New Revision: 1017007 Log: Maven EJB Plugin Version 3.0.0 Added: websites/production/maven/content/ - copied from r1017006, websites/staging/maven/trunk/content/
svn commit: r1805494 - in /maven/plugins/trunk/maven-pmd-plugin/src/site: apt/examples/upgrading-PMD-at-runtime.apt.vm apt/index.apt.vm site.xml
Author: adangel
Date: Sat Aug 19 09:19:07 2017
New Revision: 1805494
URL: http://svn.apache.org/viewvc?rev=1805494=rev
Log:
[MPMD-239] Add documentation about upgrading PMD version at runtime
Added:
maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/site/apt/index.apt.vm
maven/plugins/trunk/maven-pmd-plugin/src/site/site.xml
Added:
maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm?rev=1805494=auto
==
---
maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm
(added)
+++
maven/plugins/trunk/maven-pmd-plugin/src/site/apt/examples/upgrading-PMD-at-runtime.apt.vm
Sat Aug 19 09:19:07 2017
@@ -0,0 +1,79 @@
+ --
+ Upgrading PMD at Runtime
+ --
+ Andreas Dangel
+ --
+ 2017-08-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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Upgrading PMD at Runtime
+
+ The Maven PMD plugin comes with a default PMD version: for
<<>>,
+ PMD ${pmdVersion} is used by default.
+
+ Given that the {{{https://pmd.github.io}newer PMD version}} is compatible,
+ you can override the PMD version, that the Maven plugin will use and benefit
+ from the latest bugfixes and enhancements:
+
++-+
+
+
+...choose your version...
+
+...
+
+
+
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+ ${project.version}
+
+
+ net.sourceforge.pmd
+ pmd-core
+ \${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-java
+ \${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-javascript
+ \${pmdVersion}
+
+
+ net.sourceforge.pmd
+ pmd-jsp
+ \${pmdVersion}
+
+
+
+
+
+
+...
+
++-+
Modified: maven/plugins/trunk/maven-pmd-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/site/apt/index.apt.vm?rev=1805494=1805493=1805494=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/site/apt/index.apt.vm Sat Aug 19
09:19:07 2017
@@ -73,6 +73,8 @@ ${project.name}
To provide you with better understanding of some usages of the Maven PMD
Plugin, you can take a look into the
following examples:
+ * {{{./examples/upgrading-PMD-at-runtime.html}Upgrading PMD at Runtime}}
+
* {{{./examples/multi-module-config.html}Multimodule Configuration}}
* {{{./examples/removeReport.html}Remove Report}}
Modified: maven/plugins/trunk/maven-pmd-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/site/site.xml?rev=1805494=1805493=1805494=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/site/site.xml Sat Aug 19 09:19:07
2017
@@ -33,6 +33,7 @@ under the License.
+
