[maven-javadoc-plugin] branch MJAVADOC-535 deleted (was 033ce3a)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-535
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 was 033ce3a  [MJAVADOC-535] Upgrade to parent pom 32

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[maven-javadoc-plugin] branch master updated (b651443 -> 033ce3a)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


from b651443  [MJAVADOC-528] Invalid 'expires' attribute
 add 033ce3a  [MJAVADOC-535] Upgrade to parent pom 32

No new revisions were added by this update.

Summary of changes:
 pom.xml | 15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

[maven-javadoc-plugin] 01/01: [MJAVADOC-535] Upgrade to parent pom 32

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-535
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 033ce3a46b7fdf3ed6a9075192d6e3b4dd2800ec
Author: Guillaume Boué 
AuthorDate: Sat Aug 18 18:37:15 2018 +0200

[MJAVADOC-535] Upgrade to parent pom 32

Also remove configuration coming from parent
---
 pom.xml | 15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2750343..1b75dd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven.plugins
 maven-plugins
-31
+32
 ../../pom/maven/maven-plugins/pom.xml
   
 
@@ -336,11 +336,6 @@ under the License.
 
   
 
-
-  org.apache.maven.plugins
-  maven-plugin-plugin
-  3.5
-
   
 
 
@@ -391,7 +386,6 @@ under the License.
   
 org.codehaus.plexus
 plexus-component-metadata
-1.7.1
 
   
 
@@ -405,7 +399,6 @@ under the License.
   
 org.apache.maven.plugins
 maven-surefire-plugin
-2.21.0
 
   
 
@@ -514,7 +507,6 @@ under the License.
   
 org.apache.maven.plugins
 maven-changes-plugin
-2.9
 
   
   Type,Key,Summary,Assignee,Status,Resolution,Fix 
Version
@@ -531,11 +523,6 @@ under the License.
   
 
   
-  
-org.apache.maven.plugins
-maven-plugin-plugin
-3.5
-  
 
   
 

[maven-javadoc-plugin] branch MJAVADOC-535 created (now 033ce3a)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-535
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at 033ce3a  [MJAVADOC-535] Upgrade to parent pom 32

This branch includes the following new commits:

 new 033ce3a  [MJAVADOC-535] Upgrade to parent pom 32

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-javadoc-plugin] branch MJAVADOC-528 deleted (was b651443)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-528
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 was b651443  [MJAVADOC-528] Invalid 'expires' attribute

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[maven-javadoc-plugin] branch master updated (42225cc -> b651443)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


from 42225cc  Fix IT failures on CI
 add b651443  [MJAVADOC-528] Invalid 'expires' attribute

No new revisions were added by this update.

Summary of changes:
 .../invoker.properties |   0
 .../{MJAVADOC-497 => MJAVADOC-528}/pom.xml | 111 ++---
 .../src/main/java/foo/bar}/MyClass.java|   3 +-
 .../verify.groovy  |  42 
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |   3 +
 5 files changed, 80 insertions(+), 79 deletions(-)
 copy src/it/projects/{MJAVADOC-407 => MJAVADOC-528}/invoker.properties (100%)
 copy src/it/projects/{MJAVADOC-497 => MJAVADOC-528}/pom.xml (83%)
 copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo/src/main/java/com/foo => 
MJAVADOC-528/src/main/java/foo/bar}/MyClass.java (95%)
 copy src/it/projects/{MJAVADOC-498_modulepath => MJAVADOC-528}/verify.groovy 
(83%)

[maven-javadoc-plugin] branch fix-it-failure deleted (was 42225cc)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 was 42225cc  Fix IT failures on CI

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[maven-javadoc-plugin] 01/01: [MJAVADOC-528] Invalid 'expires' attribute

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-528
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit b651443bba06fdf469b730024489c3f02629e50c
Author: dedabob 
AuthorDate: Wed Aug 15 15:09:58 2018 +0200

[MJAVADOC-528] Invalid 'expires' attribute

This closes #5.
---
 src/it/projects/MJAVADOC-528/invoker.properties| 18 +++
 src/it/projects/MJAVADOC-528/pom.xml   | 55 ++
 .../src/main/java/foo/bar/MyClass.java | 24 ++
 src/it/projects/MJAVADOC-528/verify.groovy | 21 +
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |  3 ++
 5 files changed, 121 insertions(+)

diff --git a/src/it/projects/MJAVADOC-528/invoker.properties 
b/src/it/projects/MJAVADOC-528/invoker.properties
new file mode 100644
index 000..a4e250d
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/invoker.properties
@@ -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.goals=clean javadoc:javadoc
diff --git a/src/it/projects/MJAVADOC-528/pom.xml 
b/src/it/projects/MJAVADOC-528/pom.xml
new file mode 100644
index 000..6ee3712
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/pom.xml
@@ -0,0 +1,55 @@
+
+
+
+
+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/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.maven-javadoc-plugin.it
+  mjavadoc-528
+  1.0-SNAPSHOT
+
+  
+UTF-8
+  
+
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  @pom.version@
+  
+true
+  
+
+  
+
+  
+
+  
+
+  com.google.code.gson
+  gson
+  2.5
+
+  
+
diff --git a/src/it/projects/MJAVADOC-528/src/main/java/foo/bar/MyClass.java 
b/src/it/projects/MJAVADOC-528/src/main/java/foo/bar/MyClass.java
new file mode 100644
index 000..e5960e3
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/src/main/java/foo/bar/MyClass.java
@@ -0,0 +1,24 @@
+package foo.bar;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+}
diff --git a/src/it/projects/MJAVADOC-528/verify.groovy 
b/src/it/projects/MJAVADOC-528/verify.groovy
new file mode 100644
index 000..66dfbd1
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/verify.groovy
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+File log = new File( basedir, 'build.log' )
+assert !( log.text =~ /.*Inval

[maven-javadoc-plugin] branch MJAVADOC-528 updated (93ec8b8 -> b651443)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-528
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 discard 93ec8b8  [MJAVADOC-528] Invalid 'expires' attribute
 add 42225cc  Fix IT failures on CI
 new b651443  [MJAVADOC-528] Invalid 'expires' attribute

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (93ec8b8)
\
 N -- N -- N   refs/heads/MJAVADOC-528 (b651443)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml | 5 +
 src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml | 5 +
 src/it/projects/detectLinks/verify.bsh | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

[maven-javadoc-plugin] branch master updated (407343b -> 42225cc)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


from 407343b  [MJAVADOC-533]  entries that point to a resource that 
requires an Accept header may be ignored
 add 42225cc  Fix IT failures on CI

No new revisions were added by this update.

Summary of changes:
 src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml | 5 +
 src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml | 5 +
 src/it/projects/detectLinks/verify.bsh | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

[maven-javadoc-plugin] 01/01: Fix IT failures on CI

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 42225cc8275d480f5306a7f354f1e0fa4b15193f
Author: Guillaume Boué 
AuthorDate: Fri Aug 17 23:43:15 2018 +0200

Fix IT failures on CI

- dependencySource-[24]: it is a Windows long path issue that hits a
surefire bug, solved by updating surefire.
- detectLinks: the base directory of the project is canonicalized so we
also need to do it in the IT (so that, e.g., Windows drive letter case
is consistent).
---
 src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml | 5 +
 src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml | 5 +
 src/it/projects/detectLinks/verify.bsh | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml 
b/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml
index 2fdc256..284d57a 100644
--- a/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml
+++ b/src/it/projects/dependencySource-2/MJAVADOC-280-2-projects/pom.xml
@@ -58,6 +58,11 @@ under the License.
 
   
 
+
+  org.apache.maven.plugins
+  maven-surefire-plugin
+  2.22.0
+
   
 
   
diff --git a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml 
b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
index b67ffed..fb19c79 100644
--- a/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
+++ b/src/it/projects/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
@@ -84,6 +84,11 @@ under the License.
 
   
 
+
+  org.apache.maven.plugins
+  maven-surefire-plugin
+  2.22.0
+
   
 
   
diff --git a/src/it/projects/detectLinks/verify.bsh 
b/src/it/projects/detectLinks/verify.bsh
index 3669ab0..145ebb4 100644
--- a/src/it/projects/detectLinks/verify.bsh
+++ b/src/it/projects/detectLinks/verify.bsh
@@ -97,9 +97,9 @@ try
 System.err.println( "module2 -linkoffline module1 not added: " + 
options2 );
 return false;
 }
-if ( !contentOptions2.substring( linkoffline2 ).contains( 
apidocs1.getAbsolutePath().replaceAll( "", "/" ) ) )
+if ( !contentOptions2.substring( linkoffline2 ).contains( 
apidocs1.getCanonicalPath().replaceAll( "", "/" ) ) )
 {
-System.err.println( apidocs1.getAbsolutePath().replaceAll( "", "/" 
) + " not added: " + options2 );
+System.err.println( apidocs1.getCanonicalPath().replaceAll( "", 
"/" ) + " not added: " + options2 );
 return false;
 }
 int link2 = contentOptions2.indexOf( "-link" );

[maven-javadoc-plugin] branch fix-it-failure updated (ac5e166 -> 42225cc)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 discard ac5e166  verify that issue was windows lowercase drive letter
 discard 1c57e1d  archive invoker output to see what is going on...
 discard e3c9b8c  restrict to windows, maven 3.5, jdk 8
 discard 9ab9d7b  print logs and only include detectLinks to see what is wrong 
faster
 discard a540a3b  see if issue is with old version of surefire and Windows long 
paths...
 new 42225cc  Fix IT failures on CI

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ac5e166)
\
 N -- N -- N   refs/heads/fix-it-failure (42225cc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Jenkinsfile| 194 +
 pom.xml|   4 -
 .../MJAVADOC-280-2-projects/pom.xml|   5 +
 .../projects/dependencySource-2/invoker.properties |   4 +-
 .../MJAVADOC-280-4-projects/pom.xml|   5 +
 .../projects/dependencySource-4/invoker.properties |   4 +-
 src/it/projects/detectLinks/invoker.properties |   2 +-
 7 files changed, 17 insertions(+), 201 deletions(-)

[maven-javadoc-plugin] branch fix-it-failure updated: verify that issue was windows lowercase drive letter

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/fix-it-failure by this push:
 new ac5e166  verify that issue was windows lowercase drive letter
ac5e166 is described below

commit ac5e16602fd347a0c08114d5b57a80882931f388
Author: Guillaume Boué 
AuthorDate: Fri Aug 17 22:48:51 2018 +0200

verify that issue was windows lowercase drive letter
---
 src/it/projects/detectLinks/verify.bsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/it/projects/detectLinks/verify.bsh 
b/src/it/projects/detectLinks/verify.bsh
index 3669ab0..145ebb4 100644
--- a/src/it/projects/detectLinks/verify.bsh
+++ b/src/it/projects/detectLinks/verify.bsh
@@ -97,9 +97,9 @@ try
 System.err.println( "module2 -linkoffline module1 not added: " + 
options2 );
 return false;
 }
-if ( !contentOptions2.substring( linkoffline2 ).contains( 
apidocs1.getAbsolutePath().replaceAll( "", "/" ) ) )
+if ( !contentOptions2.substring( linkoffline2 ).contains( 
apidocs1.getCanonicalPath().replaceAll( "", "/" ) ) )
 {
-System.err.println( apidocs1.getAbsolutePath().replaceAll( "", "/" 
) + " not added: " + options2 );
+System.err.println( apidocs1.getCanonicalPath().replaceAll( "", 
"/" ) + " not added: " + options2 );
 return false;
 }
 int link2 = contentOptions2.indexOf( "-link" );

[maven-javadoc-plugin] branch fix-it-failure updated: archive invoker output to see what is going on...

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/fix-it-failure by this push:
 new 1c57e1d  archive invoker output to see what is going on...
1c57e1d is described below

commit 1c57e1d5953e786310b39c5d25ae81a0245057f8
Author: Guillaume Boué 
AuthorDate: Fri Aug 17 20:48:34 2018 +0200

archive invoker output to see what is going on...
---
 Jenkinsfile | 194 +++-
 1 file changed, 192 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dc229a1..2278690 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,6 @@
-/**
+#!/usr/bin/env groovy
+
+/*
  * 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
@@ -17,4 +19,192 @@
  * under the License.
  */
 
-asfMavenTlpPlgnBuild(jdk:['8'],os:['windows'],maven:['3.5.x'])
+build(jdk:['8'],os:['windows'],maven:['3.5.x'])
+
+def build(Map params = [:]) {
+  Map taskContext = [:]
+  try {
+// set build retention time first
+def buildRetention
+if (env.BRANCH_NAME == 'master') {
+  buildRetention = buildDiscarder(logRotator(artifactDaysToKeepStr: '', 
artifactNumToKeepStr: '3', daysToKeepStr: '21', numToKeepStr: '25'))
+} else {
+  buildRetention = buildDiscarder(logRotator(artifactDaysToKeepStr: '', 
artifactNumToKeepStr: '1', daysToKeepStr: '7', numToKeepStr: '5'))
+}
+properties([buildRetention])
+
+// now determine the matrix of parallel builds
+def oses = params.containsKey('os') ? params.os : ['linux', 'windows']
+def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['7','8','9','10']
+def jdkMin = jdks[0];
+def mavens = params.containsKey('maven') ? params.maven : 
['3.0.x','3.2.x','3.3.x','3.5.x']
+// def failFast = params.containsKey('failFast') ? params.failFast : true
+// Just temporarily
+def failFast = false;
+def siteJdk = params.containsKey('siteJdk') ? params.siteJdk : '8'
+def siteMvn = params.containsKey('siteMvn') ? params.siteJdk : '3.5.x'
+
+taskContext['failFast'] = failFast;
+Map tasks = [failFast: failFast]
+boolean first = true
+for (String os in oses) {
+  for (def mvn in mavens) {
+def jdk = Math.max( jdkMin as Integer, jenkinsEnv.jdkForMaven( mvn ) 
as Integer) as String
+jdks = jdks.findAll{ it != jdk }
+doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
+  }
+  for (def jdk in jdks) {
+def mvn = jenkinsEnv.mavenForJdk(jdk)
+doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
+  }
+  
+  // doesn't work for multimodules yet
+  // doCreateTask( os, siteJdk, siteMvn, tasks, first, 'site', taskContext 
)
+  
+  // run with apache-release profile, consider it a dryRun with SNAPSHOTs
+  // doCreateTask( os, siteJdk, siteMvn, tasks, first, 'release', 
taskContext )
+}
+// run the parallel builds
+parallel(tasks)
+
+// JENKINS-34376 seems to make it hard to detect the aborted builds
+  } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
+// this ambiguous condition means a user probably aborted
+if (e.causes.size() == 0) {
+  currentBuild.result = "ABORTED"
+} else {
+  currentBuild.result = "FAILURE"
+}
+throw e
+  } catch (hudson.AbortException e) {
+// this ambiguous condition means during a shell step, user probably 
aborted
+if (e.getMessage().contains('script returned exit code 143')) {
+  currentBuild.result = "ABORTED"
+} else {
+  currentBuild.result = "FAILURE"
+}
+throw e
+  } catch (InterruptedException e) {
+currentBuild.result = "ABORTED"
+throw e
+  } catch (Throwable e) {
+currentBuild.result = "FAILURE"
+throw e
+  } finally {
+// notify completion
+if (taskContext.failingFast != null) {
+  echo "* FAST FAILURE *\n\nFast failure triggered by 
${taskContext.failingFast}\n\n* FAST FAILURE *"
+}
+stage("Notifications") {
+  jenkinsNotify()
+}
+  }
+}
+
+def doCreateTask( os, jdk, maven, tasks, first, plan, taskContext )
+{
+String label = jenkinsEnv.labelForOS(os);
+String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}")
+String mvnName = jenkinsEnv.mvnFromVersion(os, "${maven}")
+echo "OS: ${os} JDK: ${jdk} Maven: ${maven} => Label: ${label} JDK: 
${jdkName} Maven: ${mvnName}"
+if (label == null || jdkName == null || mvnName == null) {
+  echo "Skipping ${os}-jdk${jdk} as unsupported by Jenkins Environme

[maven-javadoc-plugin] branch fix-it-failure updated: restrict to windows, maven 3.5, jdk 8

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/fix-it-failure by this push:
 new e3c9b8c  restrict to windows, maven 3.5, jdk 8
e3c9b8c is described below

commit e3c9b8c108ed3b479fc1caa44b2086b54f309a83
Author: Guillaume Boué 
AuthorDate: Wed Aug 15 22:43:11 2018 +0200

restrict to windows, maven 3.5, jdk 8
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8a16e4c..dc229a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfMavenTlpPlgnBuild(jdk:['7','8','9'])
+asfMavenTlpPlgnBuild(jdk:['8'],os:['windows'],maven:['3.5.x'])

[maven-javadoc-plugin] branch fix-it-failure updated: print logs and only include detectLinks to see what is wrong faster

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/fix-it-failure by this push:
 new 9ab9d7b  print logs and only include detectLinks to see what is wrong 
faster
9ab9d7b is described below

commit 9ab9d7bde10b9d5e911276310cf13fe4348754c1
Author: Guillaume Boué 
AuthorDate: Wed Aug 15 22:10:22 2018 +0200

print logs and only include detectLinks to see what is wrong faster
---
 pom.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2750343..db0cb79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,6 +437,9 @@ under the License.
 MJAVADOC-181/pom.xml 
 output-encoding/pom.xml
   
+  
+detectLinks/pom.xml
+  
   
 
${maven.compiler.source}
 
${maven.compiler.target}
@@ -449,6 +452,7 @@ under the License.
   
 
true
   
+  true
 
   
   

[maven-javadoc-plugin] 01/01: see if issue is with old version of surefire and Windows long paths...

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit a540a3bb2c53b083048ae09fc5885e27a4c241eb
Author: Guillaume Boué 
AuthorDate: Wed Aug 15 20:51:26 2018 +0200

see if issue is with old version of surefire and Windows long paths...
---
 src/it/projects/dependencySource-2/invoker.properties | 4 ++--
 src/it/projects/dependencySource-4/invoker.properties | 4 ++--
 src/it/projects/detectLinks/invoker.properties| 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/it/projects/dependencySource-2/invoker.properties 
b/src/it/projects/dependencySource-2/invoker.properties
index 8e2a314..e7cc30a 100644
--- a/src/it/projects/dependencySource-2/invoker.properties
+++ b/src/it/projects/dependencySource-2/invoker.properties
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals.1 = clean install
+invoker.goals.1 = clean install -DskipTests
 invoker.project.1 = MJAVADOC-280-2-projects
 
-invoker.goals.2 = clean package
+invoker.goals.2 = clean package -DskipTests
 invoker.project.2 = MJAVADOC-280-2-distro
diff --git a/src/it/projects/dependencySource-4/invoker.properties 
b/src/it/projects/dependencySource-4/invoker.properties
index 38f3f08..b173ce3 100644
--- a/src/it/projects/dependencySource-4/invoker.properties
+++ b/src/it/projects/dependencySource-4/invoker.properties
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals.1 = clean install
+invoker.goals.1 = clean install -DskipTests
 invoker.project.1 = MJAVADOC-280-4-projects
 
-invoker.goals.2 = clean package
+invoker.goals.2 = clean package -DskipTests
 invoker.project.2 = MJAVADOC-280-4-distro
diff --git a/src/it/projects/detectLinks/invoker.properties 
b/src/it/projects/detectLinks/invoker.properties
index 93f1f9d..ec5cd66 100644
--- a/src/it/projects/detectLinks/invoker.properties
+++ b/src/it/projects/detectLinks/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean compile javadoc:javadoc
+invoker.goals=clean compile javadoc:javadoc -DskipTests

[maven-javadoc-plugin] branch fix-it-failure created (now a540a3b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch fix-it-failure
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at a540a3b  see if issue is with old version of surefire and Windows long 
paths...

This branch includes the following new commits:

 new a540a3b  see if issue is with old version of surefire and Windows long 
paths...

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-javadoc-plugin] branch MJAVADOC-528 created (now 93ec8b8)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-528
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at 93ec8b8  [MJAVADOC-528] Invalid 'expires' attribute

This branch includes the following new commits:

 new 93ec8b8  [MJAVADOC-528] Invalid 'expires' attribute

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-javadoc-plugin] 01/01: [MJAVADOC-528] Invalid 'expires' attribute

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-528
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 93ec8b8aa878213b529324a46313c9f579d839f4
Author: dedabob 
AuthorDate: Wed Aug 15 15:09:58 2018 +0200

[MJAVADOC-528] Invalid 'expires' attribute

This closes #5.
---
 src/it/projects/MJAVADOC-528/invoker.properties| 18 +++
 src/it/projects/MJAVADOC-528/pom.xml   | 55 ++
 .../src/main/java/foo/bar/MyClass.java | 24 ++
 src/it/projects/MJAVADOC-528/verify.groovy | 21 +
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |  3 ++
 5 files changed, 121 insertions(+)

diff --git a/src/it/projects/MJAVADOC-528/invoker.properties 
b/src/it/projects/MJAVADOC-528/invoker.properties
new file mode 100644
index 000..a4e250d
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/invoker.properties
@@ -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.goals=clean javadoc:javadoc
diff --git a/src/it/projects/MJAVADOC-528/pom.xml 
b/src/it/projects/MJAVADOC-528/pom.xml
new file mode 100644
index 000..6ee3712
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/pom.xml
@@ -0,0 +1,55 @@
+
+
+
+
+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/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.maven-javadoc-plugin.it
+  mjavadoc-528
+  1.0-SNAPSHOT
+
+  
+UTF-8
+  
+
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  @pom.version@
+  
+true
+  
+
+  
+
+  
+
+  
+
+  com.google.code.gson
+  gson
+  2.5
+
+  
+
diff --git a/src/it/projects/MJAVADOC-528/src/main/java/foo/bar/MyClass.java 
b/src/it/projects/MJAVADOC-528/src/main/java/foo/bar/MyClass.java
new file mode 100644
index 000..e5960e3
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/src/main/java/foo/bar/MyClass.java
@@ -0,0 +1,24 @@
+package foo.bar;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+}
diff --git a/src/it/projects/MJAVADOC-528/verify.groovy 
b/src/it/projects/MJAVADOC-528/verify.groovy
new file mode 100644
index 000..66dfbd1
--- /dev/null
+++ b/src/it/projects/MJAVADOC-528/verify.groovy
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+File log = new File( basedir, 'build.log' )
+assert !( log.text =~ /.*Inval

[maven-javadoc-plugin] 01/01: [MJAVADOC-516] Replace usage of deprecated HttpClient code

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-516
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 29dc4ddbaec0f15ff31a0e63bbd059fb68be0f93
Author: Guillaume Boué 
AuthorDate: Fri Mar 2 20:34:47 2018 +0100

[MJAVADOC-516] Replace usage of deprecated HttpClient code

Instead of creating a mutable DefaultHttpClient, we now use builder
classes and the new API introduced in 4.3, which deprecates the old one.
The configuration of the HttpClient stays the same.

Since the new API is guaranteeing a CloseableHttpClient,
try-with-resources can be used.
---
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 80 --
 1 file changed, 30 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index c7467ae..d906713 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -26,16 +26,17 @@ import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.HttpClient;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.params.ClientPNames;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeader;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Proxy;
@@ -74,7 +75,6 @@ import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Modifier;
-import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -1641,10 +1641,8 @@ public class JavadocUtil
 {
 return url;
 }
-HttpClient httpClient = null;
-try
+try ( CloseableHttpClient httpClient = createHttpClient( settings, url 
) )
 {
-httpClient = createHttpClient( settings, url );
 HttpClientContext httpContext = HttpClientContext.create();
 HttpGet httpMethod = new HttpGet( url.toString() );
 HttpResponse response = httpClient.execute( httpMethod, 
httpContext );
@@ -1658,13 +1656,6 @@ public class JavadocUtil
 List redirects = httpContext.getRedirectLocations();
 return isEmpty( redirects ) ? url : redirects.get( 
redirects.size() - 1 ).toURL();
 }
-finally
-{
-if ( httpClient != null )
-{
-httpClient.getConnectionManager().shutdown();
-}
-}
 }
 
 /**
@@ -1689,8 +1680,7 @@ public class JavadocUtil
 }
 
 BufferedReader reader = null;
-HttpGet httpMethod = null;
-HttpClient httpClient = null;
+CloseableHttpClient httpClient = null;
 
 try
 {
@@ -1704,17 +1694,8 @@ public class JavadocUtil
 // http, https...
 httpClient = createHttpClient( settings, url );
 
-httpMethod = new HttpGet( url.toString() );
-HttpResponse response;
-try
-{
-response = httpClient.execute( httpMethod );
-}
-catch ( SocketTimeoutException e )
-{
-// could be a sporadic failure, one more retry before we 
give up
-response = httpClient.execute( httpMethod );
-}
+HttpGet httpMethod = new HttpGet( url.toString() );
+HttpResponse response = httpClient.execute( httpMethod );
 
 int status = response.getStatusLine().getStatusCode();
 if ( status != HttpStatus.SC_OK )
@@ -1747,13 +1728,9 @@ public class JavadocUtil
 {
 IOUtil.close( reader );
 
-if ( httpMethod != null

[maven-javadoc-plugin] branch MJAVADOC-516 updated (14c837c -> 29dc4dd)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-516
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 discard 14c837c  [MJAVADOC-516] Replace usage of deprecated HttpClient code
 add c922342  [MJAVADOC-517] NPE under Java 10 RC Replace JavadocVersion 
with JavaVersion from plexus-java Extract parts from commons-lang3 SystemUtils, 
which should not be used anymore; it uses enums for java versions, which means 
an update is required for every new Java version.
 add 8d0b6d4  updated Modello xsd url
 add b49d947  [MJAVADOC-571] Upgrade plexus-java to 0.9.7
 add e637834  [MJAVADOC-515] - Upgrade parent to 31  o Fixed checkstyle 
issues related to upgrade.
 add d955df5  [MJAVADOC-519] - IT detectLinks fails on Windows
 add e4a55bb  Upgrade maven-surefire-plugin
 add 7c75ad5  [MJAVADOC-512] - Even when 
1.8.0 matches there still is a warning.
 add c611330  [MJAVADOC-512] - Even when 
1.8.0 matches there still is a warning.
 add 84a1e6b  [MNGSITE-332] - Changed download templates of plugins not to 
reference .md5 anymore
 add 86aa561  Skip Java 10 due to com.sun.tools.doclets removal in Java 10 
which causes failing tests, must be fixed later
 add 8e47dca  [MJAVADOC-520] Upgrade dependencies
 add 3df4a85  [MJAVADOC-521] - Added github information.
 add 41a8475  Fix javadoc errors
 add e00b87b  [maven-release-plugin] prepare release 
maven-javadoc-plugin-3.0.1
 add e7da1a4  [maven-release-plugin] prepare for next development iteration
 add e2e0316  [INFRA-16467] move components documentation out of CMS space
 add 976b8d2  [MJAVADOC-530] - Clean up additionalparam documentation
 add 4e95ecf  Merge pull request #6 from marschall/MJAVADOC-530
 add 65bdf55  Switch to asfMavenTlp set https.protocols for Java 7
 add 5410f11  Fix JenkinsFile
 add dc510d2  Fix unittests which depend on connection with Central :(
 add 3ccb3cc  [MJAVADOC-532]  entries that do not redirect are ignored
 add 407343b  [MJAVADOC-533]  entries that point to a resource that 
requires an Accept header may be ignored
 new 29dc4dd  [MJAVADOC-516] Replace usage of deprecated HttpClient code

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (14c837c)
\
 N -- N -- N   refs/heads/MJAVADOC-516 (29dc4dd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore |   1 +
 CONTRIBUTING.md|  91 ++
 Jenkinsfile|   2 +-
 README.md  |  99 +++
 pom.xml|  23 +-
 src/it/projects/detectLinks/pom.xml|   5 +-
 .../plugins/javadoc/AbstractFixJavadocMojo.java|  10 +-
 .../maven/plugins/javadoc/AbstractJavadocMojo.java |  68 ++---
 .../maven/plugins/javadoc/JavadocReport.java   |   4 +-
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 320 ++---
 .../maven/plugins/javadoc/JavadocVersion.java  |   2 +
 .../apache/maven/plugins/javadoc/SystemUtils.java  | 181 
 .../javadoc/resolver/SourceResolverConfig.java |   6 +-
 src/main/mdo/javadocOptions.mdo|   4 +-
 src/site/apt/examples/alternate-doclet.apt.vm  |  14 +-
 src/site/fml/faq.fml   |   4 +-
 src/site/xdoc/download.xml.vm  |   2 +-
 .../maven/plugins/javadoc/FixJavadocMojoTest.java  |  18 +-
 .../maven/plugins/javadoc/JavadocJarTest.java  |  10 +-
 .../maven/plugins/javadoc/JavadocReportTest.java   |  10 +-
 .../maven/plugins/javadoc/JavadocUtilTest.java |  81 ++
 21 files changed, 701 insertions(+), 254 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 README.md
 create mode 100644 
src/main/java/org/apache/maven/plugins/javadoc/SystemUtils.java

[maven-javadoc-plugin] branch MJAVADOC-533 deleted (was 407343b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-533
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 was 407343b  [MJAVADOC-533]  entries that point to a resource that 
requires an Accept header may be ignored

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[maven-javadoc-plugin] branch master updated (3ccb3cc -> 407343b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


from 3ccb3cc  [MJAVADOC-532]  entries that do not redirect are ignored
 add 407343b  [MJAVADOC-533]  entries that point to a resource that 
requires an Accept header may be ignored

No new revisions were added by this update.

Summary of changes:
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |  6 
 .../maven/plugins/javadoc/JavadocUtilTest.java | 40 ++
 2 files changed, 46 insertions(+)

[maven-javadoc-plugin] 01/01: [MJAVADOC-533] entries that point to a resource that requires an Accept header may be ignored

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-533
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 407343bad4cba9431cb490746ca9257c7a6f7594
Author: Guillaume Boué 
AuthorDate: Thu Aug 9 21:29:13 2018 +0200

[MJAVADOC-533]  entries that point to a resource that requires an
Accept header may be ignored

Add a */* Accept header, that is required by some servers
---
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |  6 
 .../maven/plugins/javadoc/JavadocUtilTest.java | 40 ++
 2 files changed, 46 insertions(+)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index 5881549..c7467ae 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugins.javadoc;
  * under the License.
  */
 
+import org.apache.http.HttpHeaders;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -32,6 +33,7 @@ import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.conn.params.ConnRoutePNames;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.message.BasicHeader;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.maven.plugin.logging.Log;
@@ -1816,6 +1818,10 @@ public class JavadocUtil
 httpClient.getParams().setParameter( CoreProtocolPNames.USER_AGENT,
  "Mozilla/4.0 (compatible; MSIE 
6.0; Windows NT 5.0)" );
 
+// Some server reject requests that do not have an Accept header
+httpClient.getParams().setParameter( ClientPNames.DEFAULT_HEADERS,
+ Arrays.asList( new BasicHeader( 
HttpHeaders.ACCEPT, "*/*" ) ) );
+
 if ( settings != null && settings.getActiveProxy() != null )
 {
 Proxy activeProxy = settings.getActiveProxy();
diff --git 
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java 
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
index 8e9b33f..fa5bfaa 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
@@ -618,6 +618,46 @@ public class JavadocUtilTest
 }
 
 /**
+ * Tests that getRedirectUrl adds an Accept header in HTTP requests. 
Necessary because some sites like Cloudflare
+ * reject requests without an Accept header.
+ */
+public void testGetRedirectUrlVerifyHeaders()
+throws Exception
+{
+Server server = null;
+try
+{
+server = new Server( 0 );
+server.addHandler( new AbstractHandler()
+{
+@Override
+public void handle( String target, HttpServletRequest request, 
HttpServletResponse response,
+int dispatch )
+throws IOException, ServletException
+{
+if ( request.getHeader( "Accept" ) == null )
+{
+response.setStatus( HttpServletResponse.SC_FORBIDDEN );
+}
+else
+{
+response.setStatus( HttpServletResponse.SC_OK );
+}
+response.getOutputStream().close();
+}
+} );
+server.start();
+
+URL url = new URI( "http://localhost:; + 
server.getConnectors()[0].getLocalPort() ).toURL();
+JavadocUtil.getRedirectUrl( url, new Settings() );
+}
+finally
+{
+stopSilently( server );
+}
+}
+
+/**
  * Method to test copyJavadocResources()
  *
  * @throws Exception if any

[maven-javadoc-plugin] branch MJAVADOC-533 created (now 407343b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-533
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at 407343b  [MJAVADOC-533]  entries that point to a resource that 
requires an Accept header may be ignored

This branch includes the following new commits:

 new 407343b  [MJAVADOC-533]  entries that point to a resource that 
requires an Accept header may be ignored

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-javadoc-plugin] branch MJAVADOC-532 deleted (was 3ccb3cc)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-532
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 was 3ccb3cc  [MJAVADOC-532]  entries that do not redirect are ignored

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[maven-javadoc-plugin] branch master updated (dc510d2 -> 3ccb3cc)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


from dc510d2  Fix unittests which depend on connection with Central :(
 add 3ccb3cc  [MJAVADOC-532]  entries that do not redirect are ignored

No new revisions were added by this update.

Summary of changes:
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |  2 +-
 .../maven/plugins/javadoc/JavadocUtilTest.java | 41 ++
 2 files changed, 42 insertions(+), 1 deletion(-)

[maven-javadoc-plugin] 01/01: [MJAVADOC-532] entries that do not redirect are ignored

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-532
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 3ccb3cc719adb0dd46ef214c4802dcc00099d823
Author: Guillaume Boué 
AuthorDate: Thu Aug 9 19:02:17 2018 +0200

[MJAVADOC-532]  entries that do not redirect are ignored

HttpClientContext#getRedirectLocations() can return null when there are
no redirects.
---
 .../apache/maven/plugins/javadoc/JavadocUtil.java  |  2 +-
 .../maven/plugins/javadoc/JavadocUtilTest.java | 41 ++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index a740c6e..5881549 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -1654,7 +1654,7 @@ public class JavadocUtil
 }
 
 List redirects = httpContext.getRedirectLocations();
-return redirects.isEmpty() ? url : redirects.get( redirects.size() 
- 1 ).toURL();
+return isEmpty( redirects ) ? url : redirects.get( 
redirects.size() - 1 ).toURL();
 }
 finally
 {
diff --git 
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java 
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
index ed6ee00..8e9b33f 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
@@ -577,6 +577,47 @@ public class JavadocUtilTest
 }
 
 /**
+ * Tests that getRedirectUrl returns the same URL when there are no 
redirects.
+ */
+public void testGetRedirectUrlWithNoRedirects()
+throws Exception
+{
+Server server = null;
+try
+{
+server = new Server( 0 );
+server.addHandler( new AbstractHandler()
+{
+@Override
+public void handle( String target, HttpServletRequest request, 
HttpServletResponse response,
+int dispatch )
+throws IOException, ServletException
+{
+response.setStatus( HttpServletResponse.SC_OK );
+ByteArrayISO8859Writer writer = new 
ByteArrayISO8859Writer( 100 );
+writer.write( "Hello world" );
+writer.flush();
+response.setContentLength( writer.size() );
+OutputStream out = response.getOutputStream();
+writer.writeTo( out );
+out.close();
+writer.close();
+}
+} );
+server.start();
+
+URL url = new URI( "http://localhost:; + 
server.getConnectors()[0].getLocalPort() ).toURL();
+URL redirectUrl = JavadocUtil.getRedirectUrl( url, new Settings() 
);
+
+assertEquals( url.toURI(), redirectUrl.toURI() );
+}
+finally
+{
+stopSilently( server );
+}
+}
+
+/**
  * Method to test copyJavadocResources()
  *
  * @throws Exception if any

[maven-javadoc-plugin] branch MJAVADOC-532 created (now 3ccb3cc)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-532
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at 3ccb3cc  [MJAVADOC-532]  entries that do not redirect are ignored

This branch includes the following new commits:

 new 3ccb3cc  [MJAVADOC-532]  entries that do not redirect are ignored

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-checkstyle-plugin] 01/01: [MCHECKSTYLE-289] enableRulesSummary option does not show Rules with default configuration

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MCHECKSTYLE-289
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git

commit 3df8ff34227fb18bc31588cafde30915c6316ff8
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Apr 7 23:56:18 2018 +0200

[MCHECKSTYLE-289] enableRulesSummary option does not show Rules with
default configuration

Add parameter to explicitly show rules without any violations in the
Rules summary.
---
 src/it/MCHECKSTYLE-289/checkstyle.xml  | 27 +
 src/it/MCHECKSTYLE-289/pom.xml | 53 ++
 .../MCHECKSTYLE-289/src/main/java/org/MyClass.java | 26 +
 src/it/MCHECKSTYLE-289/verify.groovy   | 22 
 .../checkstyle/AbstractCheckstyleReport.java   |  9 +++
 .../checkstyle/CheckstyleReportGenerator.java  | 24 ++--
 .../checkstyle/exec/CheckstyleModuleFactory.java   | 64 ++
 .../plugins/checkstyle/exec/CheckstyleResults.java | 11 
 .../checkstyle/exec/DefaultCheckstyleExecutor.java |  9 ++-
 9 files changed, 237 insertions(+), 8 deletions(-)

diff --git a/src/it/MCHECKSTYLE-289/checkstyle.xml 
b/src/it/MCHECKSTYLE-289/checkstyle.xml
new file mode 100644
index 000..564a7ab
--- /dev/null
+++ b/src/it/MCHECKSTYLE-289/checkstyle.xml
@@ -0,0 +1,27 @@
+
+
+http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+
+  
+
+  
+  
+  
+
diff --git a/src/it/MCHECKSTYLE-289/pom.xml b/src/it/MCHECKSTYLE-289/pom.xml
new file mode 100644
index 000..1ad0dcb
--- /dev/null
+++ b/src/it/MCHECKSTYLE-289/pom.xml
@@ -0,0 +1,53 @@
+
+
+
+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.checkstyle
+  mcheckstytle-289
+  1.0
+  https://issues.apache.org/jira/browse/MCHECKSTYLE-289
+  Tests that setting skipEmptyViolationRules to false correctly 
shows rules with no violations
+  
+UTF-8
+  
+  
+
+  
+org.apache.maven.plugins
+maven-checkstyle-plugin
+@pom.version@
+
+  checkstyle.xml
+  false
+
+
+  
+
+  checkstyle
+
+  
+
+  
+
+  
+
diff --git a/src/it/MCHECKSTYLE-289/src/main/java/org/MyClass.java 
b/src/it/MCHECKSTYLE-289/src/main/java/org/MyClass.java
new file mode 100644
index 000..967d603
--- /dev/null
+++ b/src/it/MCHECKSTYLE-289/src/main/java/org/MyClass.java
@@ -0,0 +1,26 @@
+package org;
+
+/*
+ * 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.
+ */
+
+/**
+ * My Class.
+ */
+public class MyClass {
+}
diff --git a/src/it/MCHECKSTYLE-289/verify.groovy 
b/src/it/MCHECKSTYLE-289/verify.groovy
new file mode 100644
index 000..c0f3700
--- /dev/null
+++ b/src/it/MCHECKSTYLE-289/verify.groovy
@@ -0,0 +1,22 @@
+
+/*
+ * 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 html = new File( basedir, 'target/site/checkstyle.html' ).text;
+assert html =~ 
/(?s)misc<\/td>.*?.*?OuterTypeFilename.*?<\/td>.*?0<\/td>/
diff --git 
a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
 
b/src/main/java/org/apache/maven/plugins/checkstyle/Abst

[maven-checkstyle-plugin] branch MCHECKSTYLE-289 created (now 3df8ff3)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-289
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


  at 3df8ff3  [MCHECKSTYLE-289] enableRulesSummary option does not show 
Rules with default configuration

This branch includes the following new commits:

 new 3df8ff3  [MCHECKSTYLE-289] enableRulesSummary option does not show 
Rules with default configuration

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-350 deleted (was 0bf2fd9)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-350
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


 was 0bf2fd9  [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

This change permanently discards the following revisions:

 discard 0bf2fd9  [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch master updated: [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 9799070  [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin
9799070 is described below

commit 9799070d5e55d02f5efaf1e8bb3f37b7a19c5485
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Apr 7 18:18:45 2018 +0200

[MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

The version of animal-sniffer-maven-plugin is not specified. We should
lock to the current latest which is 1.16.
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 2cd7091..e5a6893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,6 +307,7 @@ under the License.
   
 org.codehaus.mojo
 animal-sniffer-maven-plugin
+1.16
 
   
 org.codehaus.mojo.signature

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-349 deleted (was 54ceaa6)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-349
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


 was 54ceaa6  [MCHECKSTYLE-349] Upgrade to parent pom 31

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch master updated (8fd6c8b -> 54ceaa6)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


from 8fd6c8b  [MCHECKSTYLE-347] StringIndexOutOfBoundsException when 
checkstyle.violation.ignore set to empty value
 add 54ceaa6  [MCHECKSTYLE-349] Upgrade to parent pom 31

No new revisions were added by this update.

Summary of changes:
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-350 created (now 0bf2fd9)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-350
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


  at 0bf2fd9  [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

This branch includes the following new commits:

 new 0bf2fd9  [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] 01/01: [MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MCHECKSTYLE-350
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git

commit 0bf2fd9d10b2ae3ac2d1dd168a80a85e4d1708e4
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Apr 7 18:18:45 2018 +0200

[MCHECKSTYLE-350] Lock version of animal-sniffer-maven-plugin

The version of animal-sniffer-maven-plugin is not specified. We should
lock to the current latest which is 1.16.
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index eefd0e1..49e97d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,6 +306,7 @@ under the License.
   
 org.codehaus.mojo
 animal-sniffer-maven-plugin
+1.16
 
   
 org.codehaus.mojo.signature

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] 01/01: [MCHECKSTYLE-349] Upgrade to parent pom 31

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MCHECKSTYLE-349
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git

commit 54ceaa6afdbfbdb8d8e6bae2500bc30c68cf36ef
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Apr 7 17:41:16 2018 +0200

[MCHECKSTYLE-349] Upgrade to parent pom 31

Requires upgrade to Surefire/Failsafe 2.21.0, waiting for MPOM-184.
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eefd0e1..2cd7091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 maven-plugins
 org.apache.maven.plugins
-30
+31
 ../../pom/maven/maven-plugins/pom.xml
   
 
@@ -71,6 +71,7 @@ under the License.
 6.18
 1.4
 3.4
+2.21.0
   
 
   

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-349 updated (e1ad093 -> 54ceaa6)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-349
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


 discard e1ad093  [MCHECKSTYLE-349] Upgrade to parent pom 31
 new 54ceaa6  [MCHECKSTYLE-349] Upgrade to parent pom 31

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e1ad093)
\
 N -- N -- N   refs/heads/MCHECKSTYLE-349 (54ceaa6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] 01/01: [MCHECKSTYLE-349] Upgrade to parent pom 31

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MCHECKSTYLE-349
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git

commit e1ad093d43148e39d1ae8f51d174be62eb3fe6d3
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Apr 7 17:22:40 2018 +0200

[MCHECKSTYLE-349] Upgrade to parent pom 31
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eefd0e1..26e0d70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 maven-plugins
 org.apache.maven.plugins
-30
+31
 ../../pom/maven/maven-plugins/pom.xml
   
 

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-349 created (now e1ad093)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-349
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


  at e1ad093  [MCHECKSTYLE-349] Upgrade to parent pom 31

This branch includes the following new commits:

 new e1ad093  [MCHECKSTYLE-349] Upgrade to parent pom 31

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-347 deleted (was 8fd6c8b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-347
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


 was 8fd6c8b  [MCHECKSTYLE-347] StringIndexOutOfBoundsException when 
checkstyle.violation.ignore set to empty value

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch master updated (79cf845 -> 8fd6c8b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


from 79cf845  Merge pull request #3 from petukhov/patch-1
 add 8fd6c8b  [MCHECKSTYLE-347] StringIndexOutOfBoundsException when 
checkstyle.violation.ignore set to empty value

No new revisions were added by this update.

Summary of changes:
 .../checkstyle.xml |  4 +-
 .../invoker.properties |  2 +-
 .../pom.xml| 23 +++
 .../src/main/java/org/MyClass.java |  2 +-
 .../{check-fail => MCHECKSTYLE-347}/verify.groovy  | 45 +++---
 .../checkstyle/CheckstyleViolationCheckMojo.java   | 17 
 .../apache/maven/plugins/checkstyle/RuleUtil.java  | 18 ++---
 .../maven/plugins/checkstyle/RuleUtilTest.java | 20 --
 8 files changed, 68 insertions(+), 63 deletions(-)
 copy src/it/{MCHECKSTYLE-338 => MCHECKSTYLE-347}/checkstyle.xml (88%)
 copy src/it/{MCHECKSTYLE-268 => MCHECKSTYLE-347}/invoker.properties (95%)
 copy src/it/{MCHECKSTYLE-219-no-license_failure => MCHECKSTYLE-347}/pom.xml 
(79%)
 copy src/it/{MCHECKSTYLE-172 => 
MCHECKSTYLE-347}/src/main/java/org/MyClass.java (97%)
 copy src/it/{check-fail => MCHECKSTYLE-347}/verify.groovy (97%)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-347 created (now 8fd6c8b)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-347
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


  at 8fd6c8b  [MCHECKSTYLE-347] StringIndexOutOfBoundsException when 
checkstyle.violation.ignore set to empty value

This branch includes the following new commits:

 new 8fd6c8b  [MCHECKSTYLE-347] StringIndexOutOfBoundsException when 
checkstyle.violation.ignore set to empty value

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] 01/01: [MCHECKSTYLE-347] StringIndexOutOfBoundsException when checkstyle.violation.ignore set to empty value

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MCHECKSTYLE-347
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git

commit 8fd6c8bbd26ca02cd7c64057676c9934c99c03bc
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Apr 7 15:23:17 2018 +0200

[MCHECKSTYLE-347] StringIndexOutOfBoundsException when
checkstyle.violation.ignore set to empty value

Blank strings should be skipped when parsing ignored violations.
---
 src/it/MCHECKSTYLE-347/checkstyle.xml  | 23 +++
 src/it/MCHECKSTYLE-347/invoker.properties  | 19 +
 src/it/MCHECKSTYLE-347/pom.xml | 47 ++
 .../MCHECKSTYLE-347/src/main/java/org/MyClass.java | 26 
 src/it/MCHECKSTYLE-347/verify.groovy   | 23 +++
 .../checkstyle/CheckstyleViolationCheckMojo.java   | 17 
 .../apache/maven/plugins/checkstyle/RuleUtil.java  | 18 ++---
 .../maven/plugins/checkstyle/RuleUtilTest.java | 20 +++--
 8 files changed, 174 insertions(+), 19 deletions(-)

diff --git a/src/it/MCHECKSTYLE-347/checkstyle.xml 
b/src/it/MCHECKSTYLE-347/checkstyle.xml
new file mode 100644
index 000..027c8a4
--- /dev/null
+++ b/src/it/MCHECKSTYLE-347/checkstyle.xml
@@ -0,0 +1,23 @@
+
+
+http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+
+  
+
diff --git a/src/it/MCHECKSTYLE-347/invoker.properties 
b/src/it/MCHECKSTYLE-347/invoker.properties
new file mode 100644
index 000..2b41a40
--- /dev/null
+++ b/src/it/MCHECKSTYLE-347/invoker.properties
@@ -0,0 +1,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.
+
+invoker.goals=clean checkstyle:check
+invoker.buildResult=failure
diff --git a/src/it/MCHECKSTYLE-347/pom.xml b/src/it/MCHECKSTYLE-347/pom.xml
new file mode 100644
index 000..445012a
--- /dev/null
+++ b/src/it/MCHECKSTYLE-347/pom.xml
@@ -0,0 +1,47 @@
+
+
+
+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.checkstyle
+  mcheckstytle-347
+  1.0
+  https://issues.apache.org/jira/browse/MCHECKSTYLE-347
+  Tests that blank strings in Checkstyle ignored violations are 
skipped
+  
+UTF-8
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-checkstyle-plugin
+@pom.version@
+
+  
+  checkstyle.xml
+
+  
+
+  
+
diff --git a/src/it/MCHECKSTYLE-347/src/main/java/org/MyClass.java 
b/src/it/MCHECKSTYLE-347/src/main/java/org/MyClass.java
new file mode 100644
index 000..2566187
--- /dev/null
+++ b/src/it/MCHECKSTYLE-347/src/main/java/org/MyClass.java
@@ -0,0 +1,26 @@
+package org;
+
+/*
+ * 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.
+ */
+
+/**
+ * No Javadoc package.
+ */
+public class MyClass {
+}
diff --git a/src/it/MCHECKSTYLE-347/verify.groovy 
b/src/it/MCHECKSTYLE-347/verify.groovy
new file mode 100644
index 000..2e1e395
--- /dev/null
+++ b/src/it/MCHECKSTYLE-347/verify.groovy
@@ -0,0 +1,23 @@
+
+/*
+ * 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 licen

[maven-help-plugin] branch MPH-121 deleted (was a8c481e)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MPH-121
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git.


 was a8c481e  [MPH-121] incorrect text in help:describe for cmd

This change permanently discards the following revisions:

 discard a8c481e  [MPH-121] incorrect text in help:describe for cmd

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-help-plugin] branch master updated: [MPH-121] incorrect text in help:describe for cmd

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 265be5b  [MPH-121] incorrect text in help:describe for cmd
265be5b is described below

commit 265be5bbb91d07d64f3550819fc4eb1d5f335ef0
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Mar 3 18:59:16 2018 +0100

[MPH-121] incorrect text in help:describe for cmd

Clarification of the wording used to describe a phase that is part of a
lifecycle.
---
 src/it/describe-cmd/verify.groovy | 2 +-
 src/main/java/org/apache/maven/plugins/help/DescribeMojo.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/it/describe-cmd/verify.groovy 
b/src/it/describe-cmd/verify.groovy
index e4a39b8..5a044f1 100644
--- a/src/it/describe-cmd/verify.groovy
+++ b/src/it/describe-cmd/verify.groovy
@@ -26,6 +26,6 @@ assert result.contains("'deploy' is a phase corresponding to 
this plugin:" + ls
 
 result = new File(basedir, 'result-site.txt').text;
 
-assert result.contains("'site' is a lifecycle with the following phases:")
+assert result.contains("'site' is a phase within the 'site' lifecycle, which 
has the following phases:")
 
 return true;
diff --git a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java 
b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
index e7e18b6..61ca458 100644
--- a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
@@ -803,7 +803,8 @@ public class DescribeMojo
 else
 {
 descriptionBuffer.append( "'" ).append( cmd );
-descriptionBuffer.append( "' is a lifecycle with the following 
phases: " );
+descriptionBuffer.append( "' is a phase within the '" 
).append( lifecycle.getId() );
+descriptionBuffer.append( "' lifecycle, which has the 
following phases: " );
 descriptionBuffer.append( LS );
 
 for ( String key : phases )

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-help-plugin] branch MPH-121 created (now a8c481e)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MPH-121
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git.


  at a8c481e  [MPH-121] incorrect text in help:describe for cmd

This branch includes the following new commits:

 new a8c481e  [MPH-121] incorrect text in help:describe for cmd

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-help-plugin] 01/01: [MPH-121] incorrect text in help:describe for cmd

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MPH-121
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git

commit a8c481eff8d578bca1e049052d7838483fd3f351
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Mar 3 18:59:16 2018 +0100

[MPH-121] incorrect text in help:describe for cmd

Clarification of the wording used to describe a phase that is part of a
lifecycle.
---
 src/it/describe-cmd/verify.groovy | 2 +-
 src/main/java/org/apache/maven/plugins/help/DescribeMojo.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/it/describe-cmd/verify.groovy 
b/src/it/describe-cmd/verify.groovy
index e4a39b8..5a044f1 100644
--- a/src/it/describe-cmd/verify.groovy
+++ b/src/it/describe-cmd/verify.groovy
@@ -26,6 +26,6 @@ assert result.contains("'deploy' is a phase corresponding to 
this plugin:" + ls
 
 result = new File(basedir, 'result-site.txt').text;
 
-assert result.contains("'site' is a lifecycle with the following phases:")
+assert result.contains("'site' is a phase within the 'site' lifecycle, which 
has the following phases:")
 
 return true;
diff --git a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java 
b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
index e7e18b6..61ca458 100644
--- a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
@@ -803,7 +803,8 @@ public class DescribeMojo
 else
 {
 descriptionBuffer.append( "'" ).append( cmd );
-descriptionBuffer.append( "' is a lifecycle with the following 
phases: " );
+descriptionBuffer.append( "' is a phase within the '" 
).append( lifecycle.getId() );
+descriptionBuffer.append( "' lifecycle, which has the 
following phases: " );
 descriptionBuffer.append( LS );
 
 for ( String key : phases )

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-javadoc-plugin] 01/01: [MJAVADOC-516] Replace usage of deprecated HttpClient code

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-516
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 14c837c46f391eba23e5bf99536133c1ae177053
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Fri Mar 2 20:34:47 2018 +0100

[MJAVADOC-516] Replace usage of deprecated HttpClient code

Instead of creating a mutable DefaultHttpClient, we now use builder
classes and the new API introduced in 4.3, which deprecates the old one.
The configuration of the HttpClient stays the same.

Since the new API is guaranteeing a CloseableHttpClient,
try-with-resources can used.
---
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 76 --
 1 file changed, 28 insertions(+), 48 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index e60699f..090b480 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -26,15 +26,16 @@ import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.HttpClient;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.params.ClientPNames;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Proxy;
@@ -72,7 +73,6 @@ import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Modifier;
-import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -1657,10 +1657,8 @@ public class JavadocUtil
 {
 return url;
 }
-HttpClient httpClient = null;
-try
+try ( CloseableHttpClient httpClient = createHttpClient( settings, url 
) )
 {
-httpClient = createHttpClient( settings, url );
 HttpClientContext httpContext = HttpClientContext.create();
 HttpGet httpMethod = new HttpGet( url.toString() );
 HttpResponse response = httpClient.execute( httpMethod, 
httpContext );
@@ -1674,13 +1672,6 @@ public class JavadocUtil
 List redirects = httpContext.getRedirectLocations();
 return redirects.isEmpty() ? url : redirects.get( redirects.size() 
- 1 ).toURL();
 }
-finally
-{
-if ( httpClient != null )
-{
-httpClient.getConnectionManager().shutdown();
-}
-}
 }
 
 /**
@@ -1709,8 +1700,7 @@ public class JavadocUtil
 }
 
 BufferedReader reader = null;
-HttpGet httpMethod = null;
-HttpClient httpClient = null;
+CloseableHttpClient httpClient = null;
 
 try
 {
@@ -1724,17 +1714,8 @@ public class JavadocUtil
 // http, https...
 httpClient = createHttpClient( settings, url );
 
-httpMethod = new HttpGet( url.toString() );
-HttpResponse response;
-try
-{
-response = httpClient.execute( httpMethod );
-}
-catch ( SocketTimeoutException e )
-{
-// could be a sporadic failure, one more retry before we 
give up
-response = httpClient.execute( httpMethod );
-}
+HttpGet httpMethod = new HttpGet( url.toString() );
+HttpResponse response = httpClient.execute( httpMethod );
 
 int status = response.getStatusLine().getStatusCode();
 if ( status != HttpStatus.SC_OK )
@@ -1767,13 +1748,9 @@ public class JavadocUtil
 {
 IOUtil.close( reader );
 
-if ( httpMethod != null )
-{
-httpMethod.releaseConn

[maven-javadoc-plugin] branch MJAVADOC-516 created (now 14c837c)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-516
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at 14c837c  [MJAVADOC-516] Replace usage of deprecated HttpClient code

This branch includes the following new commits:

 new 14c837c  [MJAVADOC-516] Replace usage of deprecated HttpClient code

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-javadoc-plugin] branch MJAVADOC-427 deleted (was 0ade057)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-427
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


 was 0ade057  [MJAVADOC-427] "Error fetching URL" for valid non-Java API 
links

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-javadoc-plugin] branch master updated (12dbbde -> 0ade057)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


from 12dbbde  Introduce consumer to ignore lines starting with 'Picked up '
 add 0ade057  [MJAVADOC-427] "Error fetching URL" for valid non-Java API 
links

No new revisions were added by this update.

Summary of changes:
 src/it/projects/MJAVADOC-325/verify.bsh|  2 +-
 .../invoker.properties | 39 +-
 .../{MJAVADOC-414 => MJAVADOC-427}/pom.xml | 20 --
 .../src/main/java/mjavadoc427}/App.java| 11 ++-
 .../verify.bsh => MJAVADOC-427/verify.groovy}  | 58 +++
 src/it/projects/detectLinks/verify.bsh |  8 +--
 .../maven/plugins/javadoc/AbstractJavadocMojo.java | 27 ++-
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 45 
 .../maven/plugins/javadoc/JavadocUtilTest.java | 84 ++
 9 files changed, 228 insertions(+), 66 deletions(-)
 copy src/it/projects/{MJAVADOC-262 => MJAVADOC-427}/invoker.properties (82%)
 copy src/it/projects/{MJAVADOC-414 => MJAVADOC-427}/pom.xml (74%)
 copy src/it/projects/{MJAVADOC-414/src/main/java/mjavadoc414 => 
MJAVADOC-427/src/main/java/mjavadoc427}/App.java (83%)
 copy src/it/projects/{MJAVADOC-278/verify.bsh => MJAVADOC-427/verify.groovy} 
(68%)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-archetype] Git Push Summary

[gboue]

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-492 [deleted] bb723acb4

maven-archetype git commit: [ARCHETYPE-492] Underscore in filenames problematic due to greedy regex

[gboue]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 6116cd981 -> bb723acb4


[ARCHETYPE-492] Underscore in filenames problematic due to greedy regex

The pattern looking for tokens to replace in filenames should exactly
match , where  has at least 1 character, and
neither starts nor ends with an underscore (but it can contain single
underscores in the middle).


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/bb723acb
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/bb723acb
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/bb723acb

Branch: refs/heads/master
Commit: bb723acb42efcffd335575499ac2569f98dbbaa9
Parents: 6116cd9
Author: Guillaume Boué 
Authored: Sun Feb 25 18:13:37 2018 +0100
Committer: Guillaume Boué 
Committed: Sun Feb 25 19:11:37 2018 +0100

--
 .../DefaultFilesetArchetypeGenerator.java   | 65 +---
 .../META-INF/maven/archetype-metadata.xml   |  2 +
 ...erscored-2property-with-default-1__.java | 14 +
 .../DefaultArchetypeGeneratorTest.java  |  6 ++
 .../archetype/test/ArchetypeGenerationTest.java |  2 +
 .../generate-12/archetype.properties.sample |  2 +
 6 files changed, 43 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/bb723acb/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
index b21e1a0..2a5851c 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
@@ -65,6 +65,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -87,15 +88,10 @@ public class DefaultFilesetArchetypeGenerator
 private VelocityComponent velocity;
 
 /**
- * Token delimiter.
- */
-private static final String DELIMITER = "__";
-
-/**
  * Pattern used to detect tokens in a string. Tokens are any text 
surrounded
- * by the delimiter.
+ * by the delimiter __.
  */
-private static final Pattern TOKEN_PATTERN = Pattern.compile( ".*" + 
DELIMITER + ".*" + DELIMITER + ".*" );
+private static final Pattern TOKEN_PATTERN = Pattern.compile( 
"__((?:[^_]+_)*[^_]+)__" );
 
 public void generateArchetype( ArchetypeGenerationRequest request, File 
archetypeFile )
 throws UnknownArchetype, ArchetypeNotConfigured, 
ProjectDirectoryExists, PomFileExists, OutputFileExists,
@@ -365,16 +361,13 @@ public class DefaultFilesetArchetypeGenerator
 directory + "/" + ( packaged ? getPackageAsDirectory( packageName 
) : "" ) + "/" + templateName.substring(
 moduleOffset.length() );
 
-if ( TOKEN_PATTERN.matcher( outputFileName ).matches() )
-{
-outputFileName = replaceFilenameTokens( outputFileName, context );
-}
+outputFileName = replaceFilenameTokens( outputFileName, context );
 
 return new File( outputDirectoryFile, outputFileName );
 }
 
 /**
- * Replaces all tokens (text surrounded by the {@link #DELIMITER}) within
+ * Replaces all tokens (text matching {@link #TOKEN_PATTERN}) within
  * the given string, using properties contained within the context. If a
  * property does not exist in the context, the token is left unmodified
  * and a warning is logged.
@@ -384,62 +377,38 @@ public class DefaultFilesetArchetypeGenerator
  */
 private String replaceFilenameTokens( final String filePath, final Context 
context )
 {
-String interpolatedResult = filePath;
-
-int start = 0;
+StringBuffer interpolatedResult = new StringBuffer();
+Matcher matcher = TOKEN_PATTERN.matcher( filePath );
 
-while ( true )
+while ( matcher.find() )
 {
-start = interpolatedResult.indexOf( DELIMITER, start );
-
-if ( start == -1 )
-{
-break;
-}
-
-int end = interpolatedResult.indexOf( DELIMITER, start + 
DELIMITER.length() );
-
-if ( end == -1 )
-{
-break;
-}
-
-String propertyToken = 

maven-archetype git commit: [ARCHETYPE-492] Underscore in filenames problematic due to greedy regex [Forced Update!]

[gboue]

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-492 b515040da -> bb723acb4 (forced update)


[ARCHETYPE-492] Underscore in filenames problematic due to greedy regex

The pattern looking for tokens to replace in filenames should exactly
match , where  has at least 1 character, and
neither starts nor ends with an underscore (but it can contain single
underscores in the middle).


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/bb723acb
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/bb723acb
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/bb723acb

Branch: refs/heads/ARCHETYPE-492
Commit: bb723acb42efcffd335575499ac2569f98dbbaa9
Parents: 6116cd9
Author: Guillaume Boué 
Authored: Sun Feb 25 18:13:37 2018 +0100
Committer: Guillaume Boué 
Committed: Sun Feb 25 19:11:37 2018 +0100

--
 .../DefaultFilesetArchetypeGenerator.java   | 65 +---
 .../META-INF/maven/archetype-metadata.xml   |  2 +
 ...erscored-2property-with-default-1__.java | 14 +
 .../DefaultArchetypeGeneratorTest.java  |  6 ++
 .../archetype/test/ArchetypeGenerationTest.java |  2 +
 .../generate-12/archetype.properties.sample |  2 +
 6 files changed, 43 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/bb723acb/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
index b21e1a0..2a5851c 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
@@ -65,6 +65,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -87,15 +88,10 @@ public class DefaultFilesetArchetypeGenerator
 private VelocityComponent velocity;
 
 /**
- * Token delimiter.
- */
-private static final String DELIMITER = "__";
-
-/**
  * Pattern used to detect tokens in a string. Tokens are any text 
surrounded
- * by the delimiter.
+ * by the delimiter __.
  */
-private static final Pattern TOKEN_PATTERN = Pattern.compile( ".*" + 
DELIMITER + ".*" + DELIMITER + ".*" );
+private static final Pattern TOKEN_PATTERN = Pattern.compile( 
"__((?:[^_]+_)*[^_]+)__" );
 
 public void generateArchetype( ArchetypeGenerationRequest request, File 
archetypeFile )
 throws UnknownArchetype, ArchetypeNotConfigured, 
ProjectDirectoryExists, PomFileExists, OutputFileExists,
@@ -365,16 +361,13 @@ public class DefaultFilesetArchetypeGenerator
 directory + "/" + ( packaged ? getPackageAsDirectory( packageName 
) : "" ) + "/" + templateName.substring(
 moduleOffset.length() );
 
-if ( TOKEN_PATTERN.matcher( outputFileName ).matches() )
-{
-outputFileName = replaceFilenameTokens( outputFileName, context );
-}
+outputFileName = replaceFilenameTokens( outputFileName, context );
 
 return new File( outputDirectoryFile, outputFileName );
 }
 
 /**
- * Replaces all tokens (text surrounded by the {@link #DELIMITER}) within
+ * Replaces all tokens (text matching {@link #TOKEN_PATTERN}) within
  * the given string, using properties contained within the context. If a
  * property does not exist in the context, the token is left unmodified
  * and a warning is logged.
@@ -384,62 +377,38 @@ public class DefaultFilesetArchetypeGenerator
  */
 private String replaceFilenameTokens( final String filePath, final Context 
context )
 {
-String interpolatedResult = filePath;
-
-int start = 0;
+StringBuffer interpolatedResult = new StringBuffer();
+Matcher matcher = TOKEN_PATTERN.matcher( filePath );
 
-while ( true )
+while ( matcher.find() )
 {
-start = interpolatedResult.indexOf( DELIMITER, start );
-
-if ( start == -1 )
-{
-break;
-}
-
-int end = interpolatedResult.indexOf( DELIMITER, start + 
DELIMITER.length() );
-
-if ( end == -1 )
-{
-break;
-}
-
-

maven-archetype git commit: [ARCHETYPE-492] Underscore in filenames problematic due to greedy regex

[gboue]

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-492 [created] b515040da


[ARCHETYPE-492] Underscore in filenames problematic due to greedy regex

The pattern looking for tokens to replace in filenames should exactly
match , where  has at least 1 character, and
neither starts nor ends with an underscore (but it can contain single
underscores in the middle).

Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/b515040d
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/b515040d
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/b515040d

Branch: refs/heads/ARCHETYPE-492
Commit: b515040dac1828a1fffbe19acf9d76eb337b70e6
Parents: 6116cd9
Author: Guillaume Boué 
Authored: Sun Feb 25 18:13:37 2018 +0100
Committer: Guillaume Boué 
Committed: Sun Feb 25 18:13:37 2018 +0100

--
 .../DefaultFilesetArchetypeGenerator.java   | 65 +---
 .../META-INF/maven/archetype-metadata.xml   |  3 +-
 ...erscored-2property-with-default-1__.java | 14 +
 .../DefaultArchetypeGeneratorTest.java  |  6 ++
 .../archetype/test/ArchetypeGenerationTest.java |  2 +
 .../generate-12/archetype.properties.sample |  2 +
 6 files changed, 43 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/b515040d/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
index b21e1a0..2a5851c 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
@@ -65,6 +65,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -87,15 +88,10 @@ public class DefaultFilesetArchetypeGenerator
 private VelocityComponent velocity;
 
 /**
- * Token delimiter.
- */
-private static final String DELIMITER = "__";
-
-/**
  * Pattern used to detect tokens in a string. Tokens are any text 
surrounded
- * by the delimiter.
+ * by the delimiter __.
  */
-private static final Pattern TOKEN_PATTERN = Pattern.compile( ".*" + 
DELIMITER + ".*" + DELIMITER + ".*" );
+private static final Pattern TOKEN_PATTERN = Pattern.compile( 
"__((?:[^_]+_)*[^_]+)__" );
 
 public void generateArchetype( ArchetypeGenerationRequest request, File 
archetypeFile )
 throws UnknownArchetype, ArchetypeNotConfigured, 
ProjectDirectoryExists, PomFileExists, OutputFileExists,
@@ -365,16 +361,13 @@ public class DefaultFilesetArchetypeGenerator
 directory + "/" + ( packaged ? getPackageAsDirectory( packageName 
) : "" ) + "/" + templateName.substring(
 moduleOffset.length() );
 
-if ( TOKEN_PATTERN.matcher( outputFileName ).matches() )
-{
-outputFileName = replaceFilenameTokens( outputFileName, context );
-}
+outputFileName = replaceFilenameTokens( outputFileName, context );
 
 return new File( outputDirectoryFile, outputFileName );
 }
 
 /**
- * Replaces all tokens (text surrounded by the {@link #DELIMITER}) within
+ * Replaces all tokens (text matching {@link #TOKEN_PATTERN}) within
  * the given string, using properties contained within the context. If a
  * property does not exist in the context, the token is left unmodified
  * and a warning is logged.
@@ -384,62 +377,38 @@ public class DefaultFilesetArchetypeGenerator
  */
 private String replaceFilenameTokens( final String filePath, final Context 
context )
 {
-String interpolatedResult = filePath;
-
-int start = 0;
+StringBuffer interpolatedResult = new StringBuffer();
+Matcher matcher = TOKEN_PATTERN.matcher( filePath );
 
-while ( true )
+while ( matcher.find() )
 {
-start = interpolatedResult.indexOf( DELIMITER, start );
-
-if ( start == -1 )
-{
-break;
-}
-
-int end = interpolatedResult.indexOf( DELIMITER, start + 
DELIMITER.length() );
-
-if ( end == -1 )
-{
-break;
-}
-
-String 

[maven-pmd-plugin] branch MPMD-253 deleted (was c059ee5)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MPMD-253
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git.


 was c059ee5  [MPMD-253] PMD links to java Xref fail in aggregated report

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-pmd-plugin] branch master updated (d79b0a2 -> c059ee5)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git.


from d79b0a2  Make IT runnable both on Windows and Linux.
 add c059ee5  [MPMD-253] PMD links to java Xref fail in aggregated report

No new revisions were added by this update.

Summary of changes:
 .../invoker.properties   |  0
 .../module}/pom.xml  | 18 +++---
 .../module/src/main/java/app}/App.java   |  2 +-
 .../pom.xml  | 12 +++-
 .../src/main/config/pmd/rules.xml|  4 ++--
 .../verify.groovy|  2 +-
 .../apache/maven/plugins/pmd/PmdReportGenerator.java | 20 +++-
 7 files changed, 29 insertions(+), 29 deletions(-)
 copy src/it/{mpmd-142 => MPMD-253-xref-link-multi-module}/invoker.properties 
(100%)
 copy src/it/{mpmd-138/mod-2 => MPMD-253-xref-link-multi-module/module}/pom.xml 
(71%)
 copy src/it/{MPMD-128-xref-link/src/main/java/mpmd128 => 
MPMD-253-xref-link-multi-module/module/src/main/java/app}/App.java (98%)
 copy src/it/{MPMD-128-xref-link => MPMD-253-xref-link-multi-module}/pom.xml 
(87%)
 copy src/it/{MPMD-128-xref-link => 
MPMD-253-xref-link-multi-module}/src/main/config/pmd/rules.xml (92%)
 copy src/it/{MPMD-128-xref-link => 
MPMD-253-xref-link-multi-module}/verify.groovy (93%)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-pmd-plugin] branch MPMD-253 created (now c059ee5)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MPMD-253
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git.


  at c059ee5  [MPMD-253] PMD links to java Xref fail in aggregated report

This branch includes the following new commits:

 new c059ee5  [MPMD-253] PMD links to java Xref fail in aggregated report

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-pmd-plugin] 01/01: [MPMD-253] PMD links to java Xref fail in aggregated report

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MPMD-253
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git

commit c059ee5156e6e3201bd3e4c925a54411d668
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sun Feb 25 01:01:52 2018 +0100

[MPMD-253] PMD links to java Xref fail in aggregated report

Fix Xref link to a Java source in a module: don't use the file section
name but the file name for the link.
---
 .../invoker.properties | 18 ++
 .../MPMD-253-xref-link-multi-module/module/pom.xml | 31 +++
 .../module/src/main/java/app/App.java  | 35 
 src/it/MPMD-253-xref-link-multi-module/pom.xml | 65 ++
 .../src/main/config/pmd/rules.xml  | 26 +
 .../MPMD-253-xref-link-multi-module/verify.groovy  | 27 +
 .../maven/plugins/pmd/PmdReportGenerator.java  | 20 ---
 7 files changed, 213 insertions(+), 9 deletions(-)

diff --git a/src/it/MPMD-253-xref-link-multi-module/invoker.properties 
b/src/it/MPMD-253-xref-link-multi-module/invoker.properties
new file mode 100644
index 000..67f758a
--- /dev/null
+++ b/src/it/MPMD-253-xref-link-multi-module/invoker.properties
@@ -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.goals = clean site
\ No newline at end of file
diff --git a/src/it/MPMD-253-xref-link-multi-module/module/pom.xml 
b/src/it/MPMD-253-xref-link-multi-module/module/pom.xml
new file mode 100644
index 000..ddbb671
--- /dev/null
+++ b/src/it/MPMD-253-xref-link-multi-module/module/pom.xml
@@ -0,0 +1,31 @@
+
+
+
+
+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.pmd.it
+MPMD-253-xref-link-multi-module
+1.0-SNAPSHOT
+  
+  module
+
diff --git 
a/src/it/MPMD-253-xref-link-multi-module/module/src/main/java/app/App.java 
b/src/it/MPMD-253-xref-link-multi-module/module/src/main/java/app/App.java
new file mode 100644
index 000..7fd1a89
--- /dev/null
+++ b/src/it/MPMD-253-xref-link-multi-module/module/src/main/java/app/App.java
@@ -0,0 +1,35 @@
+package app;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+return; // Unnecessary return.
+}
+
+}
\ No newline at end of file
diff --git a/src/it/MPMD-253-xref-link-multi-module/pom.xml 
b/src/it/MPMD-253-xref-link-multi-module/pom.xml
new file mode 100644
index 000..b0be09e
--- /dev/null
+++ b/src/it/MPMD-253-xref-link-multi-module/pom.xml
@@ -0,0 +1,65 @@
+
+
+
+
+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.pmd.it
+  MPMD-253-xref-link-multi-module
+  1.0-SNAPSHOT
+  pom
+  
+UTF-8
+  
+  Tests that Xref link points to correct module source file in 
aggregate report
+  
+module
+  
+  
+
+  
+org.apache.maven.plugins
+maven-site-plugin
+@s

[maven-pmd-plugin] branch master updated: Make IT runnable both on Windows and Linux.

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new d79b0a2  Make IT runnable both on Windows and Linux.
d79b0a2 is described below

commit d79b0a2fdfd01e2415b9ba2119c76cf3bac01536
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sun Feb 25 01:11:19 2018 +0100

Make IT runnable both on Windows and Linux.
---
 src/it/MPMD-244-logging/verify.groovy | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/it/MPMD-244-logging/verify.groovy 
b/src/it/MPMD-244-logging/verify.groovy
index 1e906a6..459b2b9 100644
--- a/src/it/MPMD-244-logging/verify.groovy
+++ b/src/it/MPMD-244-logging/verify.groovy
@@ -21,8 +21,11 @@ File buildLog = new File( basedir, 'build.log' )
 assert buildLog.exists()
 assert buildLog.text.contains( "PMD processing errors" )
 assert buildLog.text.contains( "Error while parsing" )
-String currentDir = basedir.getCanonicalPath()
+
+String disabledPath = new File( basedir, 
'logging-disabled/src/main/java/BrokenFile.java' ).getCanonicalPath()
+String enabledPath = new File( basedir, 
'logging-enabled/src/main/java/BrokenFile.java' ).getCanonicalPath()
+
 // logging disabled: the pmd exception is only output through the processing 
error reporting (since MPMD-246)
-assert 1 == buildLog.text.count( "net.sourceforge.pmd.PMDException: Error 
while parsing ${currentDir}/logging-disabled/src/main/java/BrokenFile.java" )
+assert 1 == buildLog.text.count( "net.sourceforge.pmd.PMDException: Error 
while parsing ${disabledPath}" )
 // logging enabled: the pmd exception is output twice: through the processing 
error reporting (since MPMD-246) and through PMD's own logging
-assert 2 == buildLog.text.count( "net.sourceforge.pmd.PMDException: Error 
while parsing ${currentDir}/logging-enabled/src/main/java/BrokenFile.java" )
+assert 2 == buildLog.text.count( "net.sourceforge.pmd.PMDException: Error 
while parsing ${enabledPath}" )

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-344 deleted (was ca3eb97)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-344
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


 was ca3eb97  [MCHECKSTYLE-344] Fix category resolution when reporting 
violation of check with id parameter

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch master updated (2113b86 -> ca3eb97)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


from 2113b86  Fix ITs on Windows by ignoring the NewlineAtEndOfFile check
 add ca3eb97  [MCHECKSTYLE-344] Fix category resolution when reporting 
violation of check with id parameter

No new revisions were added by this update.

Summary of changes:
 src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java | 2 +-
 src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch MCHECKSTYLE-344 created (now ca3eb97)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MCHECKSTYLE-344
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


  at ca3eb97  [MCHECKSTYLE-344] Fix category resolution when reporting 
violation of check with id parameter

This branch includes the following new commits:

 new ca3eb97  [MCHECKSTYLE-344] Fix category resolution when reporting 
violation of check with id parameter

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] 01/01: [MCHECKSTYLE-344] Fix category resolution when reporting violation of check with id parameter

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MCHECKSTYLE-344
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git

commit ca3eb97600576e0bee9f075b4bda0efdd0f6247d
Author: James Harrison <james.harri...@cognitran.com>
AuthorDate: Fri Jan 26 13:21:27 2018 +

[MCHECKSTYLE-344] Fix category resolution when reporting violation of check 
with id parameter

This closes #1.
---
 src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java | 2 +-
 src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java 
b/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java
index 79e943e..ff53a3e 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java
@@ -92,7 +92,7 @@ public final class RuleUtil
 }
 
 int end = eventSrcName.lastIndexOf( '.' );
-eventSrcName = eventSrcName.substring( 0,  end );
+eventSrcName = end == -1 ? eventSrcName : eventSrcName.substring( 0,  
end );
 
 if ( CHECKSTYLE_PACKAGE.equals( eventSrcName ) )
 {
diff --git 
a/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java 
b/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java
index 4b827c4..457be55 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java
@@ -1,6 +1,6 @@
 package org.apache.maven.plugins.checkstyle;
 
-import org.apache.maven.plugins.checkstyle.RuleUtil;
+import junit.framework.TestCase;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,6 @@ import org.apache.maven.plugins.checkstyle.RuleUtil;
  * under the License.
  */
 
-import junit.framework.TestCase;
-
 public class RuleUtilTest
 extends TestCase
 {
@@ -40,6 +38,7 @@ public class RuleUtilTest
 assertEquals( "misc", RuleUtil.getCategory( CHECKSTYLE_PACKAGE + 
".FinalParametersCheck" ) );
 assertEquals( "test", RuleUtil.getCategory( CHECKSTYLE_PACKAGE + 
".test.FinalParametersCheck" ) );
 assertEquals( "extension", RuleUtil.getCategory( 
"test.FinalParametersCheck" ) );
+assertEquals( "extension", RuleUtil.getCategory( "copyright" ) );
 assertNull( RuleUtil.getCategory( (String) null ) );
 }
 

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-checkstyle-plugin] branch master updated: Fix ITs on Windows by ignoring the NewlineAtEndOfFile check

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 2113b86  Fix ITs on Windows by ignoring the NewlineAtEndOfFile check
2113b86 is described below

commit 2113b8677f7d1c4e3f78ba2069bbe690d9c8cfd6
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Feb 24 21:58:47 2018 +0100

Fix ITs on Windows by ignoring the NewlineAtEndOfFile check
---
 .../src/main/resources/com/company/build-tools/checkstyle.xml   | 1 -
 src/it/MCHECKSTYLE-169/pom.xml  | 1 -
 src/it/MCHECKSTYLE-220/pom.xml  | 1 +
 src/it/check-fail/verify.groovy | 2 +-
 src/it/multi-modules/pom.xml| 2 +-
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
 
b/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
index f90738b..bdfae83 100644
--- 
a/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
+++ 
b/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
@@ -23,7 +23,6 @@ under the License.
 "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
 "http://www.puppycrawl.com/dtds/configuration_1_3.dtd;>
 
-  
   
 
   
diff --git a/src/it/MCHECKSTYLE-169/pom.xml b/src/it/MCHECKSTYLE-169/pom.xml
index aa5a512..abfa9e7 100644
--- a/src/it/MCHECKSTYLE-169/pom.xml
+++ b/src/it/MCHECKSTYLE-169/pom.xml
@@ -32,7 +32,6 @@ under the License.
   
 UTF-8
 @project.version@
-
NewlineAtEndOfFile
   
 
   
diff --git a/src/it/MCHECKSTYLE-220/pom.xml b/src/it/MCHECKSTYLE-220/pom.xml
index 7bc1d04..586ebed 100644
--- a/src/it/MCHECKSTYLE-220/pom.xml
+++ b/src/it/MCHECKSTYLE-220/pom.xml
@@ -31,6 +31,7 @@
   https://issues.apache.org/jira/browse/MCHECKSTYLE-220
   
 UTF-8
+
NewlineAtEndOfFile
   
   
 
diff --git a/src/it/check-fail/verify.groovy b/src/it/check-fail/verify.groovy
index f9ee9c9..8e191e9 100644
--- a/src/it/check-fail/verify.groovy
+++ b/src/it/check-fail/verify.groovy
@@ -19,4 +19,4 @@
  */
 def buildLog = new File( basedir, 'build.log' )
 
-assert buildLog.text.contains( "[INFO] There is 1 error reported by 
Checkstyle" )
+assert buildLog.text.contains( "You have 1 Checkstyle violation" )
diff --git a/src/it/multi-modules/pom.xml b/src/it/multi-modules/pom.xml
index a4df2f7..1539b19 100644
--- a/src/it/multi-modules/pom.xml
+++ b/src/it/multi-modules/pom.xml
@@ -29,7 +29,7 @@
 
   
 UTF-8
-JavadocPackage
+
NewlineAtEndOfFile,JavadocPackage
   
 
   

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-javadoc-plugin] 01/01: [MJAVADOC-427] "Error fetching URL" for valid non-Java API links

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MJAVADOC-427
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit 0ade0576e8a294459153161a3d5071814e588dcd
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sat Feb 24 20:23:16 2018 +0100

[MJAVADOC-427] "Error fetching URL" for valid non-Java API links

javadoc tool currently doesn't follow redirects for -link URLs, so we
follow them ourselves and pass the last redirect location to javadoc.
---
 src/it/projects/MJAVADOC-325/verify.bsh|  2 +-
 src/it/projects/MJAVADOC-427/invoker.properties| 21 ++
 src/it/projects/MJAVADOC-427/pom.xml   | 61 
 .../src/main/java/mjavadoc427/App.java}| 77 +---
 .../verify.bsh => MJAVADOC-427/verify.groovy}  | 68 +++---
 src/it/projects/detectLinks/verify.bsh |  8 +--
 .../maven/plugins/javadoc/AbstractJavadocMojo.java | 27 ++-
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 45 
 .../maven/plugins/javadoc/JavadocUtilTest.java | 84 ++
 9 files changed, 303 insertions(+), 90 deletions(-)

diff --git a/src/it/projects/MJAVADOC-325/verify.bsh 
b/src/it/projects/MJAVADOC-325/verify.bsh
index 7c4ce44..3c60e6c 100644
--- a/src/it/projects/MJAVADOC-325/verify.bsh
+++ b/src/it/projects/MJAVADOC-325/verify.bsh
@@ -30,7 +30,7 @@ if ( !optionsFile.exists() )
 }
 
 String optionsContent = FileUtils.fileRead( optionsFile );
-String javaApiLink = "'http://docs.oracle.com/javase/1,5,0/docs/api'";
+String javaApiLink = "'https://docs.oracle.com/javase/1.5.0/docs/api'";
 
 if ( !optionsContent.contains( javaApiLink ) )
 {
diff --git a/src/it/projects/MJAVADOC-427/invoker.properties 
b/src/it/projects/MJAVADOC-427/invoker.properties
new file mode 100644
index 000..aee4e3b
--- /dev/null
+++ b/src/it/projects/MJAVADOC-427/invoker.properties
@@ -0,0 +1,21 @@
+# 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.goals=clean javadoc:javadoc
+
+# slf4j javadoc is hosted on https site with a "let's encrypt" certificate, 
signed by IdenTrust only trusted since 8u101 (JDK-8154757)
+invoker.java.version = 1.8.0.101+
diff --git a/src/it/projects/MJAVADOC-427/pom.xml 
b/src/it/projects/MJAVADOC-427/pom.xml
new file mode 100644
index 000..bf7a406
--- /dev/null
+++ b/src/it/projects/MJAVADOC-427/pom.xml
@@ -0,0 +1,61 @@
+
+
+
+
+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/xsd/maven-4.0.0.xsd;>
+
+  4.0.0
+
+  org.apache.maven.plugins.maven-javadoc-plugin.it
+  mjavadoc-427
+  1.0-SNAPSHOT
+  jar
+  https://issues.apache.org/jira/browse/MJAVADOC-427
+  Tests that the plugin follows redirects
+  
+UTF-8
+  
+
+  
+
+
+  org.slf4j
+  slf4j-api
+  1.7.12
+
+  
+
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  @pom.version@
+  
+true
+  
+
+  
+
+  
+
+
diff --git a/src/it/projects/MJAVADOC-325/verify.bsh 
b/src/it/projects/MJAVADOC-427/src/main/java/mjavadoc427/App.java
similarity index 57%
copy from src/it/projects/MJAVADOC-325/verify.bsh
copy to src/it/projects/MJAVADOC-427/src/main/java/mjavadoc427/App.java
index 7c4ce44..75194f3 100644
--- a/src/it/projects/MJAVADOC-325/verify.bsh
+++ b/src/it/projects/MJAVADOC-427/src/main/java/mjavadoc427/App.java
@@ -1,42 +1,35 @@
-
-/*
- * 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

[maven-javadoc-plugin] branch MJAVADOC-427 created (now 0ade057)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MJAVADOC-427
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at 0ade057  [MJAVADOC-427] "Error fetching URL" for valid non-Java API 
links

This branch includes the following new commits:

 new 0ade057  [MJAVADOC-427] "Error fetching URL" for valid non-Java API 
links

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

svn commit: r25171 - /release/maven/KEYS

[gboue]

Author: gboue
Date: Tue Feb 20 21:32:56 2018
New Revision: 25171

Log:
Add new PGP key for gboue

Modified:
release/maven/KEYS

Modified: release/maven/KEYS
==
--- release/maven/KEYS (original)
+++ release/maven/KEYS Tue Feb 20 21:32:56 2018
@@ -3085,3 +3085,61 @@ J04xog7MQs2aaMwSbem1LMvNBZ/mfF7QMYfMV2n7
 =dlid
 -END PGP PUBLIC KEY BLOCK-
 
+pub   4096R/4A7EFFAF 2018-02-20
+uid  Guillaume Boué (CODE SIGNING KEY) <gb...@apache.org>
+sig 34A7EFFAF 2018-02-20  Guillaume Boué (CODE SIGNING KEY) 
<gb...@apache.org>
+sub   4096R/3DF8AF89 2018-02-20
+sig  4A7EFFAF 2018-02-20  Guillaume Boué (CODE SIGNING KEY) 
<gb...@apache.org>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFqMX2EBEADLalGSX3EY8R/FQK0PZefNdaEyxyCmeLCdgXYR17s3iw3Oq4L+
+3+siY9sKTAtI8DJGCdLm3hisF6PZsmtsHzDs+DTRhd5eyedHqz+d/ZOrFHK/GQx3
+/Qd7YI+AlC2sREhWL1xJr9tuEwloX728mLS9bifLdROOnBdabwGcsAWsROaA5DrZ
+ulmiP0daLf+P6zyd12O63u8kFkSZYGkp/xeAprYQyC39Chr/MZFMOQFgVPwLBEC6
+OIUstzI1IgmqPunBD+0D9FSVo2pMVD8keyhW8b57D34nI9s537cGFUr/km+i29Lb
+oGvRq6pk+9pL+aDp58jdutS72cLhGPN6vd8B/MlklbbRIOq3utF3AJ36xz8ezZwP
++i2o57NZPVEE3qvjTP2SA021K9jWF6kdjN7tFwWNWhi9iesVtPcRXxNLgXqewxQl
+GXRtiLgk2eKtVOJdSLptgZ7SJ5DxoH0IOaR95P7SLTxgh1F0zI6KUe5YkI9jll8l
+TmLM9fUwyfFN6dsnV/0e6LjeP8YN37hLFqloQP+/tcmmMfDfSqnTtVJddAOxbhdq
+rA/2mns2NbrXCZMNfygtpsxyboR+jd5HiYc/Y9X1f9o9Vkdq2vz03k3DqUfekZJ2
+68NckHQR/50KIBHOSVD16LjwcDMgVs112UWkBh/RhvXjstOqVMF5a+vjfQARAQAB
+tDVHdWlsbGF1bWUgQm91w6kgKENPREUgU0lHTklORyBLRVkpIDxnYm91ZUBhcGFj
+aGUub3JnPokCNwQTAQIAIQIbAwIeAQIXgAUCWoxiJAULCQgHAwUVCgkICwUWAgMB
+AAAKCRA2MvdASn7/r+tVEACRF/J2mAkBOvsSO43UF262OoIyUKMbA/oo/43DvlUA
+MeHGYaGKjxXTtVE44U3F2TZsSIKNi5Y6ZTpb154b6au+fUfVgVULTz3zqHaJuVjD
+mZlDuObXChIuGVJr6RayeI9jO4HJHwfmLooPNLjvXocAjtnE1sfmKpmkV0i0+Aih
+7qVTDRR9ibu91sM5w3Qg5FaookN0hkYwYY9CPIAI7q6gt23FSLjJ5B/7JR/yMrPr
+ogugHvOiNFCPJjZgSOrjbRu7w8F42ZxM39J7imIemmxSMv8Kyow07Yn6RDVqjzGe
+gb3lv+bcJJPTSJl5YdfiF1plVT8hm184U3OzmIoaoNgUuCJ6jijNJ0OqclkWNJAQ
+LNvW63poJmDjGh14EbWmLqSXLL+UywrBLG+7CxEhjxpUagcEUpOfmhc+N5Kw1H3O
+3yP9TXvyF6xlfMPAmP7j/k3gYqn9TZ8H1jStYbuIjRvjHGWPtSoRmfI7ItgZyxlA
+IzOMJLi0jDtq2EZkrHL6tN0tpRx9eAoh64TkkZ7yDz8+oGZiYfzsBk4E1tPEaRH1
+AmKhB3f3Kza8wzk8mWcrvwTuDomMWqH7eyIUMXKcFrSjawQR1lAD/0Dy3GG5ormX
+4un5XYhTFS2YlNDJLLik7J80B8Vg//cRAXQlY8Gk/6ZVHQMP1GxgSw1Flj5+Lbkt
+BLkCDQRajF9hARAAsvc1qALAS4q9Wjbo/VxUhiTInE/206i7OwofQUU05vzQzF8o
+VAEFJV142bodCDOJyVWwM7Kqxtj+AwkZrJvnae1zwzxekIoHl/n9ztqKW0G6JB0s
+ziQ5DOiWsU+kG8IJROvYzT4pwVuFRTsoIjmomViM7BgPV8HIw6opyf8TvYgph5Y9
+4rCeD902OEa3xllRYhCColQcADNAYu+QYlWZGK0DboaIJ/ulyBf+dcZFZMyu0JR0
+e35c2t5KXvE/fqvpLdDseS35Cnji/oU2QA4YBZEY3rEZr+qfJ0eLAQE3NoLbqcaG
+vQ5FYLHhQuBpWjN3CsnlF3/sOWW/EjvkOG28CwKxsQI+pfxXXN87vmL2JEpyU74g
+cAlQXqFt/iys3Mf79WwTkEj+zp0b2Gm5JUC9sjVTEaEvOblhidh7iQUzx4aBCVjL
+7i6VeSAKH8bT2NbR1qrb2ZbFn5gSOk4xUMvswiTli2Qvmapm8lLso9VarXjvRxKA
+o2AULa8VHMlY2H8I3u/IrN26GZp8Y7YIlcTToynQswZ/g2G/da6spgwVfqRGfSam
+glFIscBfYINlVbLQpR7w9oPLl3vy7NNNvb8lmkurMS9I0IDTi5d+Huee4BfeyiWd
+7eNlzQfaMLhNdr4kdyC8rhb3q4fzHmkQ29g3H5IuS4YbArkYi6pnZzMp1iUAEQEA
+AYkCHwQYAQIACQUCWoxfYQIbDAAKCRA2MvdASn7/r/9ED/46TANisMEBMkQ7lIom
+E8BQjDhiDx5J5UR2X5GJNYACxeiea4bNheS6YDjhQw9mOIk56zPF0HXToslwrCMJ
+4LdnrtrWyl6kAvKjEqizk9NVpGQ2c4m/LtyW5+eNIhi0jjNs/bs0FcSVSDSQ0Pbv
+78ozVRN6SSCnMCHRrKFWYqX6pT01N1OWFPjUT9bMosiQAgHRvmF07IVebylswQQs
+NgzF0B5LhAAxW6st4bovix+0oAxlBRmTyjRyxaryhm41V3r3e7IgwjRRl/iKsZ+1
+HTeZWOSllqSd2+R/ZNE1eEenmRXROxBdHBKImTTfAVUk9ZBnW5a8DIeNVeYn8z17
+DsnRjoEOkjHzNpeF7RjrfEKLGyl6/DFKt7TJCMDxiOfwJ/qZe6JZfTE3xBQ3XNU1
+MMSrW/Gco7NMG4ms7onreXhsRBFnfEcun5pvBXmJ73xqh2u3xnwIuO9L7f8wa2X1
+/mqsmxl4w7Jql1skn7eP5lQZxNI89RgV2TXmtVgM3Zpu9/7p7c1r4O1mPv5rVzeh
+I+KF070paPXjtob+eaSCD1pkhWT4r7aJf++2G5tuIsc4RTefkTzpPJb3MxSnMR8l
+fGm91NUiwzyG58nonwVynDyiWpQ9rXlD5IoR6BUKSx/yPNqxQixprZzOOrlIw6AX
+wjh7+5BNzC+/QyE9ulvvL1e8aw==
+=BJr7
+-END PGP PUBLIC KEY BLOCK-

svn commit: r1824910 - /maven/project/KEYS

[gboue]

Author: gboue
Date: Tue Feb 20 21:32:21 2018
New Revision: 1824910

URL: http://svn.apache.org/viewvc?rev=1824910=rev
Log:
Add new PGP key for gboue

Modified:
maven/project/KEYS

Modified: maven/project/KEYS
URL: 
http://svn.apache.org/viewvc/maven/project/KEYS?rev=1824910=1824909=1824910=diff
==
--- maven/project/KEYS (original)
+++ maven/project/KEYS Tue Feb 20 21:32:21 2018
@@ -3085,3 +3085,61 @@ J04xog7MQs2aaMwSbem1LMvNBZ/mfF7QMYfMV2n7
 =dlid
 -END PGP PUBLIC KEY BLOCK-
 
+pub   4096R/4A7EFFAF 2018-02-20
+uid  Guillaume Boué (CODE SIGNING KEY) <gb...@apache.org>
+sig 34A7EFFAF 2018-02-20  Guillaume Boué (CODE SIGNING KEY) 
<gb...@apache.org>
+sub   4096R/3DF8AF89 2018-02-20
+sig  4A7EFFAF 2018-02-20  Guillaume Boué (CODE SIGNING KEY) 
<gb...@apache.org>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFqMX2EBEADLalGSX3EY8R/FQK0PZefNdaEyxyCmeLCdgXYR17s3iw3Oq4L+
+3+siY9sKTAtI8DJGCdLm3hisF6PZsmtsHzDs+DTRhd5eyedHqz+d/ZOrFHK/GQx3
+/Qd7YI+AlC2sREhWL1xJr9tuEwloX728mLS9bifLdROOnBdabwGcsAWsROaA5DrZ
+ulmiP0daLf+P6zyd12O63u8kFkSZYGkp/xeAprYQyC39Chr/MZFMOQFgVPwLBEC6
+OIUstzI1IgmqPunBD+0D9FSVo2pMVD8keyhW8b57D34nI9s537cGFUr/km+i29Lb
+oGvRq6pk+9pL+aDp58jdutS72cLhGPN6vd8B/MlklbbRIOq3utF3AJ36xz8ezZwP
++i2o57NZPVEE3qvjTP2SA021K9jWF6kdjN7tFwWNWhi9iesVtPcRXxNLgXqewxQl
+GXRtiLgk2eKtVOJdSLptgZ7SJ5DxoH0IOaR95P7SLTxgh1F0zI6KUe5YkI9jll8l
+TmLM9fUwyfFN6dsnV/0e6LjeP8YN37hLFqloQP+/tcmmMfDfSqnTtVJddAOxbhdq
+rA/2mns2NbrXCZMNfygtpsxyboR+jd5HiYc/Y9X1f9o9Vkdq2vz03k3DqUfekZJ2
+68NckHQR/50KIBHOSVD16LjwcDMgVs112UWkBh/RhvXjstOqVMF5a+vjfQARAQAB
+tDVHdWlsbGF1bWUgQm91w6kgKENPREUgU0lHTklORyBLRVkpIDxnYm91ZUBhcGFj
+aGUub3JnPokCNwQTAQIAIQIbAwIeAQIXgAUCWoxiJAULCQgHAwUVCgkICwUWAgMB
+AAAKCRA2MvdASn7/r+tVEACRF/J2mAkBOvsSO43UF262OoIyUKMbA/oo/43DvlUA
+MeHGYaGKjxXTtVE44U3F2TZsSIKNi5Y6ZTpb154b6au+fUfVgVULTz3zqHaJuVjD
+mZlDuObXChIuGVJr6RayeI9jO4HJHwfmLooPNLjvXocAjtnE1sfmKpmkV0i0+Aih
+7qVTDRR9ibu91sM5w3Qg5FaookN0hkYwYY9CPIAI7q6gt23FSLjJ5B/7JR/yMrPr
+ogugHvOiNFCPJjZgSOrjbRu7w8F42ZxM39J7imIemmxSMv8Kyow07Yn6RDVqjzGe
+gb3lv+bcJJPTSJl5YdfiF1plVT8hm184U3OzmIoaoNgUuCJ6jijNJ0OqclkWNJAQ
+LNvW63poJmDjGh14EbWmLqSXLL+UywrBLG+7CxEhjxpUagcEUpOfmhc+N5Kw1H3O
+3yP9TXvyF6xlfMPAmP7j/k3gYqn9TZ8H1jStYbuIjRvjHGWPtSoRmfI7ItgZyxlA
+IzOMJLi0jDtq2EZkrHL6tN0tpRx9eAoh64TkkZ7yDz8+oGZiYfzsBk4E1tPEaRH1
+AmKhB3f3Kza8wzk8mWcrvwTuDomMWqH7eyIUMXKcFrSjawQR1lAD/0Dy3GG5ormX
+4un5XYhTFS2YlNDJLLik7J80B8Vg//cRAXQlY8Gk/6ZVHQMP1GxgSw1Flj5+Lbkt
+BLkCDQRajF9hARAAsvc1qALAS4q9Wjbo/VxUhiTInE/206i7OwofQUU05vzQzF8o
+VAEFJV142bodCDOJyVWwM7Kqxtj+AwkZrJvnae1zwzxekIoHl/n9ztqKW0G6JB0s
+ziQ5DOiWsU+kG8IJROvYzT4pwVuFRTsoIjmomViM7BgPV8HIw6opyf8TvYgph5Y9
+4rCeD902OEa3xllRYhCColQcADNAYu+QYlWZGK0DboaIJ/ulyBf+dcZFZMyu0JR0
+e35c2t5KXvE/fqvpLdDseS35Cnji/oU2QA4YBZEY3rEZr+qfJ0eLAQE3NoLbqcaG
+vQ5FYLHhQuBpWjN3CsnlF3/sOWW/EjvkOG28CwKxsQI+pfxXXN87vmL2JEpyU74g
+cAlQXqFt/iys3Mf79WwTkEj+zp0b2Gm5JUC9sjVTEaEvOblhidh7iQUzx4aBCVjL
+7i6VeSAKH8bT2NbR1qrb2ZbFn5gSOk4xUMvswiTli2Qvmapm8lLso9VarXjvRxKA
+o2AULa8VHMlY2H8I3u/IrN26GZp8Y7YIlcTToynQswZ/g2G/da6spgwVfqRGfSam
+glFIscBfYINlVbLQpR7w9oPLl3vy7NNNvb8lmkurMS9I0IDTi5d+Huee4BfeyiWd
+7eNlzQfaMLhNdr4kdyC8rhb3q4fzHmkQ29g3H5IuS4YbArkYi6pnZzMp1iUAEQEA
+AYkCHwQYAQIACQUCWoxfYQIbDAAKCRA2MvdASn7/r/9ED/46TANisMEBMkQ7lIom
+E8BQjDhiDx5J5UR2X5GJNYACxeiea4bNheS6YDjhQw9mOIk56zPF0HXToslwrCMJ
+4LdnrtrWyl6kAvKjEqizk9NVpGQ2c4m/LtyW5+eNIhi0jjNs/bs0FcSVSDSQ0Pbv
+78ozVRN6SSCnMCHRrKFWYqX6pT01N1OWFPjUT9bMosiQAgHRvmF07IVebylswQQs
+NgzF0B5LhAAxW6st4bovix+0oAxlBRmTyjRyxaryhm41V3r3e7IgwjRRl/iKsZ+1
+HTeZWOSllqSd2+R/ZNE1eEenmRXROxBdHBKImTTfAVUk9ZBnW5a8DIeNVeYn8z17
+DsnRjoEOkjHzNpeF7RjrfEKLGyl6/DFKt7TJCMDxiOfwJ/qZe6JZfTE3xBQ3XNU1
+MMSrW/Gco7NMG4ms7onreXhsRBFnfEcun5pvBXmJ73xqh2u3xnwIuO9L7f8wa2X1
+/mqsmxl4w7Jql1skn7eP5lQZxNI89RgV2TXmtVgM3Zpu9/7p7c1r4O1mPv5rVzeh
+I+KF070paPXjtob+eaSCD1pkhWT4r7aJf++2G5tuIsc4RTefkTzpPJb3MxSnMR8l
+fGm91NUiwzyG58nonwVynDyiWpQ9rXlD5IoR6BUKSx/yPNqxQixprZzOOrlIw6AX
+wjh7+5BNzC+/QyE9ulvvL1e8aw==
+=BJr7
+-END PGP PUBLIC KEY BLOCK-

[maven-assembly-plugin] branch MASSEMBLY-675 deleted (was 78faddf)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MASSEMBLY-675
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


 was 78faddf  [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded 
dependencies

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-assembly-plugin] branch master updated (2cc3441 -> 78faddf)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


from 2cc3441  [MASSEMBLY-876] - Upgrade parent to 31
 add b0cf85d  [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded 
dependencies
 add 78faddf  [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded 
dependencies

No new revisions were added by this update.

Summary of changes:
 .../massembly-675}/pom.xml |  30 +-
 .../src/main/assembly/bin.xml  |   9 +-
 .../massembly-675}/verify.bsh  |  21 +-
 .../artifact/DefaultDependencyResolver.java| 279 +-
 .../artifact/ResolutionManagementInfo.java |  60 ---
 .../plugins/assembly/mojos/SingleAssemblyMojo.java |   2 +-
 .../artifact/DefaultDependencyResolverTest.java| 584 +++--
 .../artifact/ResolutionManagementInfoTest.java |   5 +-
 8 files changed, 134 insertions(+), 856 deletions(-)
 copy src/it/projects/{components/component-dependencySet => 
dependency-sets/massembly-675}/pom.xml (77%)
 copy src/it/projects/dependency-sets/{depSet-runtimeScope/child3 => 
massembly-675}/src/main/assembly/bin.xml (85%)
 copy src/it/projects/{bugs/massembly-733 => 
dependency-sets/massembly-675}/verify.bsh (52%)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-assembly-plugin] 01/02: [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded dependencies

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MASSEMBLY-675
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git

commit b0cf85db9c466d42a4d39f46634ad49cbb784d8c
Author: Hilario Fernandes <hilario.fernan...@hitachivantara.com>
AuthorDate: Fri Feb 2 18:58:31 2018 +

[MASSEMBLY-675] Maven Assembly packaging wildcard-excluded dependencies

Require maven to solve dependencies instead of building requests, fixing 
wildcard exclusion problem
---
 .../artifact/DefaultDependencyResolver.java| 141 +++--
 .../plugins/assembly/mojos/SingleAssemblyMojo.java |   2 +-
 2 files changed, 18 insertions(+), 125 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
 
b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
index 741b19d..936e250 100644
--- 
a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
+++ 
b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
@@ -20,20 +20,14 @@ package org.apache.maven.plugins.assembly.artifact;
  */
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
 import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
 import org.apache.maven.plugins.assembly.archive.phase.ModuleSetAssemblyPhase;
@@ -49,7 +43,6 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.shared.artifact.filter.resolve.ScopeFilter;
-import 
org.apache.maven.shared.artifact.filter.resolve.transform.ArtifactIncludeFilterTransformer;
 import org.apache.maven.shared.artifact.resolve.ArtifactResult;
 import 
org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
 import org.codehaus.plexus.component.annotations.Component;
@@ -93,43 +86,28 @@ public class DefaultDependencyResolver
currentProject );
 updateModuleSetResolutionRequirements( assemblyId, moduleSet, 
dependencySet, info, configSource );
 
-resolve( assembly, configSource, result, dependencySet, info );
+result.put( dependencySet, resolve( info, currentProject ) );
 
 }
 return result;
 }
 
-private void resolve( Assembly assembly, AssemblerConfigurationSource 
configSource,
-  Map<DependencySet, Set> result, 
DependencySet dependencySet,
-  ResolutionManagementInfo info )
-throws DependencyResolutionException
+private Set resolve( ResolutionManagementInfo info, MavenProject 
project )
 {
-Set artifacts;
-if ( info.isResolutionRequired() )
+Set artifacts = new HashSet<>();
+if ( info.isResolvedTransitively() )
 {
-final List repos =
-aggregateRemoteArtifactRepositories( 
configSource.getRemoteRepositories(), info.getEnabledProjects() );
-
-artifacts = info.getArtifacts();
-if ( info.isResolvedTransitively() )
-{
-getLogger().debug( "Resolving project dependencies 
transitively." );
-
-ArtifactFilter filter = new 
ArtifactIncludeFilterTransformer().transform( info.getScopeFilter() );
-artifacts = resolveTransitively( artifacts, repos, filter, 
configSource );
-}
-else
-{
-getLogger().debug( "Resolving project dependencies ONLY. "
-   + "Transitive dependencies WILL NOT be 
included in the results." );
-artifacts = resolveNonTransitively( assembly, artifacts, 
configSource, repos );
-}
+getLogger().debug( "Resolving project dependencies transitively." 
);
+artifacts = project.getArtifacts();
 }
 else
 {
-artifacts = new HashSet();
+getLogger().debug( "Resolving project dependencies ONLY. "
++ "Transitive dependencies WILL NOT be included in the 
results." );
+  

[maven-assembly-plugin] branch MASSEMBLY-675 created (now 78faddf)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MASSEMBLY-675
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


  at 78faddf  [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded 
dependencies

This branch includes the following new commits:

 new b0cf85d  [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded 
dependencies
 new 78faddf  [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded 
dependencies

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-assembly-plugin] 02/02: [MASSEMBLY-675] Maven Assembly packaging wildcard-excluded dependencies

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MASSEMBLY-675
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git

commit 78faddf88b1537bc5c61ba74cdb2b227416152b6
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Tue Feb 20 00:24:48 2018 +0100

[MASSEMBLY-675] Maven Assembly packaging wildcard-excluded dependencies

Since Maven 3 requirement, there is no need to resolve any dependencies
manually, and we can rely on requiresDependencyResolution. Initial patch
failed when module sets were involved: instead of getting the list of
transitive/direct dependencies on the current project, they need to be
fetched for each project so that it encompasses the possible modules in
module sets.

All the dead code as a result of this change is removed.

This closes #2.
---
 .../projects/dependency-sets/massembly-675/pom.xml |  69 +++
 .../massembly-675/src/main/assembly/bin.xml|  28 +
 .../dependency-sets/massembly-675/verify.bsh   |  35 ++
 .../artifact/DefaultDependencyResolver.java| 172 +-
 .../artifact/ResolutionManagementInfo.java |  60 ---
 .../artifact/DefaultDependencyResolverTest.java| 584 +++--
 .../artifact/ResolutionManagementInfoTest.java |   5 +-
 7 files changed, 240 insertions(+), 713 deletions(-)

diff --git a/src/it/projects/dependency-sets/massembly-675/pom.xml 
b/src/it/projects/dependency-sets/massembly-675/pom.xml
new file mode 100644
index 000..369030c
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-675/pom.xml
@@ -0,0 +1,69 @@
+
+
+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/xsd/maven-4.0.0.xsd;>
+  4.0.0
+  
+org.apache.maven.plugin.assembly.test
+it-project-parent
+1
+  
+
+  test
+  massembly-675
+  1
+  
+UTF-8
+  
+  
+
+  com.google.javascript
+  closure-compiler
+  v20131014
+  
+
+  *
+  *
+
+  
+
+  
+  
+
+  
+maven-assembly-plugin
+${testVersion}
+
+  
+assembly
+package
+
+  single
+
+
+  
+src/main/assembly/bin.xml
+  
+
+  
+
+  
+
+  
+
diff --git 
a/src/it/projects/dependency-sets/massembly-675/src/main/assembly/bin.xml 
b/src/it/projects/dependency-sets/massembly-675/src/main/assembly/bin.xml
new file mode 100644
index 000..6cf159c
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-675/src/main/assembly/bin.xml
@@ -0,0 +1,28 @@
+
+
+  bin
+  
+dir
+  
+  false
+  
+
+  
+
\ No newline at end of file
diff --git a/src/it/projects/dependency-sets/massembly-675/verify.bsh 
b/src/it/projects/dependency-sets/massembly-675/verify.bsh
new file mode 100644
index 000..f8a95ab
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-675/verify.bsh
@@ -0,0 +1,35 @@
+/*
+ * 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-675-1-bin/massembly-675-1.jar" ).exists();
+result = result && new File( basedir, 
"target/massembly-675-1-bin/closure-compiler-v20131014.jar" ).exists();
+
+// assert that all the transitive dependencies of closure-compiler were 
excluded
+result = result && !new File( basedir, 
"target/massembly-675-1-bin/args4j-2.0.16.jar" ).exists();
+result = result && !new File( basedir, 
"target/massembly-675-1-bin/json-20090211.jar" ).exists();
+result = result && !new File( basedir, 
"target/massembly-675-1-bin/protobuf-java-2.4.1.jar" ).exists();
+result = result && !new File( basedir, 
"target/massembly-675-1-bin/jsr305-1.3.9.jar" ).exists();
+result = result && !new File( basedir, 
"target/massembly-675-1-bin/guava-15.0.jar" ).exists();
+
+
+ret

[maven-assembly-plugin] branch master updated: [MASSEMBLY-876] - Upgrade parent to 31

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 2cc3441  [MASSEMBLY-876] - Upgrade parent to 31
2cc3441 is described below

commit 2cc3441e7c1ba19503c83180b9d4b6716776d142
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Mon Feb 19 14:03:34 2018 +0100

[MASSEMBLY-876] - Upgrade parent to 31

Fix 3 ITs by removing the used property invokerPluginVersion which is
undeclared in POM since previous cleanup.
---
 pom.xml  | 1 -
 .../container-descriptors/custom-containerDescriptorHandler/pom.xml  | 1 -
 .../container-descriptors/custom-handler-withFileEntries/pom.xml | 1 -
 .../container-descriptors/custom-handler-withMixedEntries/pom.xml| 1 -
 4 files changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b453154..ea457c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -388,7 +388,6 @@ under the License.
   
 ${useJvmChmod}
 ${testVersion}
-
${invokerPluginVersion}
   
   true
 
diff --git 
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
 
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
index eae3bf9..692f872 100644
--- 
a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
+++ 
b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml
@@ -37,7 +37,6 @@ under the License.
 
   
 maven-invoker-plugin
-${invokerPluginVersion}
 
 
   true
diff --git 
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml 
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
index 928b454..91fea38 100644
--- 
a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
+++ 
b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml
@@ -37,7 +37,6 @@ under the License.
 
   
 maven-invoker-plugin
-${invokerPluginVersion}
 
 
   true
diff --git 
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml 
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
index e05b9a3..a8dd79f 100644
--- 
a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
+++ 
b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml
@@ -37,7 +37,6 @@ under the License.
 
   
 maven-invoker-plugin
-${invokerPluginVersion}
 
 
   true

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-shade-plugin] branch MSHADE-273 deleted (was 36bb876)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MSHADE-273
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.


 was 36bb876  [MSHADE-273] Shading of paths starting with / ignores excludes

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-shade-plugin] branch master updated (58c364a -> 36bb876)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.


from 58c364a  fixed markup (from title to simple paragraph content)
 add 36bb876  [MSHADE-273] Shading of paths starting with / ignores excludes

No new revisions were added by this update.

Summary of changes:
 .../pom.xml| 11 +++
 .../src/main/java/Main.java|  9 ++---
 .../org/apache/maven/from/a}/test.properties   |  0
 .../org/apache/maven/from/b}/test.properties   |  2 +-
 .../plugins/shade/relocation/SimpleRelocator.java  | 10 +-
 .../shade/relocation/SimpleRelocatorTest.java  | 23 --
 6 files changed, 40 insertions(+), 15 deletions(-)
 copy src/it/{reloc-abs-resource-path => 
reloc-abs-resource-path-exclude}/pom.xml (90%)
 copy src/it/{reloc-abs-resource-path => 
reloc-abs-resource-path-exclude}/src/main/java/Main.java (76%)
 copy src/it/{reloc-abs-resource-path/src/main/resources/org/apache/maven/from 
=> 
reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/a}/test.properties
 (100%)
 copy src/it/{reloc-abs-resource-path/src/main/resources/org/apache/maven/from 
=> 
reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/b}/test.properties
 (97%)

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-shade-plugin] 01/01: [MSHADE-273] Shading of paths starting with / ignores excludes

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch MSHADE-273
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit 36bb8762400ce3fe76048c677d7e9422d60a6977
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Wed Feb 14 22:10:22 2018 +0100

[MSHADE-273] Shading of paths starting with / ignores excludes

Exclude and include patterns need to be taken into account when handling
a potential extra leading slash. This works by simply removing it when
there's one in the considered path, before matching against
include/excludes/path pattern.
---
 src/it/reloc-abs-resource-path-exclude/pom.xml | 94 ++
 .../src/main/java/Main.java| 42 ++
 .../org/apache/maven/from/a/test.properties| 18 +
 .../org/apache/maven/from/b/test.properties| 18 +
 .../plugins/shade/relocation/SimpleRelocator.java  | 10 +--
 .../shade/relocation/SimpleRelocatorTest.java  | 23 +-
 6 files changed, 198 insertions(+), 7 deletions(-)

diff --git a/src/it/reloc-abs-resource-path-exclude/pom.xml 
b/src/it/reloc-abs-resource-path-exclude/pom.xml
new file mode 100644
index 000..ce5941a
--- /dev/null
+++ b/src/it/reloc-abs-resource-path-exclude/pom.xml
@@ -0,0 +1,94 @@
+
+
+
+
+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
+  reloc-abs-resource-path-exclude
+  1.0
+
+  MSHADE-119
+  
+Test that classes in strings like "/org/apache/velocity/my.properties" get 
properly relocated
+in calls to Class.getResource(), taking into account excluded patterns.
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+  
+shade
+package
+
+  shade
+
+
+  false
+  
+
+  org.apache.maven.from
+  org.apache.maven.to
+  
+org.apache.maven.from.a.*
+  
+
+  
+
+  
+
+  
+  
+org.codehaus.mojo
+exec-maven-plugin
+1.1.1
+
+  
+run
+verify
+
+  exec
+
+
+  ${JAVA_HOME}/bin/java
+  
+-classpath
+
${project.build.directory}/reloc-abs-resource-path-exclude-1.0.jar
+Main
+  
+
+  
+
+  
+
+  
+
diff --git a/src/it/reloc-abs-resource-path-exclude/src/main/java/Main.java 
b/src/it/reloc-abs-resource-path-exclude/src/main/java/Main.java
new file mode 100644
index 000..679f70e
--- /dev/null
+++ b/src/it/reloc-abs-resource-path-exclude/src/main/java/Main.java
@@ -0,0 +1,42 @@
+import java.net.URL;
+
+/*
+ * 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.
+ */
+
+public class Main
+{
+
+public static void main( String[] args )
+throws Exception
+{
+new Main().testAbsResource();
+}
+
+private void testAbsResource() throws Exception
+{
+URL r = 
getClass().getResource("/org/apache/maven/from/a/test.properties");
+// expect NPE if from/a was shaded even though it was excluded
+System.out.println( r.toString() );
+
+r = getClass().getResource("/org/apache/maven/to/b/test.properties");
+// expect NPE if from/b was not shaded
+System.out.println( r.toString() );
+}
+
+}
diff --git 
a/src/it/reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/a/test.properties
 
b/src/it/reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/a/test.properties
new file mode 100644
index 000..75c155e
--- /dev/null
+++ 
b

[maven-shade-plugin] branch MSHADE-273 created (now 36bb876)

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a change to branch MSHADE-273
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.


  at 36bb876  [MSHADE-273] Shading of paths starting with / ignores excludes

This branch includes the following new commits:

 new 36bb876  [MSHADE-273] Shading of paths starting with / ignores excludes

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

[maven-shared-resources] branch master updated: Fix build by removing duplicate ciManagement tag

[gboue]

This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-resources.git


The following commit(s) were added to refs/heads/master by this push:
 new 5b9fe4e  Fix build by removing duplicate ciManagement tag
5b9fe4e is described below

commit 5b9fe4edbdcc133469f98e2d6501c1c67f3dc62d
Author: Guillaume Boué <gb...@apache.org>
AuthorDate: Sun Feb 11 14:55:57 2018 +0100

Fix build by removing duplicate ciManagement tag
---
 pom.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 15177b7..67799cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,6 @@
 
   
 
-  
-Jenkins
-https://builds.apache.org/hudson/job/maven-shared/
-  
-
   
 
   

-- 
To stop receiving notification emails like this one, please contact
gb...@apache.org.

svn commit: r1804458 - /maven/pom/trunk/maven/pom.xml

[gboue]

Author: gboue
Date: Tue Aug  8 18:36:26 2017
New Revision: 1804458

URL: http://svn.apache.org/viewvc?rev=1804458=rev
Log:
Move gboue to the list of PMC members

Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1804458=1804457=1804458=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Tue Aug  8 18:36:26 2017
@@ -146,6 +146,15 @@ under the License.
   +1
 
 
+  gboue
+  Guillaume Boué
+  gb...@apache.org
+  
+PMC Member
+  
+  Europe/Paris
+
+
   hboutemy
   Hervé Boutemy
   hbout...@apache.org
@@ -371,15 +380,6 @@ under the License.
   +1
 
 
-  gboue
-  Guillaume Boué
-  gb...@apache.org
-  
-Committer
-  
-  Europe/Paris
-
-
   godin
   Evgeny Mandrikov
   SonarSource

svn commit: r1802430 - in /maven/plugins/trunk/maven-antrun-plugin/src/site/apt: examples/customTasks.apt.vm index.apt.vm

[gboue]

Author: gboue
Date: Wed Jul 19 21:00:17 2017
New Revision: 1802430

URL: http://svn.apache.org/viewvc?rev=1802430=rev
Log:
[MANTRUN-205] maven-antrun-plugin pages at maven.apache.org still have bad url 
codehaus references

Add example of using Ant Contrib, previously contained in removed dead link.

Modified:

maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt.vm

Modified: 
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm?rev=1802430=1802429=1802430=diff
==
--- 
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/examples/customTasks.apt.vm
 Wed Jul 19 21:00:17 2017
@@ -86,3 +86,48 @@ Using tasks not included in Ant's defaul
 
 --
 
+ Another example of this is the use of 
{{{http://ant-contrib.sourceforge.net/}Ant-Contrib}} tasks:
+
+--
+
+  [...]
+  
+[...]
+
+  [...]
+  
+org.apache.maven.plugins
+maven-antrun-plugin
+${project.version}
+
+  
+[...]
+
+  
+
+[...]
+  
+
+
+  run
+
+  
+
+
+  
+ant-contrib
+ant-contrib
+1.0b3
+
+  
+ant
+ant
+  
+
+  
+
+  
+
+  
+
+--
\ No newline at end of file

Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt.vm?rev=1802430=1802429=1802430=diff
==
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/index.apt.vm Wed Jul 
19 21:00:17 2017
@@ -62,9 +62,7 @@ ${project.name}
 * Usage
 
   General instructions on how to use the AntRun Plugin can be found on the 
{{{./usage.html}usage page}}. Some more
-  specific use cases are described in the examples given below. Last but not 
least, users occasionally contribute
-  additional examples, tips or errata to the
-  {{{http://docs.codehaus.org/display/MAVENUSER/Antrun+Plugin}plugin's wiki 
page}}.
+  specific use cases are described in the examples given below.
 
   In case you still have questions regarding the plugin's usage, please have a 
look at the {{{./faq.html}FAQ}} and feel
   free to contact the {{{./mail-lists.html}user mailing list}}. The posts to 
the mailing list are archived and could

maven git commit: [MNG-6255] Maven script cannot parse jvm.config with CRLF

[gboue]

Repository: maven
Updated Branches:
  refs/heads/MNG-6255 [created] c24ddf969


[MNG-6255] Maven script cannot parse jvm.config with CRLF

Both \r and \n should also be replaced with a space to deal with CRLF line 
endings properly


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

Branch: refs/heads/MNG-6255
Commit: c24ddf969f9b4971e7d1e564066e6dd198f91327
Parents: b100257
Author: Andrew Donald Kennedy 
Authored: Mon Jul 10 16:58:33 2017 +0100
Committer: Guillaume Boué 
Committed: Tue Jul 18 19:52:06 2017 +0200

--
 apache-maven/src/bin/mvn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c24ddf96/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index fa6164b..a554c66 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -167,7 +167,7 @@ find_file_argument_basedir() {
 # concatenates all lines of a file
 concat_lines() {
   if [ -f "$1" ]; then
-echo "`tr -s '\n' ' ' < "$1"`"
+echo "`tr -s '\r\n' '  ' < "$1"`"
   fi
 }
 

maven-integration-testing git commit: [MNG-6255] Maven script cannot parse jvm.config with CRLF

[gboue]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6255 [created] 7b7d7b5bb


[MNG-6255] Maven script cannot parse jvm.config with CRLF

Both \r and \n should also be replaced with a space to deal with CRLF line 
endings properly


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/7b7d7b5b
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/7b7d7b5b
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/7b7d7b5b

Branch: refs/heads/MNG-6255
Commit: 7b7d7b5bbe9a86a2969f985190ae6bf289561742
Parents: a162291
Author: Andrew Donald Kennedy 
Authored: Tue Jul 18 18:21:43 2017 +0100
Committer: Guillaume Boué 
Committed: Wed Jul 19 21:11:13 2017 +0200

--
 .../apache/maven/it/IntegrationTestSuite.java   |   1 +
 .../maven/it/MavenITmng6255FixConcatLines.java  | 104 +++
 .../src/test/resources/mng-6255/.mvn/jvm.config |   0
 .../src/test/resources/mng-6255/pom.xml |  67 
 4 files changed, 172 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7b7d7b5b/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 026b4b0..e8ce666 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
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng6255FixConcatLines.class );
 suite.addTestSuite( MavenITmng6240PluginExtensionAetherProvider.class 
);
 suite.addTestSuite( MavenITmng6223FindBasedir.class );
 suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7b7d7b5b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
new file mode 100644
index 000..4bd53ae
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java
@@ -0,0 +1,104 @@
+package org.apache.maven.it;
+
+/*
+ * 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.util.Properties;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Joiner;
+import com.google.common.io.Files;
+
+/**
+ * This is a test set for https://issues.apache.org/jira/browse/MNG-6255;>MNG-6255:
+ * Check that the .mvn/jvm.config file contents are concatenated 
properly, no matter
+ * what line endings are used.
+ */
+public class MavenITmng6255FixConcatLines
+extends AbstractMavenIntegrationTestCase
+{
+public MavenITmng6255FixConcatLines()
+{
+super( "[3.5.1,)" );
+}
+
+protected MavenITmng6255FixConcatLines( String constraint )
+{
+super( constraint );
+}
+
+/**
+ * Check that CR line endings work.
+ * 
+ * Currently disabled.
+ */
+public void disabledJvmConfigFileCR()
+throws Exception
+{
+runWithLineEndings( "\r" );
+}
+
+/**
+ * Check that LF line endings work.
+ */
+public void testJvmConfigFileLF()
+throws Exception
+{
+

svn commit: r1802034 - in /maven/plugins/trunk/maven-assembly-plugin/src/site: apt/examples/index.apt apt/examples/single/index.apt apt/examples/single/using-container-descriptor-handlers.apt.vm site.

[gboue]

Author: gboue
Date: Sat Jul 15 21:57:42 2017
New Revision: 1802034

URL: http://svn.apache.org/viewvc?rev=1802034=rev
Log:
[MASSEMBLY-857] Support for custom resource filters

Document container descriptor handlers in a dedicated page.

Added:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
   (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/index.apt

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/index.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/site.xml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/index.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/index.apt?rev=1802034=1802033=1802034=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/index.apt 
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/index.apt 
Sat Jul 15 21:57:42 2017
@@ -43,6 +43,8 @@ Examples
 
 * {{{./single/using-repositories.html}Using Repositories}}
 
+* {{{./single/using-container-descriptor-handlers.html}Using Container 
Descriptor Handlers}}
+
 []
 
   * {{{./multimodule/index.html}Working with Multi-Module Projects}}

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/index.apt
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/index.apt?rev=1802034=1802033=1802034=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/index.apt
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/index.apt
 Sat Jul 15 21:57:42 2017
@@ -40,3 +40,5 @@ Single Project Examples
   * {{{./using-components.html}Using Component Descriptors}}
 
   * {{{./using-repositories.html}Using Repositories}}
+
+  * {{{./using-container-descriptor-handlers.html}Using Container Descriptor 
Handlers}}

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm?rev=1802034=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
 Sat Jul 15 21:57:42 2017
@@ -0,0 +1,373 @@
+ --
+  Using Container Descriptor Handlers
+ --
+  Guillaume Boué
+ --
+  2017-07-15
+ --
+
+~~ 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
+
+Using Container Descriptor Handlers
+
+* Introduction
+
+  Container descriptor handlers can be used to filter dynamically the content
+  of files configured in a descriptor, for example by aggregating multiple 
files 
+  into a single file, or customizing the content of specific files.
+
+  This example demonstrate the use of <<<\<containerDescriptorHandlers\>>>> in
+  the assembly {{{../../assembly.html}descriptor format}}.
+
+* Built-in container descriptor handlers
+
+  The plugin comes with several handlers already defined.
+  
+[<<>>] This handler matches the files according to the 
given regular
+expression <<>>, aggregates their content, and stores the 
output 
+in the assembly at the given <<>>. A sample descriptor which 
matches
+all <<>> files configured in the assembly and aggregates them, 
by 
+appending their content, into a single <<>> located under the 
base directory
+of the assembly, is:
+
++-
+http://maven.apache.org/ASSEMBLY/${mdoVersion};
+  

svn commit: r1800814 - in /maven/plugins/trunk/maven-help-plugin/src: it/all-profiles-parent-pom/ it/all-profiles-parent-pom/child/ main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/

[gboue]

Author: gboue
Date: Tue Jul  4 20:17:57 2017
New Revision: 1800814

URL: http://svn.apache.org/viewvc?rev=1800814=rev
Log:
[MPH-123] all-profiles does not show right active status

MavenProject.getActiveProfiles only considers profiles from the project POM, so 
we also need to get the active profiles from the parents. With Maven 3, while 
it would be possible to use MavenProject.getInjectedProfileIds, it is more 
direct and symmetrical here to walk the parent chain ourselves (and makes sure 
the printed 'source' is consistent for active and inactive profiles from the 
settings).

Added:
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/

maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml   
(with props)

maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/AllProfilesMojoTest.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml?rev=1800814=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
 Tue Jul  4 20:17:57 2017
@@ -0,0 +1,43 @@
+
+
+
+
+
+  4.0.0
+  
+org.apache.maven.its.help
+all-profiles-parent-pom
+1.0
+  
+  child
+  
+
+  profile-active-from-child-pom
+  
+
+  pom.xml
+
+  
+
+
+  profile-inactive-from-child-pom
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/child/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties?rev=1800814=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
 Tue Jul  4 20:17:57 2017
@@ -0,0 +1,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.
+
+invoker.goals = 
${project.groupId}:${project.artifactId}:${project.version}:all-profiles
+invoker.maven.version = 3.0-, 3.0.4+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml?rev=1800814=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles-parent-pom/pom.xml 
(added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/all

svn commit: r1800508 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/repositories/massembly-855/ it/projects/repositories/massembly-855/child/ it/projects/repositories/massembly-855/c

[gboue]

Author: gboue
Date: Sat Jul  1 14:01:59 2017
New Revision: 1800508

URL: http://svn.apache.org/viewvc?rev=1800508=rev
Log:
[MASSEMBLY-855] Remote repositories ignored in a multi-module project

All the project repositories (and not just the session) need to be considered 
when a repository is assembled.

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/src/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/src/assembly/repository.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/invoker.properties
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/pom.xml
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/massembly-855-1.0.jar
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/massembly-855-1.0.pom
   (with props)

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/verify.bsh
   (with props)
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml?rev=1800508=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
 Sat Jul  1 14:01:59 2017
@@ -0,0 +1,64 @@
+
+
+
+
+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.plugin.assembly.test
+massembly-855
+1
+  
+  child
+  pom
+  
+file://${project.basedir}/../remote-repository
+  
+  
+
+  org.apache.maven.plugins.assembly.it
+  massembly-855
+  1.0
+
+  
+  
+
+  
+maven-assembly-plugin
+@project.version@
+
+  
+src/assembly/repository.xml
+  
+
+
+  
+create-repository
+package
+
+  single
+
+  
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/child/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/massembly-855/

svn commit: r1800481 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/it/projects/purge-local-repository-bad-dep/ src/it/projects/purge-local-repository-include/ src/it/projects/purge-local-r

[gboue]

Author: gboue
Date: Sat Jul  1 07:32:06 2017
New Revision: 1800481

URL: http://svn.apache.org/viewvc?rev=1800481=rev
Log:
[MDEP-573] "purge-local-repository -Dinclude" does not work as described

Due to requiresProject = false, we need to loop over the projects in the 
reactor ourselves if the mojo was launched from the CLI. This requires several 
changes:
 - Dependency artifacts do not exist anymore so we work on dependencies and 
resolve them if necessary.
 - Dependencies on projects in the reactor are ignored (just like in the case 
of a single project, the project itself is not purged).
 - Artifacts already purged do not need to be purged again: if they were 
re-resolved then no need to purge and re-resolve them a second time; if they 
were not re-resolved then keep them deleted.
 - Updating to maven-artifact-transfer 0.9.2-SNAPSHOT to make added ITs work on 
Maven 3.0.x.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-bad-dep/verify.groovy
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-include/verify.groovy
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child1/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child1/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child2/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/child2/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module-execution/verify.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child1/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child1/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child2/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/child2/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-multi-module/verify.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/skip-test/plugin-purge-local-repository-config.xml
   (with props)
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/TestSkip.java

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/p

svn commit: r1800187 - /maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java

[gboue]

Author: gboue
Date: Wed Jun 28 17:54:02 2017
New Revision: 1800187

URL: http://svn.apache.org/viewvc?rev=1800187=rev
Log:
[MENFORCER-274] Add check for version 9 in RequireJavaVersion
Submitted by: Peter Ansell

Applied without change. This closes #24.

Modified:

maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java

Modified: 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java?rev=1800187=1800186=1800187=diff
==
--- 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
 Wed Jun 28 17:54:02 2017
@@ -60,6 +60,7 @@ public class TestRequireJavaVersion
 assertThat( RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp" ) 
).isEqualTo( "1.6.0" );
 assertThat( RequireJavaVersion.normalizeJDKVersion( "1.6.0-dp2" ) 
).isEqualTo( "1.6.0-2" );
 assertThat( RequireJavaVersion.normalizeJDKVersion( "1.8.0_73" ) 
).isEqualTo( "1.8.0-73" );
+assertThat( RequireJavaVersion.normalizeJDKVersion( "9" ) ).isEqualTo( 
"9" );
 
 }
 

svn commit: r1799998 - in /maven/enforcer/trunk/enforcer-rules: pom.xml src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java src/main/java/org/apache/maven/plugins/enforcer/Requi

[gboue]

Author: gboue
Date: Mon Jun 26 21:36:41 2017
New Revision: 178

URL: http://svn.apache.org/viewvc?rev=178=rev
Log:
Clean up plexus-i18n dependency, and the code looking the I18N component, since 
it is never used.

Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml

maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java

maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=178=177=178=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Jun 26 21:36:41 2017
@@ -90,11 +90,6 @@
   maven-dependency-tree
 
 
-  org.codehaus.plexus
-  plexus-i18n
-  1.0-beta-6
-
-
   org.apache.maven
   maven-compat
 

Modified: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=178=177=178=diff
==
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
 Mon Jun 26 21:36:41 2017
@@ -40,7 +40,6 @@ import org.apache.maven.shared.dependenc
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
 import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.i18n.I18N;
 
 /**
  * @author mailto:r...@e-hoffman.org;>Rex Hoffman
@@ -51,8 +50,6 @@ public class DependencyConvergence
 
 private static Log log;
 
-private static I18N i18n;
-
 private boolean uniqueVersions;
 
 public void setUniqueVersions( boolean uniqueVersions )
@@ -113,10 +110,6 @@ public class DependencyConvergence
 }
 try
 {
-if ( i18n == null )
-{
-i18n = (I18N) helper.getComponent( I18N.class );
-}
 DependencyNode node = getNode( helper );
 DependencyVersionMap visitor = new DependencyVersionMap( log );
 visitor.setUniqueVersions( uniqueVersions );
@@ -133,10 +126,6 @@ public class DependencyConvergence
 + "See above detailed error message." );
 }
 }
-catch ( ComponentLookupException e )
-{
-throw new EnforcerRuleException( "Unable to lookup a component " + 
e.getLocalizedMessage(), e );
-}
 catch ( Exception e )
 {
 throw new EnforcerRuleException( e.getLocalizedMessage(), e );

Modified: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java?rev=178=177=178=diff
==
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
 Mon Jun 26 21:36:41 2017
@@ -44,7 +44,6 @@ import org.apache.maven.shared.dependenc
 import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
 import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.i18n.I18N;
 
 /**
  * Rule to enforce that the resolved dependency is also the most recent one of 
all transitive dependencies.
@@ -57,8 +56,6 @@ public class RequireUpperBoundDeps
 {
 private static Log log;
 
-private static I18N i18n;
-
 /**
  * @since 1.3
  */
@@ -145,10 +142,6 @@ public class RequireUpperBoundDeps
 }
 try
 {
-if ( i18n == null )
-{
-i18n = (I18N) helper.getComponent( I18N.class );
-}
 DependencyNode node = getNode( helper );
 RequireUpperBoundDepsVisitor visitor = new 
RequireUpperBoundDepsVisitor();
 visitor.setUniqueVersions( uniqueVersions );
@@ -160,10 +153,6 @@ public clas

svn commit: r1799997 - in /maven/enforcer/trunk: ./ enforcer-rules/ maven-enforcer-plugin/ maven-enforcer-plugin/src/it/projects/display-info/ maven-enforcer-plugin/src/main/java/org/apache/maven/plug

[gboue]

Author: gboue
Date: Mon Jun 26 21:26:08 2017
New Revision: 177

URL: http://svn.apache.org/viewvc?rev=177=rev
Log:
Remove usage of commons-lang in the project, to only have commons-lang3 on the 
classpath. In DisplayInfoMojo, we can simply get the Java version from the 
system properties.

Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml 
  (with props)

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy
   (with props)
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml

maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
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=177=176=177=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Jun 26 21:26:08 2017
@@ -61,7 +61,6 @@
 
   org.apache.commons
   commons-lang3
-  3.5
 
 
   commons-codec

Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=177=176=177=diff
==
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Jun 26 21:26:08 2017
@@ -56,10 +56,6 @@
   plexus-utils
 
 
-  commons-lang
-  commons-lang
-
-
   org.apache.maven.enforcer
   enforcer-api
 

Added: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml?rev=177=auto
==
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml 
(added)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml 
Mon Jun 26 21:26:08 2017
@@ -0,0 +1,44 @@
+
+
+
+
+
+  4.0.0
+  org.apache.maven.its.enforcer
+  display-info
+  1.0
+  
+
+  
+maven-enforcer-plugin
+@project.version@
+
+  
+test
+validate
+
+  display-info
+
+  
+
+  
+
+  
+

Propchange: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml
--
svn:eol-style = native

Propchange: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy?rev=177=auto
==
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy
 (added)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy
 Mon Jun 26 21:26:08 2017
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.text.contains( 'Maven Version:' )
+assert buildLog.text.contains( 'JDK Version:' )

Propchange: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/display-info/verify.groovy
--
svn:eol-style = native

Propchange: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/displa

svn commit: r1799794 - in /maven/enforcer/trunk: enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-t

[gboue]

Author: gboue
Date: Sun Jun 25 10:41:39 2017
New Revision: 1799794

URL: http://svn.apache.org/viewvc?rev=1799794=rev
Log:
Fix build on JDK 9:

 - In TestMavenVersion, changing the test comparing Java and Maven versions 
together, due to Java versioning scheme change (JDK-8061493). We now use a 
fixed version with an underscore to test that it doesn't cause any issues.
 - In resolve_collect_dependencies IT, version 3.0.0 of the Assembly Plugin 
needs to be used to incorporate Plexus Archiver resolved issue with new JDK 
versioning scheme (commit c0357c5 of Plexus Archiver).
 - In require-plugin-versions-plugin-with-integration-test-lifecycle IT, Tycho 
needs to be updated to 0.22.0 so that an execution environment greater than 1.5 
(which JDK 9 no longer supports) can be specified uniquely.

Modified:

maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml

Modified: 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java?rev=1799794=1799793=1799794=diff
==
--- 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
 Sun Jun 25 10:41:39 2017
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.enforce
  * under the License.
  */
 
-import org.apache.commons.lang3.SystemUtils;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
 
@@ -65,7 +64,7 @@ public class TestMavenVersion
 }
 
 // this shouldn't crash
-rule.setVersion( SystemUtils.JAVA_VERSION );
+rule.setVersion( "2.0.5_01" );
 rule.execute( helper );
 
 }

Modified: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml?rev=1799794=1799793=1799794=diff
==
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
 (original)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml
 Sun Jun 25 10:41:39 2017
@@ -25,7 +25,7 @@
   1.0.0-SNAPSHOT
   eclipse-plugin
   
-0.19.0
+0.22.0
   
   
 
@@ -68,6 +68,7 @@
 
   
   p2
+  
JavaSE-@maven.compiler.source@
 
   
   

Modified: 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml?rev=1799794=1799793=1799794=diff
==
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
 (original)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
 Sun Jun 25 10:41:39 2017
@@ -43,7 +43,7 @@
   
 org.apache.maven.plugins
 maven-assembly-plugin
-2.5.5
+3.0.0
 
   
 assemble

svn commit: r1799601 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file: ./ child1/ child2/

[gboue]

Author: gboue
Date: Thu Jun 22 18:03:33 2017
New Revision: 1799601

URL: http://svn.apache.org/viewvc?rev=1799601=rev
Log:
[MDEP-572] Truncated filenames extracting tar files.

Adding IT showing that the plugin keeps the correct file name when unpacking a 
TAR file with POSIX long file mode containing a file with a very long file name.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/this-is-an-empty-text-file-with-a-name-that-is-longer-than-100-characters-to-verify-that-the-name-is-fully-kept-when-unpacking-from-a-tar.txt
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child2/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child2/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/verify.bsh
   (with props)

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml?rev=1799601=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
 Thu Jun 22 18:03:33 2017
@@ -0,0 +1,37 @@
+
+
+
+
+http://maven.apache.org/ASSEMBLY/2.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
+  assemble
+  
+tar.bz2
+  
+  false
+  
+
+  ${project.basedir}
+  
+*.txt
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/assembly.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml?rev=1799601=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
 Thu Jun 22 18:03:33 2017
@@ -0,0 +1,53 @@
+
+
+
+
+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/xsd/maven-4.0.0.xsd;>
+  4.0.0
+  
+org.apache.maven.its.dependency
+mdep-572-unpack-tar-long-file
+1.0
+  
+  child1
+  pom
+  
+
+  
+maven-assembly-plugin
+3.0.0
+
+  
+
+  single
+
+package
+
+  
+assembly.xml
+  
+  posix
+
+  
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-572-unpack-tar-long-file/child1/this-is-an-empty-text-file-with-

svn commit: r1799110 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/projects/mdep-571-list-java9/ main/java/org/apache/maven/plugins/dependency/utils/

[gboue]

Author: gboue
Date: Sun Jun 18 18:00:24 2017
New Revision: 1799110

URL: http://svn.apache.org/viewvc?rev=1799110=rev
Log:
[MDEP-571] JDK9: Issue with list goal fails with java.lang.NoSuchMethodException

Only find public inherited methods through reflection with getMethod instead of 
getDeclaredMethod.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyStatusSets.java

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties?rev=1799110=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
 Sun Jun 18 18:00:24 2017
@@ -0,0 +1,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.
+
+invoker.java.version = 1.9+
+invoker.goals = 
${project.groupId}:${project.artifactId}:${project.version}:list

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml?rev=1799110=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
 Sun Jun 18 18:00:24 2017
@@ -0,0 +1,35 @@
+
+
+
+
+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/xsd/maven-4.0.0.xsd;>
+  4.0.0
+  org.apache.maven.plugins.dependency
+  mdep-571-list-java9
+  1.0.0-SNAPSHOT
+  Test that dependency:list doesn't fail on JRE9
+  
+
+  org.slf4j
+  slf4j-api
+  1.7.6
+
+  
+

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy?rev=1799110=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/verify.groovy
 Sun Jun 18 18:00:24 2017
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE fi

svn commit: r1799024 - /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java

[gboue]

Author: gboue
Date: Sat Jun 17 21:43:57 2017
New Revision: 1799024

URL: http://svn.apache.org/viewvc?rev=1799024=rev
Log:
Various refactorings and simplifications:
 - Removing dead code
 - Creating dedicated methods
 - Fixing spelling errors
 - Trying to minimize try blocks length

Modified:

maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java

Modified: 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java?rev=1799024=1799023=1799024=diff
==
--- 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
 Sat Jun 17 21:43:57 2017
@@ -50,12 +50,12 @@ import org.apache.tools.ant.ProjectHelpe
 import org.apache.tools.ant.taskdefs.Typedef;
 import org.apache.tools.ant.types.Path;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
+ * 
  * Maven AntRun Mojo.
  * 
  * This plugin provides the capability of calling Ant tasks from a POM by 
running the nested Ant tasks inside the
@@ -120,7 +120,7 @@ public class AntRunMojo
  * The Maven project object
  */
 @Parameter( defaultValue = "${project}", readonly = true, required = true )
-private MavenProject project;
+private MavenProject mavenProject;
 
 /**
  * The Maven session object
@@ -230,16 +230,16 @@ public class AntRunMojo
 private boolean exportAntProperties;
 
 /**
- * Specifies whether a failure in the Ant build leads to a failure of the 
Maven build. If this
- * value is {@code false}, the Maven build will proceed even if the Ant 
build fails. If it is
- * {@code true}, then the Maven build fails if the Ant build fails.
+ * Specifies whether a failure in the Ant build leads to a failure of the 
Maven build. If this value is
+ * {@code false}, the Maven build will proceed even if the Ant build 
fails. If it is {@code true}, then the Maven
+ * build fails if the Ant build fails.
  *
  * @since 1.7
  */
 @Parameter( defaultValue = "true" )
 private boolean failOnError;
 
-/** {@inheritDoc} */
+@Override
 public void execute()
 throws MojoExecutionException, MojoFailureException
 {
@@ -252,8 +252,6 @@ public class AntRunMojo
 return;
 }
 
-MavenProject mavenProject = getMavenProject();
-
 if ( target == null )
 {
 getLog().info( "No Ant target defined - SKIPPED" );
@@ -268,86 +266,29 @@ public class AntRunMojo
 String antTargetName = target.getAttribute( "name", 
DEFAULT_ANT_TARGET_NAME );
 target.setAttribute( "name", antTargetName );
 
+Project antProject = new Project();
+antProject.addBuildListener( getConfiguredBuildLogger() );
 try
 {
-Project antProject = new Project();
 File antBuildFile = writeTargetToProjectFile( antTargetName );
 ProjectHelper.configureProject( antProject, antBuildFile );
 antProject.init();
 
-DefaultLogger antLogger = new MavenLogger( getLog() );
-
-if ( getLog().isDebugEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_DEBUG );
-}
-else if ( getLog().isInfoEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_INFO );
-}
-else if ( getLog().isWarnEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_WARN );
-}
-else if ( getLog().isErrorEnabled() )
-{
-antLogger.setMessageOutputLevel( Project.MSG_ERR );
-}
-else
-{
-antLogger.setMessageOutputLevel( Project.MSG_VERBOSE );
-}
-
-antProject.addBuildListener( antLogger );
 antProject.setBaseDir( mavenProject.getBasedir() );
 
-Path p = new Path( antProject );
-p.setPath( StringUtils.join( 
mavenProject.getCompileClasspathElements().iterator(), File.pathSeparator ) );
-
-/* maven.dependency.classpath it's deprecated as it's equal to 
maven.compile.classpath */
-antProject.addReference( MAVEN_REFID_PREFIX + 
"dependency.classpath", p );
-antProject.addReference( MAVEN_REFID_PREFIX + "

svn commit: r1799022 - in /maven/plugins/trunk/maven-remote-resources-plugin: ./ src/test/java/org/apache/maven/plugin/resources/remote/it/ src/test/java/org/apache/maven/plugin/resources/remote/it/su

[gboue]

Author: gboue
Date: Sat Jun 17 21:02:49 2017
New Revision: 1799022

URL: http://svn.apache.org/viewvc?rev=1799022=rev
Log:
Fix ITs when the build is launched with a custom maven.repo.local set on the 
CLI.

Modified:
maven/plugins/trunk/maven-remote-resources-plugin/pom.xml

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundleWithTypeAndClassifier.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GetDependencyProjects.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java

maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java

Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=1799022=1799021=1799022=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Sat Jun 17 
21:02:49 2017
@@ -350,8 +350,12 @@ under the License.
 
 
   
-
-
${project.build.directory}/it-repo
+
+
${project.build.directory}/it-repo
   
 
   

Modified: 
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java?rev=1799022=1799021=1799022=diff
==
--- 
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
 (original)
+++ 
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
 Sat Jun 17 21:02:49 2017
@@ -40,9 +40,7 @@ public class IT_BadDependencyPoms
 {
 File dir = TestUtils.getTestDir( "bad-dependency-poms" );
 
-Verifier verifier;
-
-verifier = new Verifier( dir.getAbsolutePath() );
+Verifier verifier = TestUtils.newVerifier( dir );
 verifier.deleteArtifacts( "test" );
 verifier.getSystemProperties().setProperty( "it.dir", 
dir.getAbsolutePath() );
 

Modified: 
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java?rev=1799022=1799021=1799022=diff
==
--- 
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
 (original)
+++ 
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java
 Sat Jun 17 21:02:49 2017
@@ -36,7 +36,7 @@ public class IT_CustomFilterDelimiter
 throws IOException, URISyntaxException, VerificationException
 {
 File dir = TestUtils.getTestDir( "custom-filter-delim" );
-Verifier verifier = new Verifier( dir.getAbsolutePath() );
+Verifier verifier = TestUtils.newVerifier( dir );
 
 verifier.getCliOptions().add( "-X" );
 

Modified: 
maven/plugins/tru

svn commit: r1799020 - in /maven/plugins/trunk/maven-antrun-plugin/src: it/MANTRUN-192/ it/MANTRUN-192/pom.xml main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java

[gboue]

Author: gboue
Date: Sat Jun 17 19:54:34 2017
New Revision: 1799020

URL: http://svn.apache.org/viewvc?rev=1799020=rev
Log:
[MANTRUN-192] filterArtifacts in DependencyFilesetsTask includes entire 
maven.local.repository

When there are no artifacts after filtering, Ant will include by default 
everything under the local repository (since there are no include patterns). 
Therefore, in this case, we need to exclude everything explicitly. For 
performance reasons, we need to add a dummy file to the include patterns, 
otherwise Ant will still traverse the whole directory before applying the 
exclusions.

Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/
maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml   (with 
props)
Modified:

maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java

Added: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml?rev=1799020=auto
==
--- maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml (added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml Sat Jun 
17 19:54:34 2017
@@ -0,0 +1,61 @@
+
+
+
+
+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.antrun
+  MANTRUN-192
+  pom
+  1.0
+  https://issues.apache.org/jira/browse/MANTRUN-192
+  Checks that creating a FileSet of the project dependencies also 
works when there are no dependencies.
+  
+
+  
+maven-antrun-plugin
+@pom.version@
+
+  
+
+  run
+
+validate
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+

Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml
--
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-antrun-plugin/src/it/MANTRUN-192/pom.xml
--
svn:keywords = Author Date Id Revision

Modified: 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=1799020=1799019=1799020=diff
==
--- 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
 (original)
+++ 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
 Sat Jun 17 19:54:34 2017
@@ -116,6 +116,14 @@ public class DependencyFilesetsTask
 ArtifactRepository localRepository = (ArtifactRepository) 
getProject().getReference( "maven.local.repository" );
 dependenciesFileSet.setDir( new File( localRepository.getBasedir() ) );
 
+if ( depArtifacts.isEmpty() )
+{
+// For performance reasons in case of huge local repo, tell Ant to 
include a single thing, otherwise the
+// whole directory is scanned (even though ** is excluded).
+dependenciesFileSet.createInclude().setName( "." );
+dependenciesFileSet.createExclude().setName( "**" );
+}
+
 for ( Artifact artifact : depArtifacts )
 {
 String relativeArtifactPath = localRepository.pathOf( artifact );