maven git commit: [MNG-5967] Dependency updates.

2016-11-13 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/master 81af1e261 -> e460c7d45


[MNG-5967] Dependency updates.


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

Branch: refs/heads/master
Commit: e460c7d45bc718920b5e68efd779e792d1d2fc4a
Parents: 81af1e2
Author: Christian Schulte 
Authored: Mon Nov 14 03:07:19 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 03:07:19 2016 +0100

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/e460c7d4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 387a37f..d83a2b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,12 +51,12 @@ under the License.
 1.7
 2.5.2
 1.3.1
-3.4
+3.5
 4.12
-1.7
+1.7.1
 1.24
 3.0.24
-19.0
+20.0
 4.1.0
 0.3.3
 2.10

maven git commit: [MNG-5967] Dependency updates.

2016-11-13 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/master cd14b36e2 -> 81af1e261


[MNG-5967] Dependency updates.

o Updated 'plexus-interpolation' from 1.22 to 1.24 to fix escaping bug.


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

Branch: refs/heads/master
Commit: 81af1e261053e9cbf4143ace3cd83a669567aa5d
Parents: cd14b36
Author: Christian Schulte 
Authored: Mon Nov 14 02:56:14 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 02:57:35 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/81af1e26/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0ae8eb2..387a37f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ under the License.
 3.4
 4.12
 1.7
-1.22
+1.24
 3.0.24
 19.0
 4.1.0

maven-resolver git commit: o Updated a '@since' tag.

2016-11-13 Thread schulte 
Repository: maven-resolver
Updated Branches:
  refs/heads/master 7d270dae8 -> aeb7889f7


o Updated a '@since' tag.


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

Branch: refs/heads/master
Commit: aeb7889f73316baecdef0b82d2f44cc224b992f1
Parents: 7d270da
Author: Christian Schulte 
Authored: Mon Nov 14 02:49:17 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 02:49:17 2016 +0100

--
 .../aether/util/graph/manager/TransitiveDependencyManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/aeb7889f/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
--
diff --git 
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
 
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
index aeac09f..4484aa5 100644
--- 
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
+++ 
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
@@ -37,7 +37,7 @@ import org.eclipse.aether.util.artifact.JavaScopes;
  * A dependency manager supporting transitive dependency management.
  *
  * @author Christian Schulte
- * @since 1.2
+ * @since 1.2.0
  */
 public final class TransitiveDependencyManager
 implements DependencyManager

maven-resolver git commit: [MRESOLVER-8] Direct dependencies incorrectly detected as transitive.

2016-11-13 Thread schulte 
Repository: maven-resolver
Updated Branches:
  refs/heads/master bec698b6d -> 7d270dae8


[MRESOLVER-8] Direct dependencies incorrectly detected as transitive.

This reverts commit e391a27ab3609fc63a625bbe3a25401af6ec02ef
and commit 5907bd44682925d8ea795fcb63c39d268157a632 partially.
'ScopeDependencySelector' is behaving the same way it did in
pre 1.2.0 again. That's been the issue introduced by me months
ago.


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

Branch: refs/heads/master
Commit: 7d270dae8f72d14376fffd46652a629e2446ae0e
Parents: bec698b
Author: Christian Schulte 
Authored: Mon Nov 14 02:37:48 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 02:44:28 2016 +0100

--
 .../DefaultDependencyCollectionContext.java | 23 +---
 .../impl/DefaultDependencyCollector.java|  8 ++-
 2 files changed, 3 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7d270dae/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
index e8dd829..1ad6cc7 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
@@ -19,7 +19,6 @@ package org.eclipse.aether.internal.impl;
  * under the License.
  */
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.aether.RepositorySystemSession;
@@ -31,7 +30,7 @@ import org.eclipse.aether.graph.Dependency;
  * @see DefaultDependencyCollector
  */
 final class DefaultDependencyCollectionContext
-implements DependencyCollectionContext, Cloneable
+implements DependencyCollectionContext
 {
 
 private final RepositorySystemSession session;
@@ -84,24 +83,4 @@ final class DefaultDependencyCollectionContext
 return String.valueOf( getDependency() );
 }
 
-/**
- * @since 1.2.0
- */
-@Override
-public DefaultDependencyCollectionContext clone()
-{
-try
-{
-final DefaultDependencyCollectionContext clone = 
(DefaultDependencyCollectionContext) super.clone();
-clone.managedDependencies = clone.managedDependencies != null
-? new ArrayList<>( 
clone.managedDependencies )
-: null;
-
-return clone;
-}
-catch ( final CloneNotSupportedException e )
-{
-throw new AssertionError( e );
-}
-}
 }

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/7d270dae/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index c68eb86..2d76f92 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -476,10 +476,8 @@ public class DefaultDependencyCollector
 DependencyTraverser depTraverser, VersionFilter 
verFilter, Dependency d,
 ArtifactDescriptorResult descriptorResult, 
DefaultDependencyNode child )
 {
-final DefaultDependencyCollectionContext savedContext = 
args.collectionContext;
-args.collectionContext = args.collectionContext.clone();
-args.collectionContext.set( d, 
descriptorResult.getManagedDependencies() );
 DefaultDependencyCollectionContext context = args.collectionContext;
+context.set( d, descriptorResult.getManagedDependencies() );
 
 DependencySelector childSelector = depSelector != null ? 
depSelector.deriveChildSelector( context ) : null;
 DependencyManager childManager = depManager != null ? 
depManager.deriveChildManager( context ) : null;
@@ -510,8 +508,6 @@ public class DefaultDependencyCollector
 {

maven-resolver git commit: Reverted various commits. Due to the way the 'DefaultDependencyCollector' caches child node lists, there is no way to provide an API for traversing a graph bottom-up. Parent

2016-11-13 Thread schulte 
Repository: maven-resolver
Updated Branches:
  refs/heads/master e391a27ab -> bec698b6d


Reverted various commits. Due to the way the 'DefaultDependencyCollector'
caches child node lists, there is no way to provide an API for traversing a
graph bottom-up. Parent's share the same child node list objects even when the
child nodes have been resolved from a different parent. The default dependency
collector would need to be rewritten (various caches, performance improvements,
cycle resolution) to make this possible making old issues re-appear.
This effectively reverts commits
468240b7060c80268f75c49b121e9a63ca8d90da
5b69d98e7bce7e49e1af031db59990f22d91526b
0a82c39e821953d43530e4fc3fcf99a6882dfd61
1b4370b1a4e82ce5dfaaea133b40a7fce801fc52
and paritally commit:
1ee92862c67ec98564c4d8be1207355960f1dd5d


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

Branch: refs/heads/master
Commit: bec698b6db1a03cf5c98c79a1b10ed3df4bcb911
Parents: e391a27
Author: Christian Schulte 
Authored: Mon Nov 14 02:11:03 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 02:11:03 2016 +0100

--
 .../aether/graph/DefaultDependencyNode.java |  43 +-
 .../eclipse/aether/graph/DependencyNode.java|  18 -
 .../impl/DefaultDependencyCollector.java|  18 +-
 .../test/util/DependencyGraphParser.java|   2 +-
 .../transformer/JavaDependencyMediator.java | 389 ---
 5 files changed, 16 insertions(+), 454 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/bec698b6/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
--
diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
index 2e7288f..7d46891 100644
--- 
a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
@@ -39,8 +39,6 @@ public final class DefaultDependencyNode
 implements DependencyNode
 {
 
-private DependencyNode parent;
-
 private List children;
 
 private Dependency dependency;
@@ -70,7 +68,13 @@ public final class DefaultDependencyNode
  */
 public DefaultDependencyNode( Dependency dependency )
 {
-this( null, dependency );
+this.dependency = dependency;
+artifact = ( dependency != null ) ? dependency.getArtifact() : null;
+children = new ArrayList( 0 );
+aliases = relocations = Collections.emptyList();
+repositories = Collections.emptyList();
+context = "";
+data = Collections.emptyMap();
 }
 
 /**
@@ -83,7 +87,6 @@ public final class DefaultDependencyNode
 public DefaultDependencyNode( Artifact artifact )
 {
 super();
-this.parent = null;
 this.artifact = artifact;
 children = new ArrayList( 0 );
 aliases = relocations = Collections.emptyList();
@@ -101,7 +104,6 @@ public final class DefaultDependencyNode
 public DefaultDependencyNode( DependencyNode node )
 {
 super();
-parent = node.getParent();
 dependency = node.getDependency();
 artifact = node.getArtifact();
 children = new ArrayList( 0 );
@@ -116,37 +118,6 @@ public final class DefaultDependencyNode
 setData( data.isEmpty() ? null : new HashMap( data ) );
 }
 
-/**
- * Creates a new node with the specified dependency.
- *
- * @param parent The parent node of the node or {@code null}.
- * @param dependency The dependency associated with this node, may be 
{@code null} for a root node.
- *
- * @since 1.2
- */
-public DefaultDependencyNode( DependencyNode parent, Dependency dependency 
)
-{
-super();
-this.parent = parent;
-this.dependency = dependency;
-artifact = ( dependency != null ) ? dependency.getArtifact() : null;
-children = new ArrayList( 0 );
-aliases = relocations = Collections.emptyList();
-repositories = Collections.emptyList();
-context = "";
-data = Collections.emptyMap();
-}
-
-public long getDepth()
-{
-return this.getParent() != null ? this.getParent().getDepth() + 1L : 
0L;
-}
-
-public DependencyNode getParent()
-{
-return this.parent;
-}
-
 public List getChildren()

maven-resolver git commit: [MRESOLVER-8] Direct dependencies incorrectly detected as transitive.

2016-11-13 Thread schulte 
Repository: maven-resolver
Updated Branches:
  refs/heads/master 5907bd446 -> e391a27ab


[MRESOLVER-8] Direct dependencies incorrectly detected as transitive.

o For the impatient: Look at those 'deriveChildXyz' methods how they
  never decrease the depth value and always increase that value by one
  although during recursion depth needs to be decreased. All those
  components, once switched to 'transitive' mode, never will get
  switched back to 'direct' mode.


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

Branch: refs/heads/master
Commit: e391a27ab3609fc63a625bbe3a25401af6ec02ef
Parents: 5907bd4
Author: Christian Schulte 
Authored: Mon Nov 14 01:37:36 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 01:40:15 2016 +0100

--
 .../aether/internal/impl/DefaultDependencyCollector.java  | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/e391a27a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index 4357f9c..e38cf63 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -476,8 +476,10 @@ public class DefaultDependencyCollector
 DependencyTraverser depTraverser, VersionFilter 
verFilter, Dependency d,
 ArtifactDescriptorResult descriptorResult, 
DefaultDependencyNode child )
 {
-DefaultDependencyCollectionContext context = 
args.collectionContext.clone();
-context.set( d, descriptorResult.getManagedDependencies() );
+final DefaultDependencyCollectionContext savedContext = 
args.collectionContext;
+args.collectionContext = args.collectionContext.clone();
+args.collectionContext.set( d, 
descriptorResult.getManagedDependencies() );
+DefaultDependencyCollectionContext context = args.collectionContext;
 
 DependencySelector childSelector = depSelector != null ? 
depSelector.deriveChildSelector( context ) : null;
 DependencyManager childManager = depManager != null ? 
depManager.deriveChildManager( context ) : null;
@@ -508,6 +510,8 @@ public class DefaultDependencyCollector
 {
 child.setChildren( children );
 }
+
+args.collectionContext = savedContext;
 }
 
 private ArtifactDescriptorResult getArtifactDescriptorResult( Args args, 
Results results, boolean noDescriptor,
@@ -696,7 +700,7 @@ public class DefaultDependencyCollector
 
 final NodeStack nodes;
 
-final DefaultDependencyCollectionContext collectionContext;
+DefaultDependencyCollectionContext collectionContext;
 
 final DefaultVersionFilterContext versionContext;

maven-resolver git commit: [MRESOLVER-8] Direct dependencies incorrectly detected as transitive.

2016-11-13 Thread schulte 
Repository: maven-resolver
Updated Branches:
  refs/heads/master 3fb6ed988 -> 5907bd446


[MRESOLVER-8] Direct dependencies incorrectly detected as transitive.


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

Branch: refs/heads/master
Commit: 5907bd44682925d8ea795fcb63c39d268157a632
Parents: 3fb6ed9
Author: Christian Schulte 
Authored: Mon Nov 14 01:23:03 2016 +0100
Committer: Christian Schulte 
Committed: Mon Nov 14 01:23:23 2016 +0100

--
 .../DefaultDependencyCollectionContext.java |  23 -
 .../impl/DefaultDependencyCollector.java|   2 +-
 .../impl/DefaultDependencyCollectorTest.java| 101 ---
 .../selection/optional/all-nodes.txt|   3 +
 .../optional/gid_direct-of-root_ver.ini |   2 -
 .../selection/optional/gid_direct_ver.ini   |   2 +
 .../selection/optional/gid_root_ver.ini |   2 -
 .../optional/gid_transitive-of-direct_ver.ini   |   2 +
 .../optional/gid_transitive-of-root_ver.ini |   1 -
 ...d_transitive-of-transitive-of-direct_ver.ini |   1 +
 .../selection/optional/no-selector-tree.txt |   3 -
 .../optional/optional-exclusion-tree.txt|   2 -
 ...al-transitive-nodes-of-direct-dependency.txt |   1 +
 ...without-optional-transitive-nodes-of-pom.txt |   2 +
 .../selection/scope/all-nodes-of-pom.txt|   5 +
 .../selection/scope/all-nodes.txt   |   8 +-
 .../selection/scope/gid_direct-of-root_ver.ini  |   2 -
 .../selection/scope/gid_direct_ver.ini  |   2 +
 .../selection/scope/gid_root_ver.ini|   2 -
 .../scope/gid_transitive-of-direct_ver.ini  |   2 +
 .../scope/gid_transitive-of-root_ver.ini|   2 -
 ...d_transitive-of-transitive-of-direct_ver.ini |   2 +
 ...gid_transitive-of-transitive-of-root_ver.ini |   1 -
 ...f-transitive-of-transitive-of-direct_ver.ini |   1 +
 ...ransitive-of-direct-scope-exclusion-tree.txt |   1 +
 .../transitive-of-root-scope-exclusion-tree.txt |   2 -
 ...ransitive-of-direct-scope-exclusion-tree.txt |   2 +
 ...ive-of-transitive-of-root-exclusion-tree.txt |   3 -
 ...ransitive-of-direct-scope-exclusion-tree.txt |   3 +
 .../selector/OptionalDependencySelector.java|  31 +++---
 .../graph/selector/ScopeDependencySelector.java |  31 +++---
 31 files changed, 182 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/5907bd44/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
--
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
index 1ad6cc7..e8dd829 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
@@ -19,6 +19,7 @@ package org.eclipse.aether.internal.impl;
  * under the License.
  */
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.aether.RepositorySystemSession;
@@ -30,7 +31,7 @@ import org.eclipse.aether.graph.Dependency;
  * @see DefaultDependencyCollector
  */
 final class DefaultDependencyCollectionContext
-implements DependencyCollectionContext
+implements DependencyCollectionContext, Cloneable
 {
 
 private final RepositorySystemSession session;
@@ -83,4 +84,24 @@ final class DefaultDependencyCollectionContext
 return String.valueOf( getDependency() );
 }
 
+/**
+ * @since 1.2.0
+ */
+@Override
+public DefaultDependencyCollectionContext clone()
+{
+try
+{
+final DefaultDependencyCollectionContext clone = 
(DefaultDependencyCollectionContext) super.clone();
+clone.managedDependencies = clone.managedDependencies != null
+? new ArrayList<>( 
clone.managedDependencies )
+: null;
+
+return clone;
+}
+catch ( final CloneNotSupportedException e )
+{
+throw new AssertionError( e );
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/5907bd44/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
--
diff --git

maven-integration-testing git commit: added missing license headers

2016-11-13 Thread hboutemy 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 3311f4e34 -> cf794f914


added missing license headers

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

Branch: refs/heads/master
Commit: cf794f91486da443610726947847283867667e69
Parents: 3311f4e
Author: Hervé Boutemy 
Authored: Mon Nov 14 01:10:36 2016 +0100
Committer: Hervé Boutemy 
Committed: Mon Nov 14 01:10:36 2016 +0100

--
 ...ependencyManagementImportRelocationsTest.java |  2 --
 ...DependencyManagementImportExclusionsTest.java |  3 +--
 .../it/MavenITmng5771CoreExtensionsTest.java | 19 +++
 ...avenITmng5774ConfigurationProcessorsTest.java | 19 +++
 .../MavenITmng5783PluginDependencyFiltering.java | 19 +++
 .../MavenITmng5805PkgTypeMojoConfiguration.java  | 19 +++
 .../it/MavenITmng5840ParentVersionRanges.java| 19 +++
 ...avenITmng5840RelativePathReactorMatching.java | 19 +++
 .../it/MavenITmng5889CoreExtensionsTest.java | 19 +++
 ...MavenITmng5958LifecyclePhaseBinaryCompat.java | 19 +++
 10 files changed, 153 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cf794f91/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
index 368f2e7..76a5368 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5527DependencyManagementImportRelocationsTest.java
@@ -26,8 +26,6 @@ import java.util.Properties;
 
 import org.apache.maven.it.util.ResourceExtractor;
 
-import static junit.framework.Assert.assertEquals;
-
 /**
  * [MNG-5527] Dependency management import should support relocations.
  *

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cf794f91/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
index 4d5d9c5..a94afd4 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
@@ -18,6 +18,7 @@ package org.apache.maven.it;
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.Map;
@@ -25,8 +26,6 @@ import java.util.Properties;
 
 import org.apache.maven.it.util.ResourceExtractor;
 
-import static junit.framework.Assert.assertEquals;
-
 /**
  * [MNG-5600] Dependency management import should support exclusions.
  *

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/cf794f91/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index fb149a4..82f66da 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -1,5 +1,24 @@
 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
+ *
+ *

maven-integration-testing git commit: MNG-5889 moved IT to its own test suite to run it only with 3.4.0

2016-11-13 Thread hboutemy 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 2e74409fc -> 3311f4e34


MNG-5889 moved IT to its own test suite to run it only with 3.4.0

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

Branch: refs/heads/master
Commit: 3311f4e345fe7e6c343fae737631b727aba5b910
Parents: 2e74409
Author: Hervé Boutemy 
Authored: Mon Nov 14 01:00:49 2016 +0100
Committer: Hervé Boutemy 
Committed: Mon Nov 14 01:00:49 2016 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 .../it/MavenITmng5771CoreExtensionsTest.java| 29 +++--
 .../it/MavenITmng5889CoreExtensionsTest.java| 44 
 3 files changed, 50 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3311f4e3/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 3713aa7..2f288fa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -105,6 +105,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class );
 suite.addTestSuite( 
MavenITmng6079DependencyManagementImportInterpolationTest.class );
 suite.addTestSuite( 
MavenITmng6049VersionRangeResultFilterExtensionTest.class );
 suite.addTestSuite( 
MavenITmng5527DependencyManagementImportRelocationsTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3311f4e3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index 9462bba..fb149a4 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -5,6 +5,11 @@ import java.util.Properties;
 
 import org.apache.maven.it.util.ResourceExtractor;
 
+/**
+ * This is a test set for https://issues.apache.org/jira/browse/MNG-5771;>MNG-5771:
+ * check that Maven loads core extensions and components contributed by 
.mvn/extensions.xml
+ * are available to regular plugins. 
+ */
 public class MavenITmng5771CoreExtensionsTest
 extends AbstractMavenIntegrationTestCase
 {
@@ -83,28 +88,4 @@ public class MavenITmng5771CoreExtensionsTest
 
 server.stop();
 }
-
-/**
- * check that .mvn/ is found when current dir does not 
contain pom.xml
- * but path to POM set by --file path/to/pom.xml
- */
-public void testCoreExtensionMNG5889File()
-throws Exception
-{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5771-core-extensions" );
-
-Verifier verifier = newVerifier( testDir.getAbsolutePath() ); // not 
client directory
-verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", 
verifier.newDefaultFilterProperties() );
-
-verifier = newVerifier( testDir.getAbsolutePath() );
-verifier.deleteDirectory( "client/target" );
-verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
-verifier.getCliOptions().add( "-s" );
-verifier.getCliOptions().add( new File( testDir, "settings.xml" 
).getAbsolutePath() );
-verifier.getCliOptions().add( "-f" ); // --file client/pom.xml
-verifier.getCliOptions().add( new File( testDir, "client/pom.xml" 
).getAbsolutePath() );
-verifier.executeGoal( "validate" );
-verifier.verifyErrorFreeLog();
-verifier.resetStreams();
-}
 }

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3311f4e3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889CoreExtensionsTest.java
--
diff --git

maven-integration-testing git commit: MNG-5889 added IT

2016-11-13 Thread hboutemy 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 06e3a23ae -> 2e74409fc


MNG-5889 added IT

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

Branch: refs/heads/master
Commit: 2e74409fc2593b4478c40f28c7fdabc60202c06b
Parents: 06e3a23
Author: Hervé Boutemy 
Authored: Mon Nov 14 00:37:52 2016 +0100
Committer: Hervé Boutemy 
Committed: Mon Nov 14 00:37:52 2016 +0100

--
 .../it/MavenITmng5771CoreExtensionsTest.java| 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/2e74409f/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index fd99a79..9462bba 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -83,6 +83,28 @@ public class MavenITmng5771CoreExtensionsTest
 
 server.stop();
 }
-
 
+/**
+ * check that .mvn/ is found when current dir does not 
contain pom.xml
+ * but path to POM set by --file path/to/pom.xml
+ */
+public void testCoreExtensionMNG5889File()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5771-core-extensions" );
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath() ); // not 
client directory
+verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", 
verifier.newDefaultFilterProperties() );
+
+verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.deleteDirectory( "client/target" );
+verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" );
+verifier.getCliOptions().add( "-s" );
+verifier.getCliOptions().add( new File( testDir, "settings.xml" 
).getAbsolutePath() );
+verifier.getCliOptions().add( "-f" ); // --file client/pom.xml
+verifier.getCliOptions().add( new File( testDir, "client/pom.xml" 
).getAbsolutePath() );
+verifier.executeGoal( "validate" );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+}
 }

maven git commit: forgot to remove the comment...

2016-11-13 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/master dfb4a7b7f -> cd14b36e2


forgot to remove the comment...

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

Branch: refs/heads/master
Commit: cd14b36e222b2e2707791679621c09e6285ee697
Parents: dfb4a7b
Author: Hervé Boutemy 
Authored: Sun Nov 13 23:12:06 2016 +0100
Committer: Hervé Boutemy 
Committed: Sun Nov 13 23:14:58 2016 +0100

--
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cd14b36e/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 9e5e6b8..cc658ee 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1122,7 +1122,6 @@ public class MavenCli
 
 String[] lines = msg.split( "(\r\n)|(\r)|(\n)" );
 String currentColor = "";
-// TODO add multi-line color support: detect last ANSI code and if not 
EOC, add it to next line
 
 for ( int i = 0; i < lines.length; i++ )
 {

maven git commit: [MNG-6117] ${session.parallel} not correctly set

2016-11-13 Thread gboue 
Repository: maven
Updated Branches:
  refs/heads/master f381cd4f2 -> dfb4a7b7f


[MNG-6117] ${session.parallel} not correctly set

MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.

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

Branch: refs/heads/master
Commit: dfb4a7b7f4225bc32385da139679e189a2aeb79a
Parents: f381cd4
Author: Guillaume Boué 
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué 
Committed: Sun Nov 13 22:46:18 2016 +0100

--
 .../multithreaded/MultiThreadedBuilder.java   | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/dfb4a7b7/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b24d785..14bf13b 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 
 /**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project).
+ * 
+ * This builder uses a number of threads equal to the minimum of the degree of 
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to 
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
  *
  * @since 3.0
  * @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus 
reactorBuildStatus )
 throws ExecutionException, InterruptedException
 {
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min( 
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min( 
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the 
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new 
BuildThreadFactory() );
 CompletionService service = new 
ExecutorCompletionService<>( executor );
 ConcurrencyDependencyGraph analyzer =
 new ConcurrencyDependencyGraph( projectBuilds, 
session.getProjectDependencyGraph() );

maven git commit: MNG-3507 added support for multi-lines error message with color

2016-11-13 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/master 3d4cd9445 -> f381cd4f2


MNG-3507 added support for multi-lines error message with color

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

Branch: refs/heads/master
Commit: f381cd4f2861461d97dfa8a7841212b0054a85ac
Parents: 3d4cd94
Author: Hervé Boutemy 
Authored: Sun Nov 13 22:37:01 2016 +0100
Committer: Hervé Boutemy 
Committed: Sun Nov 13 22:38:01 2016 +0100

--
 .../java/org/apache/maven/cli/MavenCli.java | 29 +++-
 1 file changed, 28 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f381cd4f/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index b703aff..9e5e6b8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -38,6 +38,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -1119,10 +1121,29 @@ public class MavenCli
 }
 
 String[] lines = msg.split( "(\r\n)|(\r)|(\n)" );
+String currentColor = "";
+// TODO add multi-line color support: detect last ANSI code and if not 
EOC, add it to next line
 
 for ( int i = 0; i < lines.length; i++ )
 {
-String line = indent + lines[i].trim();
+// add eventual current color inherited from previous line 
+String line = currentColor + lines[i];
+
+// look for last ANSI escape sequence to check if nextColor
+Matcher matcher = LAST_ANSI_SEQUENCE.matcher( line );
+String nextColor = "";
+if ( matcher.find() )
+{
+nextColor = matcher.group( 1 );
+if ( ANSI_RESET.equals( nextColor ) )
+{
+// last ANSI escape code is reset: no next color
+nextColor = "";
+}
+}
+
+// effective line, with indent and reset if end is colored
+line = indent + line + ( "".equals( nextColor ) ? "" : ANSI_RESET 
);
 
 if ( ( i == lines.length - 1 ) && ( showErrors
 || ( summary.getException() instanceof InternalErrorException 
) ) )
@@ -1133,6 +1154,8 @@ public class MavenCli
 {
 slf4jLogger.error( line );
 }
+
+currentColor = nextColor;
 }
 
 indent += "  ";
@@ -1143,6 +1166,10 @@ public class MavenCli
 }
 }
 
+private static final Pattern LAST_ANSI_SEQUENCE = Pattern.compile( 
"(\u001B\\[[;\\d]*[ -/]*[@-~])[^\u001B]*$" );
+
+private static final String ANSI_RESET = "\u001B\u005Bm";
+
 private void configure( CliRequest cliRequest )
 throws Exception
 {

svn commit: r1001066 [3/4] - in /websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/resources/ apidocs/org/apache/maven/p

2016-11-13 Thread schulte 
Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/custom-resource-filters.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/custom-resource-filters.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/custom-resource-filters.html
 Sun Nov 13 21:15:23 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Apache Maven Resources Plugin  Custom resource 
filters
 
@@ -79,9 +79,9 @@
 Custom resource filters
 
   
-  | Last Published: 2016-06-03
+  | Last Published: 2016-11-13
   
-Version: 3.0.1
+Version: 3.0.2
 
 
 
@@ -199,7 +199,7 @@
   
 Project Information
   
-   


   
+   

 
   
   
   
@@ -406,7 +406,7 @@ public class ItFilter
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-resources-plugin/artifactId
-version3.0.1/version
+version3.0.2/version
 configuration
   ...
 /configuration
@@ -429,7 +429,7 @@ public class ItFilter
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-resources-plugin/artifactId
-version3.0.1/version
+version3.0.2/version
 configuration
   ...
   mavenFilteringHints

Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/encoding.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/encoding.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/encoding.html
 Sun Nov 13 21:15:23 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Apache Maven Resources Plugin  Specifying a character 
encoding scheme
 
@@ -80,9 +80,9 @@ Karl Heinz Marbaise" />
 Specifying a character encoding scheme
 
   
-  | Last Published: 2016-06-03
+  | Last Published: 2016-11-13
   
-Version: 3.0.1
+Version: 3.0.2
 
 
 
@@ -200,7 +200,7 @@ Karl Heinz Marbaise" />
   
 Project Information
   
-   


   
+   

 
   
   
   
@@ -388,7 +388,7 @@ Karl Heinz Marbaise" />
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-resources-plugin/artifactId
-version3.0.1/version
+version3.0.2/version
 configuration
   ...
   encodingUTF-8/encoding

Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/escape-filtering.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/escape-filtering.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/examples/escape-filtering.html
 Sun Nov 13 21:15:23 2016
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Apache Maven Resources Plugin  Escape Filtering
 
@@ -79,9 +79,9 @@
 Escape Filtering
 
   
-  | Last Published: 2016-06-03
+  | Last Published: 2016-11-13
   
-Version: 3.0.1
+

svn commit: r1001066 [4/4] - in /websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugins/resources/ apidocs/org/apache/maven/p

2016-11-13 Thread schulte 
Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/deprecated-list.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/deprecated-list.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/deprecated-list.html
 Sun Nov 13 21:15:23 2016
@@ -1,15 +1,15 @@
 http://www.w3.org/TR/html4/loose.dtd;>
 
-
+
 
 
-Deprecated List (Apache Maven Resources Plugin 3.0.1 Test API)
+Deprecated List (Apache Maven Resources Plugin 3.0.2 Test API)
 
 
 
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/help-doc.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/help-doc.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/help-doc.html
 Sun Nov 13 21:15:23 2016
@@ -1,15 +1,15 @@
 http://www.w3.org/TR/html4/loose.dtd;>
 
-
+
 
 
-API Help (Apache Maven Resources Plugin 3.0.1 Test API)
+API Help (Apache Maven Resources Plugin 3.0.2 Test API)
 
 
 
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/index-all.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/index-all.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/index-all.html
 Sun Nov 13 21:15:23 2016
@@ -1,15 +1,15 @@
 http://www.w3.org/TR/html4/loose.dtd;>
 
-
+
 
 
-Index (Apache Maven Resources Plugin 3.0.1 Test API)
+Index (Apache Maven Resources Plugin 3.0.2 Test API)
 
 
 
 
 

Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/index.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/index.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/index.html
 Sun Nov 13 21:15:23 2016
@@ -1,9 +1,9 @@
 http://www.w3.org/TR/html4/frameset.dtd;>
 
-
+
 
 
-Apache Maven Resources Plugin 3.0.1 Test API
+Apache Maven Resources Plugin 3.0.2 Test API
 
 targetPage = "" + window.location.search;
 if (targetPage != "" && targetPage != "undefined")

Modified: 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.html
==
--- 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.html
 (original)
+++ 
websites/production/maven/components/plugins-archives/maven-resources-plugin-LATEST/testapidocs/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.html
 Sun Nov 13 21:15:23 2016
@@ -1,15 +1,15 @@
 http://www.w3.org/TR/html4/loose.dtd";>
 
-
+
 
 
-AbstractPropertyUtilsTest (Apache Maven Resources Plugin 3.0.1 Test 
API)
+AbstractPropertyUtilsTest (Apache Maven Resources Plugin 3.0.2 Test 
API)