[maven-shade-plugin] 02/02: fixing Tibor's review comments (thanks) and ensuring test works on windows

2019-08-14 Thread rmannibucau
This is an automated email from the ASF dual-hosted git repository.

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

commit e300c0438b401ebd977f7157f925f4b8a3f1caba
Author: Romain Manni-Bucau 
AuthorDate: Wed Aug 14 09:49:45 2019 +0200

fixing Tibor's review comments (thanks) and ensuring test works on windows
---
 .../plugins/shade/resource/properties/SortedProperties.java |  9 ++---
 .../org/apache/maven/plugins/shade/DefaultShaderTest.java   | 13 ++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
 
b/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
index 48eb5f0..f64f9f7 100644
--- 
a/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
+++ 
b/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +32,10 @@ import java.util.Properties;
 import java.util.Set;
 
 /**
- * Properties instance sorting its keys on iterations.
+ * Internal Properties instance sorting its keys on iterations for store() 
usages.
+ * It ensures properties persistence is deterministic.
+ *
+ * IMPORTANT: this only overrides methods used accross JVM in store() so 
ordering is not guaranteed for other cases.
  */
 public class SortedProperties extends Properties
 {
@@ -48,7 +51,7 @@ public class SortedProperties extends Properties
 return String.valueOf( o1.getKey() ).compareTo( 
String.valueOf( o2.getKey() ) );
 }
 } );
-return new HashSet<>( entries );
+return new LinkedHashSet<>( entries );
 }
 
 @Override
diff --git 
a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java 
b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
index 54be8dd..e736d6a 100644
--- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
@@ -65,7 +65,7 @@ public class DefaultShaderTest
 @Override
 public void debug( final String s, final Throwable throwable )
 {
-debugMessages.add(s);
+debugMessages.add( s.replace( '\\', '/' ).trim() );
 }
 
 @Override
@@ -77,7 +77,7 @@ public class DefaultShaderTest
 @Override
 public void warn( final String s, final Throwable throwable )
 {
-warnMessages.add(s);
+warnMessages.add( s.replace( '\\', '/' ).trim() );
 }
 
 @Override
@@ -101,7 +101,7 @@ public class DefaultShaderTest
 
 // we will shade two jars and expect to see META-INF/MANIFEST.MF 
overlaps, this will always be true
 // but this can lead to a broken deployment if intended for OSGi or 
so, so even this should be logged
-final Set set = new LinkedHashSet();
+final Set set = new LinkedHashSet<>();
 set.add( new File( "src/test/jars/test-project-1.0-SNAPSHOT.jar" ) );
 set.add( new File( "src/test/jars/plexus-utils-1.4.1.jar" ) );
 
@@ -115,13 +115,12 @@ public class DefaultShaderTest
 
 final String failureWarnMessage = warnMessages.toString();
 assertTrue(failureWarnMessage, warnMessages.contains(
-"plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define 
1 overlapping resources: "));
-assertTrue(failureWarnMessage, warnMessages.contains("  - 
META-INF/MANIFEST.MF"));
+"plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define 
1 overlapping resources:"));
+assertTrue(failureWarnMessage, warnMessages.contains("- 
META-INF/MANIFEST.MF"));
 
 final String failureDebugMessage = debugMessages.toString();
 assertTrue(failureDebugMessage, debugMessages.contains(
-"We have a duplicate META-INF/MANIFEST.MF in 
src/test/jars/plexus-utils-1.4.1.jar"
-.replace('/', File.separatorChar)));
+"We have a duplicate META-INF/MANIFEST.MF in 
src/test/jars/plexus-utils-1.4.1.jar" ));
 }
 
 public void testShaderWithDefaultShadedPattern()



[maven-shade-plugin] 01/02: Merge branch 'log-all-duplicates' into MSHADE-322_2

2019-08-14 Thread rmannibucau
This is an automated email from the ASF dual-hosted git repository.

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

commit 0db53c7705caee71575cf629cf6baefcc0efc863
Merge: 646c2c3 2682f6e
Author: Romain Manni-Bucau 
AuthorDate: Wed Aug 14 09:45:08 2019 +0200

Merge branch 'log-all-duplicates' into MSHADE-322_2

 .../apache/maven/plugins/shade/DefaultShader.java  | 48 +++---
 .../maven/plugins/shade/DefaultShaderTest.java | 73 ++
 2 files changed, 112 insertions(+), 9 deletions(-)



[maven-shade-plugin] branch MSHADE-322_2 updated (646c2c3 -> e300c04)

2019-08-14 Thread rmannibucau
This is an automated email from the ASF dual-hosted git repository.

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


from 646c2c3  extracting SortedProperties to be able to reuse it in the 
test validating properties keys stability + fixing related test
 add 2682f6e  [MSHADE-306] - log all duplicates to not silently swallow a 
duplicate and an implicit selection
 new 0db53c7  Merge branch 'log-all-duplicates' into MSHADE-322_2
 new e300c04  fixing Tibor's review comments (thanks) and ensuring test 
works on windows

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.


Summary of changes:
 .../apache/maven/plugins/shade/DefaultShader.java  | 48 ---
 .../resource/properties/SortedProperties.java  |  9 ++-
 .../maven/plugins/shade/DefaultShaderTest.java | 72 ++
 3 files changed, 117 insertions(+), 12 deletions(-)



[maven-shade-plugin] branch MSHADE-322_2 deleted (was e300c04)

2019-08-14 Thread rmannibucau
This is an automated email from the ASF dual-hosted git repository.

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


 was e300c04  fixing Tibor's review comments (thanks) and ensuring test 
works on windows

This change permanently discards the following revisions:

 discard e300c04  fixing Tibor's review comments (thanks) and ensuring test 
works on windows
 discard 0db53c7  Merge branch 'log-all-duplicates' into MSHADE-322_2
 discard 646c2c3  extracting SortedProperties to be able to reuse it in the 
test validating properties keys stability + fixing related test
 discard 2807e5f  [MSHADE-322] - fixing windows tests



[maven-shade-plugin] branch MSHADE-306 deleted (was cccc31d)

2019-08-14 Thread rmannibucau
This is an automated email from the ASF dual-hosted git repository.

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


 was 31d  [MSHADE-306] log all duplicates to not silently swallow a 
duplicate and an implicit selection

This change permanently discards the following revisions:

 discard 31d  [MSHADE-306] log all duplicates to not silently swallow a 
duplicate and an implicit selection



[maven-shade-plugin] branch master updated: [MSHADE-322][MSHADE-306] fixing Tibor's review comments and ensure master tests are deterministic

2019-08-14 Thread rmannibucau
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 57d78de  [MSHADE-322][MSHADE-306] fixing Tibor's review comments and 
ensure master tests are deterministic
57d78de is described below

commit 57d78de0664c359530f0e5c6a2bb1563b4b092d8
Author: Romain Manni-Bucau 
AuthorDate: Wed Aug 14 09:54:33 2019 +0200

[MSHADE-322][MSHADE-306] fixing Tibor's review comments and ensure master 
tests are deterministic
---
 .../plugins/shade/resource/properties/SortedProperties.java |  9 ++---
 .../org/apache/maven/plugins/shade/DefaultShaderTest.java   | 13 ++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
 
b/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
index 48eb5f0..f64f9f7 100644
--- 
a/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
+++ 
b/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +32,10 @@ import java.util.Properties;
 import java.util.Set;
 
 /**
- * Properties instance sorting its keys on iterations.
+ * Internal Properties instance sorting its keys on iterations for store() 
usages.
+ * It ensures properties persistence is deterministic.
+ *
+ * IMPORTANT: this only overrides methods used accross JVM in store() so 
ordering is not guaranteed for other cases.
  */
 public class SortedProperties extends Properties
 {
@@ -48,7 +51,7 @@ public class SortedProperties extends Properties
 return String.valueOf( o1.getKey() ).compareTo( 
String.valueOf( o2.getKey() ) );
 }
 } );
-return new HashSet<>( entries );
+return new LinkedHashSet<>( entries );
 }
 
 @Override
diff --git 
a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java 
b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
index 54be8dd..e736d6a 100644
--- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
@@ -65,7 +65,7 @@ public class DefaultShaderTest
 @Override
 public void debug( final String s, final Throwable throwable )
 {
-debugMessages.add(s);
+debugMessages.add( s.replace( '\\', '/' ).trim() );
 }
 
 @Override
@@ -77,7 +77,7 @@ public class DefaultShaderTest
 @Override
 public void warn( final String s, final Throwable throwable )
 {
-warnMessages.add(s);
+warnMessages.add( s.replace( '\\', '/' ).trim() );
 }
 
 @Override
@@ -101,7 +101,7 @@ public class DefaultShaderTest
 
 // we will shade two jars and expect to see META-INF/MANIFEST.MF 
overlaps, this will always be true
 // but this can lead to a broken deployment if intended for OSGi or 
so, so even this should be logged
-final Set set = new LinkedHashSet();
+final Set set = new LinkedHashSet<>();
 set.add( new File( "src/test/jars/test-project-1.0-SNAPSHOT.jar" ) );
 set.add( new File( "src/test/jars/plexus-utils-1.4.1.jar" ) );
 
@@ -115,13 +115,12 @@ public class DefaultShaderTest
 
 final String failureWarnMessage = warnMessages.toString();
 assertTrue(failureWarnMessage, warnMessages.contains(
-"plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define 
1 overlapping resources: "));
-assertTrue(failureWarnMessage, warnMessages.contains("  - 
META-INF/MANIFEST.MF"));
+"plexus-utils-1.4.1.jar, test-project-1.0-SNAPSHOT.jar define 
1 overlapping resources:"));
+assertTrue(failureWarnMessage, warnMessages.contains("- 
META-INF/MANIFEST.MF"));
 
 final String failureDebugMessage = debugMessages.toString();
 assertTrue(failureDebugMessage, debugMessages.contains(
-"We have a duplicate META-INF/MANIFEST.MF in 
src/test/jars/plexus-utils-1.4.1.jar"
-.replace('/', File.separatorChar)));
+"We have a duplicate META-INF/MANIFEST.MF in 
src/test/jars/plexus-utils-1.4.1.jar" ));
 }
 
 public void testShaderWithDefaultShadedPattern()



[maven-site] branch master updated: Retire maven-repository-builder

2019-08-14 Thread rfscholte
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new c3c382e  Retire maven-repository-builder
c3c382e is described below

commit c3c382e783c4188fd52e773659cb584a4b3439b8
Author: Robert Scholte 
AuthorDate: Wed Aug 14 22:30:58 2019 +0200

Retire maven-repository-builder
---
 content/apt/shared/index.apt | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/content/apt/shared/index.apt b/content/apt/shared/index.apt
index f761d4d..471aea3 100644
--- a/content/apt/shared/index.apt
+++ b/content/apt/shared/index.apt
@@ -30,8 +30,7 @@
 
 Shared Components
 
-The shared components are currently under transition to Maven 3.x only 
components.
-
+  The shared components are currently under transition to Maven 3.x only 
components.
 
 
*+--+---+--++-+
 || <>  
|| <> || <> || <> || <> 
|| <> |
@@ -64,8 +63,6 @@ The shared components are currently under transition to Maven 
3.x only component
 
*+--+---+--++-+
 | {{{/shared/maven-reporting-impl/} <<>>}} | 
3.0.0| 2017-06-21| Abstract classes to manage report 
generation. | 
{{{https://gitbox.apache.org/repos/asf/maven-reporting-impl.git}Git}} / 
{{{https://github.com/apache/maven-reporting-impl/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13274}JIRA}}
 
*+--+---+--++-+
-| {{{/shared/maven-repository-builder/} <<>>}} | 
1.0  | 2014-11-11|  | 
{{{https://gitbox.apache.org/repos/asf/maven-repository-builder.git}Git}} / 
{{{https://github.com/apache/maven-repository-builder/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13275}JIRA}}
-*+--+---+--++-+
 | {{{/shared/maven-script-interpreter/} <<>>}} | 
1.2  | 2017-07-21| Utilities to interpret/execute some scripts 
for various implementations: groovy or beanshell. | 
{{{https://gitbox.apache.org/repos/asf/maven-script-interpreter.git}Git}} / 
{{{https://github.com/apache/maven-script-interpreter/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/15256}JIRA}}
 
*+--+---+--++-+
 | {{{/shared/maven-shared-incremental/} <<>>}} | 
1.1  | 2013-04-08| Various utility classes and plexus 
components for supporting incremental build functionality in Maven plugins. | 
{{{https://gitbox.apache.org/repos/asf/maven-shared-incremental.git}Git}} / 
{{{https://github.com/apache/maven-shared-incremental/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/15650}JIRA}}



[maven-integration-testing] branch master updated: [MNG-6731] Jetty getLocalPort() returns -1 resulting in build failures

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/master by this push:
 new 95fd13d  [MNG-6731] Jetty getLocalPort() returns -1 resulting in build 
failures
95fd13d is described below

commit 95fd13d670137fee44381139dbe3655b69fafe39
Author: tibordigana 
AuthorDate: Sat Aug 10 23:54:48 2019 +0200

[MNG-6731] Jetty getLocalPort() returns -1 resulting in build failures
---
 core-it-suite/pom.xml  |  33 +
 .../test/java/org/apache/maven/it/HttpServer.java  |  13 +-
 .../org/apache/maven/it/IntegrationTestSuite.java  |   2 +
 .../it/MavenIT0146InstallerSnapshotNaming.java |  22 ++-
 .../MavenITmng0553SettingsAuthzEncryptionTest.java |  50 +++
 .../maven/it/MavenITmng0768OfflineModeTest.java|  31 ++--
 .../it/MavenITmng2305MultipleProxiesTest.java  |  55 +---
 .../maven/it/MavenITmng2387InactiveProxyTest.java  |  35 ++---
 .../MavenITmng3415JunkRepositoryMetadataTest.java  |  22 ++-
 .../maven/it/MavenITmng3461MirrorMatchingTest.java |  29 ++--
 ...MavenITmng3599useHttpProxyForWebDAVMk2Test.java |  22 ++-
 .../MavenITmng3599useHttpProxyForWebDAVTest.java   |  23 ++-
 .../it/MavenITmng3652UserAgentHeaderTest.java  |  32 ++---
 .../MavenITmng3953AuthenticatedDeploymentTest.java |  55 
 .../it/MavenITmng4068AuthenticatedMirrorTest.java  |  50 +++
 ...enITmng4235HttpAuthDeploymentChecksumsTest.java |  82 +--
 ...4326LocalSnapshotSuppressesRemoteCheckTest.java |  23 ++-
 ...venITmng4343MissingReleaseUpdatePolicyTest.java |  23 ++-
 ...ITmng4348NoUnnecessaryRepositoryAccessTest.java |  29 ++--
 .../maven/it/MavenITmng4360WebDavSupportTest.java  |  29 ++--
 ...avenITmng4413MirroringOfDependencyRepoTest.java |  45 +++---
 .../it/MavenITmng4428FollowHttpRedirectTest.java   |  66 +
 ...469AuthenticatedDeploymentToCustomRepoTest.java |  55 
 ...Tmng4470AuthenticatedDeploymentToProxyTest.java |  63 +
 ...MavenITmng4489MirroringOfExtensionRepoTest.java |  45 +++---
 ...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java |  32 ++---
 ...avenITmng4554PluginPrefixMappingUpdateTest.java |  68 +
 ...nITmng4555MetaversionResolutionOfflineTest.java |  23 ++-
 .../MavenITmng4561MirroringOfPluginRepoTest.java   |  45 +++---
 ...729MirrorProxyAuthUsedByProjectBuilderTest.java |  45 +++---
 ...refixResolutionDoesntTouchDisabledRepoTest.java |  30 ++--
 ...rsionResolutionDoesntTouchDisabledRepoTest.java |  30 ++--
 ...nITmng4781DeploymentToNexusStagingRepoTest.java |  33 ++---
 .../maven/it/MavenITmng4991NonProxyHostsTest.java  |  33 ++---
 .../MavenITmng5064SuppressSnapshotUpdatesTest.java |  32 ++---
 .../maven/it/MavenITmng5175WagonHttpTest.java  |  29 ++--
 ...g5280SettingsProfilesRepositoriesOrderTest.java |  50 +++
 .../src/test/java/org/mortbay/log/StdErrLog.java   | 157 -
 38 files changed, 682 insertions(+), 859 deletions(-)

diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index e1c484d..5b3536b 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -110,50 +110,27 @@ under the License.
   
 
-
 
-  org.mortbay.jetty
-  jetty
-  6.1.14
-  
-  
-
-  servlet-api-2.5
-  org.mortbay.jetty
-
-  
+  org.eclipse.jetty
+  jetty-server
+  ${jetty9Version}
 
 
   org.apache.maven.shared
   maven-shared-utils
   0.9
 
-
-
 
   org.eclipse.jetty
-  jetty-server
-  ${jetty9Version}
-
-
-  org.eclipse.jetty
-  jetty-security
+  jetty-util
   ${jetty9Version}
 
 
   org.eclipse.jetty
-  jetty-util
+  jetty-servlet
   ${jetty9Version}
 
 
-  org.eclipse.jetty.orbit
-  javax.servlet
-  3.0.0.v201112011016
-
-
   com.google.guava
   guava
   16.0
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java 
b/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
index 2f10b84..8d87dd5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/HttpServer.java
@@ -5,6 +5,8 @@ import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -66,21 +68,20 @@ public class HttpServer
 
 public int port()
 {
-return ( (ServerConnector) server.getConnectors()[0] ).getLocalPort();
+  

[maven-integration-testing] branch MNG-6731 deleted (was 1c6e39a)

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch MNG-6731
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.


 was 1c6e39a  [MNG-6731] Jetty getLocalPort() returns -1 resulting in build 
failures

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] branch MNG-6731 deleted (was 775922d)

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch MNG-6731
in repository https://gitbox.apache.org/repos/asf/maven.git.


 was 775922d  linked with core-its/MNG-6731

This change permanently discards the following revisions:

 discard 775922d  linked with core-its/MNG-6731



[maven-resolver] branch pre-MRESOLVER-92 deleted (was 4e5d3cf)

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch pre-MRESOLVER-92
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git.


 was 4e5d3cf  [MRESOLVER-92] Revert MRESOLVER-7

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-archetype] branch buildfix updated: ugly experiment

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch buildfix
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git


The following commit(s) were added to refs/heads/buildfix by this push:
 new 1bdf29c  ugly experiment
1bdf29c is described below

commit 1bdf29c69f85f72db7b40c66951fefca264670be
Author: tibordigana 
AuthorDate: Thu Aug 15 00:46:40 2019 +0200

ugly experiment
---
 maven-archetype-plugin/src/it/mrm/settings.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/maven-archetype-plugin/src/it/mrm/settings.xml 
b/maven-archetype-plugin/src/it/mrm/settings.xml
index bcae17c..e3dcff1 100644
--- a/maven-archetype-plugin/src/it/mrm/settings.xml
+++ b/maven-archetype-plugin/src/it/mrm/settings.xml
@@ -24,7 +24,7 @@ under the License.
   mrm-maven-plugin
   Mock Repository Manager
   @repository.proxy.url@
-  *,!archetype
+  !archetype
 
   
   
@@ -40,16 +40,16 @@ under the License.
   
 true
 ignore
-never
+
   
-  
+  
 
   
-  
+  
 
 
 
@@ -76,12 +76,12 @@ under the License.
   
 true
 ignore
-never
+
   
   
-true
-ignore
-always
+false
+
   
 
   



[maven-archetype] branch buildfix updated: Revert "ugly experiment"

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch buildfix
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git


The following commit(s) were added to refs/heads/buildfix by this push:
 new a86369f  Revert "ugly experiment"
a86369f is described below

commit a86369fdcc6e4caea914e2faef06c885a84bb152
Author: tibordigana 
AuthorDate: Thu Aug 15 01:05:32 2019 +0200

Revert "ugly experiment"

This reverts commit 1bdf29c6
---
 maven-archetype-plugin/src/it/mrm/settings.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/maven-archetype-plugin/src/it/mrm/settings.xml 
b/maven-archetype-plugin/src/it/mrm/settings.xml
index e3dcff1..bcae17c 100644
--- a/maven-archetype-plugin/src/it/mrm/settings.xml
+++ b/maven-archetype-plugin/src/it/mrm/settings.xml
@@ -24,7 +24,7 @@ under the License.
   mrm-maven-plugin
   Mock Repository Manager
   @repository.proxy.url@
-  !archetype
+  *,!archetype
 
   
   
@@ -40,16 +40,16 @@ under the License.
   
 true
 ignore
-
+never
   
-  
+  
 
   
-  
+  
 
 
 
@@ -76,12 +76,12 @@ under the License.
   
 true
 ignore
-
+never
   
   
-false
-
+true
+ignore
+always
   
 
   



[maven-site] branch master updated: Update versions

2019-08-14 Thread rfscholte
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 990292b  Update versions
990292b is described below

commit 990292bfd67bf18992bb9003a589f721b575d173
Author: Robert Scholte 
AuthorDate: Wed Aug 14 22:19:33 2019 +0200

Update versions
---
 content/apt/skins/index.apt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/apt/skins/index.apt b/content/apt/skins/index.apt
index d456bca..ce30627 100644
--- a/content/apt/skins/index.apt
+++ b/content/apt/skins/index.apt
@@ -38,9 +38,9 @@ Available Skins
 
*---+--+--+--+++
 || <> || 
<> || Site Plugin Version || <> || <> 
|| <>
 
*---+--+--+--+++
-| {{{/skins/maven-default-skin/} <<>>}} | 1.2  
| [3.5,)   | You get this skin if you don't specify any skin or 
template. | {{{http://gitbox.apache.org/repos/asf/maven-default-skin/}Git}} / 
{{{https://github.com/apache/maven-default-skin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSKINS/component/12326472}Jira MSKINS}}
+| {{{/skins/maven-default-skin/} <<>>}} | 1.3  
| [3.5,)   | You get this skin if you don't specify any skin or 
template. | {{{http://gitbox.apache.org/repos/asf/maven-default-skin/}Git}} / 
{{{https://github.com/apache/maven-default-skin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSKINS/component/12326472}Jira MSKINS}}
 
*---+--+--+--+++
-| {{{/skins/maven-fluido-skin/} <<>>}}   | 1.7  
| [3.7,)   | Skin based on Bootstrap CSS. | 
{{{http://gitbox.apache.org/repos/asf/maven-fluido-skin/}Git}} / 
{{{https://github.com/apache/maven-fluido-skin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSKINS/component/12326474}Jira MSKINS}}
+| {{{/skins/maven-fluido-skin/} <<>>}}   | 1.8  
| [3.7,)   | Skin based on Bootstrap CSS. | 
{{{http://gitbox.apache.org/repos/asf/maven-fluido-skin/}Git}} / 
{{{https://github.com/apache/maven-fluido-skin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSKINS/component/12326474}Jira MSKINS}}
 
*---+--+--+--+++
 
 ** Retired



[maven-site] branch master updated: Update version maven-site-plugin

2019-08-14 Thread rfscholte
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 3cf8cb3  Update version maven-site-plugin
3cf8cb3 is described below

commit 3cf8cb37e7f9bc144048d7982c9b3b51fb94c5ec
Author: Robert Scholte 
AuthorDate: Wed Aug 14 22:21:59 2019 +0200

Update version maven-site-plugin
---
 content/apt/plugins/index.apt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt
index cd65f92..bfdab55 100644
--- a/content/apt/plugins/index.apt
+++ b/content/apt/plugins/index.apt
@@ -79,7 +79,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-resources-plugin/} <<>>}}   | B  | 
3.1.0| 2018-04-23 | Copy the resources to the output directory for 
including in the JAR. | 
{{{https://gitbox.apache.org/repos/asf/maven-resources-plugin.git}Git}} / 
{{{https://github.com/apache/maven-resources-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MRESOURCES}Jira MRESOURCES}}
 
*--++--++--+++
-| {{{/plugins/maven-site-plugin/} <<>>}} | B  | 
3.7.1| 2018-04-27 | Generate a site for the current project. | 
{{{https://gitbox.apache.org/repos/asf/maven-site-plugin.git}Git}} / 
{{{https://github.com/apache/maven-site-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSITE}Jira MSITE}}
+| {{{/plugins/maven-site-plugin/} <<>>}} | B  | 
3.8.2| 2019-07-24 | Generate a site for the current project. | 
{{{https://gitbox.apache.org/repos/asf/maven-site-plugin.git}Git}} / 
{{{https://github.com/apache/maven-site-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSITE}Jira MSITE}}
 
*--++--++--+++
 | {{{/surefire/maven-surefire-plugin/} <<>>}}| B  | 
3.0.0-M3 | 2018-12-23 | Run the JUnit unit tests in an isolated 
classloader. | {{{https://gitbox.apache.org/repos/asf/maven-surefire.git}Git}} 
/ {{{https://github.com/apache/maven-surefire/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/SUREFIRE}Jira SUREFIRE}}
 
*--++--++--+++



[maven-resolver] branch master updated: [MRESOLVER-92] Revert MRESOLVER-7

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 18dd2b5  [MRESOLVER-92] Revert MRESOLVER-7
18dd2b5 is described below

commit 18dd2b5cde851256a9f44db25097efee0691d6b4
Author: tibordigana 
AuthorDate: Sun Aug 11 14:39:53 2019 +0200

[MRESOLVER-92] Revert MRESOLVER-7
---
 .../eclipse/aether/internal/impl/collect/Args.java |  70 --
 .../aether/internal/impl/collect/DataPool.java | 112 ++-
 .../DefaultDependencyCollectionContext.java| 178 +
 .../impl/collect/DefaultDependencyCollector.java   | 880 +
 .../impl/collect/DependencyCollectionUtils.java| 173 
 .../internal/impl/collect/DependencyContext.java   |  74 --
 .../impl/collect/PremanagedDependency.java | 149 
 .../aether/internal/impl/collect/Results.java  |  84 --
 .../aether/internal/impl/collect/DataPoolTest.java |  19 +-
 .../collect/DefaultDependencyCollectorTest.java|  39 -
 .../artifact-descriptions/gid3_aid1_1.ini  |   7 -
 .../artifact-descriptions/gid3_aid2_1.ini  |   2 -
 .../artifact-descriptions/gid3_aid3_1.ini  |   2 -
 .../artifact-descriptions/gid3_aid3_2.ini  |   2 -
 .../aether/util/concurrency/FutureResult.java  |  69 --
 15 files changed, 604 insertions(+), 1256 deletions(-)

diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Args.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Args.java
deleted file mode 100644
index e2c1229..000
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/Args.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.eclipse.aether.internal.impl.collect;
-
-/*
- * 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.util.concurrent.ExecutorService;
-
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.util.ConfigUtils;
-import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
-
-class Args
-{
-
-final RepositorySystemSession session;
-
-final boolean ignoreRepos;
-
-final boolean premanagedState;
-
-final RequestTrace trace;
-
-final DataPool pool;
-
-final NodeStack nodes;
-
-final DefaultDependencyCollectionContext collectionContext;
-
-final DefaultVersionFilterContext versionContext;
-
-final CollectRequest request;
-
-final ExecutorService executor;
-
-@SuppressWarnings( "checkstyle:parameternumber" )
-Args( RepositorySystemSession session, RequestTrace trace, DataPool pool, 
NodeStack nodes,
-  DefaultDependencyCollectionContext collectionContext, 
DefaultVersionFilterContext versionContext,
-  CollectRequest request, ExecutorService executor )
-{
-this.session = session;
-this.request = request;
-this.ignoreRepos = session.isIgnoreArtifactDescriptorRepositories();
-this.premanagedState = ConfigUtils.getBoolean( session, false, 
DependencyManagerUtils.CONFIG_PROP_VERBOSE );
-this.trace = trace;
-this.pool = pool;
-this.nodes = nodes;
-this.collectionContext = collectionContext;
-this.versionContext = versionContext;
-this.executor = executor;
-}
-
-}
diff --git 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
index 10e9ab6..41b5703 100644
--- 
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
+++ 
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
@@ -19,16 +19,13 @@ package org.eclipse.aether.internal.impl.collect;
  * under the License.
  */
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.WeakHashMap;

[maven-surefire] branch SUREFIRE-1679 created (now cae2550)

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch SUREFIRE-1679
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.


  at cae2550  [SUREFIRE-1679] Prevent classpath caching from causing 
pollution

This branch includes the following new commits:

 new cae2550  [SUREFIRE-1679] Prevent classpath caching from causing 
pollution

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-surefire] 01/01: [SUREFIRE-1679] Prevent classpath caching from causing pollution

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch SUREFIRE-1679
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit cae25506a71bbdf196efbe0173d636bb83b7d7e4
Author: Andy Wilkinson 
AuthorDate: Wed Aug 14 08:51:42 2019 +0100

[SUREFIRE-1679] Prevent classpath caching from causing pollution

Previously, classpath caching was performed statically. This resulted
in the classpath cached by one project for a particular provider
being used by a subsequent project. As a result any customizations to
the classpath, such as removing duplicate artifacts, would leak out
and pollute the classpath used by subsequent projects.

This commit prevents the pollution by making the classpath cache
instance-scoped so that the cache is only used by a single mojo and,
therefore, a single project.
---
 .../plugin/surefire/AbstractSurefireMojo.java  | 41 ++
 .../maven/plugin/surefire/ClasspathCache.java  |  1 +
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 2f179e8..3d03c10 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -158,6 +158,8 @@ public abstract class AbstractSurefireMojo
 private static final Platform PLATFORM = new Platform();
 
 private final ProviderDetector providerDetector = new ProviderDetector();
+
+private final ClasspathCache classpathCache = new ClasspathCache();
 
 /**
  * Note: use the legacy system property disableXmlReport set to 
{@code true} to disable the report.
@@ -1787,10 +1789,10 @@ public abstract class AbstractSurefireMojo
 {
 Classpath testClasspath = testClasspathWrapper.toClasspath();
 
-Classpath providerClasspath = ClasspathCache.getCachedClassPath( 
providerName );
+Classpath providerClasspath = classpathCache.getCachedClassPath( 
providerName );
 if ( providerClasspath == null )
 {
-providerClasspath = ClasspathCache.setCachedClasspath( 
providerName, providerArtifacts );
+providerClasspath = classpathCache.setCachedClasspath( 
providerName, providerArtifacts );
 }
 
 getConsoleLogger().debug( testClasspath.getLogMessage( "test 
classpath:" ) );
@@ -1868,10 +1870,10 @@ public abstract class AbstractSurefireMojo
 {
 Classpath testClasspath = testClasspathWrapper.toClasspath();
 
-Classpath providerClasspath = ClasspathCache.getCachedClassPath( 
providerName );
+Classpath providerClasspath = classpathCache.getCachedClassPath( 
providerName );
 if ( providerClasspath == null )
 {
-providerClasspath = ClasspathCache.setCachedClasspath( 
providerName, providerArtifacts );
+providerClasspath = classpathCache.setCachedClasspath( 
providerName, providerArtifacts );
 }
 
 ResolvePathsRequest req = ResolvePathsRequest.ofStrings( 
testClasspath.getClassPath() )
@@ -2629,7 +2631,7 @@ public abstract class AbstractSurefireMojo
 
 private Classpath getArtifactClasspath( Artifact surefireArtifact )
 {
-Classpath existing = ClasspathCache.getCachedClassPath( 
surefireArtifact.getArtifactId() );
+Classpath existing = classpathCache.getCachedClassPath( 
surefireArtifact.getArtifactId() );
 if ( existing == null )
 {
 List items = new ArrayList<>();
@@ -2643,7 +2645,7 @@ public abstract class AbstractSurefireMojo
 items.add( artifact.getFile().getAbsolutePath() );
 }
 existing = new Classpath( items );
-ClasspathCache.setCachedClasspath( 
surefireArtifact.getArtifactId(), existing );
+classpathCache.setCachedClasspath( 
surefireArtifact.getArtifactId(), existing );
 }
 return existing;
 }
@@ -3839,4 +3841,31 @@ public abstract class AbstractSurefireMojo
 throw new IllegalArgumentException( "Fork mode " + forkMode + " is 
not a legal value" );
 }
 }
+
+private static final class ClasspathCache
+{
+private final ConcurrentHashMap classpaths = new 
ConcurrentHashMap<>( 4 );
+
+private Classpath getCachedClassPath( @Nonnull String artifactId )
+{
+return classpaths.get( artifactId );
+}
+
+private void setCachedClasspath( @Nonnull String key, @Nonnull 
Classpath classpath )
+{
+   classpaths.put( key, classpath );
+}
+
+private Classpath setCachedClasspath( @Nonnull String key, @Nonnull 
Set artifacts )
+{
+Collection files 

[maven-surefire] branch SUREFIRE-1679 updated (cae2550 -> 0cf43c9)

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch SUREFIRE-1679
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.


 discard cae2550  [SUREFIRE-1679] Prevent classpath caching from causing 
pollution
 new 0cf43c9  [SUREFIRE-1679] Prevent classpath caching from causing 
pollution

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   (cae2550)
\
 N -- N -- N   refs/heads/SUREFIRE-1679 (0cf43c9)

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:
 .../plugin/surefire/AbstractSurefireMojo.java  |  8 +--
 .../plugin/surefire/AbstractSurefireMojoTest.java  | 61 ++
 2 files changed, 65 insertions(+), 4 deletions(-)



[maven-surefire] 01/01: [SUREFIRE-1679] Prevent classpath caching from causing pollution

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch SUREFIRE-1679
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 0cf43c99128f9dffa86874e6de97a8c11266c77b
Author: Andy Wilkinson 
AuthorDate: Wed Aug 14 08:51:42 2019 +0100

[SUREFIRE-1679] Prevent classpath caching from causing pollution

Previously, classpath caching was performed statically. This resulted
in the classpath cached by one project for a particular provider
being used by a subsequent project. As a result any customizations to
the classpath, such as removing duplicate artifacts, would leak out
and pollute the classpath used by subsequent projects.

This commit prevents the pollution by making the classpath cache
instance-scoped so that the cache is only used by a single mojo and,
therefore, a single project.
---
 .../plugin/surefire/AbstractSurefireMojo.java  | 41 ---
 .../maven/plugin/surefire/ClasspathCache.java  |  1 +
 .../plugin/surefire/AbstractSurefireMojoTest.java  | 61 ++
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 2f179e8..e2c69b6 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -159,6 +159,8 @@ public abstract class AbstractSurefireMojo
 
 private final ProviderDetector providerDetector = new ProviderDetector();
 
+private final ClasspathCache classpathCache = new ClasspathCache();
+
 /**
  * Note: use the legacy system property disableXmlReport set to 
{@code true} to disable the report.
  */
@@ -1787,10 +1789,10 @@ public abstract class AbstractSurefireMojo
 {
 Classpath testClasspath = testClasspathWrapper.toClasspath();
 
-Classpath providerClasspath = ClasspathCache.getCachedClassPath( 
providerName );
+Classpath providerClasspath = classpathCache.getCachedClassPath( 
providerName );
 if ( providerClasspath == null )
 {
-providerClasspath = ClasspathCache.setCachedClasspath( 
providerName, providerArtifacts );
+providerClasspath = classpathCache.setCachedClasspath( 
providerName, providerArtifacts );
 }
 
 getConsoleLogger().debug( testClasspath.getLogMessage( "test 
classpath:" ) );
@@ -1868,10 +1870,10 @@ public abstract class AbstractSurefireMojo
 {
 Classpath testClasspath = testClasspathWrapper.toClasspath();
 
-Classpath providerClasspath = ClasspathCache.getCachedClassPath( 
providerName );
+Classpath providerClasspath = classpathCache.getCachedClassPath( 
providerName );
 if ( providerClasspath == null )
 {
-providerClasspath = ClasspathCache.setCachedClasspath( 
providerName, providerArtifacts );
+providerClasspath = classpathCache.setCachedClasspath( 
providerName, providerArtifacts );
 }
 
 ResolvePathsRequest req = ResolvePathsRequest.ofStrings( 
testClasspath.getClassPath() )
@@ -2629,7 +2631,7 @@ public abstract class AbstractSurefireMojo
 
 private Classpath getArtifactClasspath( Artifact surefireArtifact )
 {
-Classpath existing = ClasspathCache.getCachedClassPath( 
surefireArtifact.getArtifactId() );
+Classpath existing = classpathCache.getCachedClassPath( 
surefireArtifact.getArtifactId() );
 if ( existing == null )
 {
 List items = new ArrayList<>();
@@ -2643,7 +2645,7 @@ public abstract class AbstractSurefireMojo
 items.add( artifact.getFile().getAbsolutePath() );
 }
 existing = new Classpath( items );
-ClasspathCache.setCachedClasspath( 
surefireArtifact.getArtifactId(), existing );
+classpathCache.setCachedClasspath( 
surefireArtifact.getArtifactId(), existing );
 }
 return existing;
 }
@@ -3839,4 +3841,31 @@ public abstract class AbstractSurefireMojo
 throw new IllegalArgumentException( "Fork mode " + forkMode + " is 
not a legal value" );
 }
 }
+
+private static final class ClasspathCache
+{
+private final Map classpaths = new HashMap<>( 4 );
+
+private Classpath getCachedClassPath( @Nonnull String artifactId )
+{
+return classpaths.get( artifactId );
+}
+
+private void setCachedClasspath( @Nonnull String key, @Nonnull 
Classpath classpath )
+{
+classpaths.put( key, classpath );
+}
+
+private Classpath setCachedClasspath( @Nonnull String key, @Nonnull 
Set artifacts )
+{
+Collection files = new 

[maven-surefire] branch master updated: [SUREFIRE-1679] Prevent classpath caching from causing pollution

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new f7d4310  [SUREFIRE-1679] Prevent classpath caching from causing 
pollution
f7d4310 is described below

commit f7d43102173568f4272325ad71e334279b91db17
Author: Andy Wilkinson 
AuthorDate: Wed Aug 14 08:51:42 2019 +0100

[SUREFIRE-1679] Prevent classpath caching from causing pollution

Previously, classpath caching was performed statically. This resulted
in the classpath cached by one project for a particular provider
being used by a subsequent project. As a result any customizations to
the classpath, such as removing duplicate artifacts, would leak out
and pollute the classpath used by subsequent projects.

This commit prevents the pollution by making the classpath cache
instance-scoped so that the cache is only used by a single mojo and,
therefore, a single project.
---
 .../plugin/surefire/AbstractSurefireMojo.java  | 41 ---
 .../maven/plugin/surefire/ClasspathCache.java  |  1 +
 .../plugin/surefire/AbstractSurefireMojoTest.java  | 61 ++
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 2f179e8..e2c69b6 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -159,6 +159,8 @@ public abstract class AbstractSurefireMojo
 
 private final ProviderDetector providerDetector = new ProviderDetector();
 
+private final ClasspathCache classpathCache = new ClasspathCache();
+
 /**
  * Note: use the legacy system property disableXmlReport set to 
{@code true} to disable the report.
  */
@@ -1787,10 +1789,10 @@ public abstract class AbstractSurefireMojo
 {
 Classpath testClasspath = testClasspathWrapper.toClasspath();
 
-Classpath providerClasspath = ClasspathCache.getCachedClassPath( 
providerName );
+Classpath providerClasspath = classpathCache.getCachedClassPath( 
providerName );
 if ( providerClasspath == null )
 {
-providerClasspath = ClasspathCache.setCachedClasspath( 
providerName, providerArtifacts );
+providerClasspath = classpathCache.setCachedClasspath( 
providerName, providerArtifacts );
 }
 
 getConsoleLogger().debug( testClasspath.getLogMessage( "test 
classpath:" ) );
@@ -1868,10 +1870,10 @@ public abstract class AbstractSurefireMojo
 {
 Classpath testClasspath = testClasspathWrapper.toClasspath();
 
-Classpath providerClasspath = ClasspathCache.getCachedClassPath( 
providerName );
+Classpath providerClasspath = classpathCache.getCachedClassPath( 
providerName );
 if ( providerClasspath == null )
 {
-providerClasspath = ClasspathCache.setCachedClasspath( 
providerName, providerArtifacts );
+providerClasspath = classpathCache.setCachedClasspath( 
providerName, providerArtifacts );
 }
 
 ResolvePathsRequest req = ResolvePathsRequest.ofStrings( 
testClasspath.getClassPath() )
@@ -2629,7 +2631,7 @@ public abstract class AbstractSurefireMojo
 
 private Classpath getArtifactClasspath( Artifact surefireArtifact )
 {
-Classpath existing = ClasspathCache.getCachedClassPath( 
surefireArtifact.getArtifactId() );
+Classpath existing = classpathCache.getCachedClassPath( 
surefireArtifact.getArtifactId() );
 if ( existing == null )
 {
 List items = new ArrayList<>();
@@ -2643,7 +2645,7 @@ public abstract class AbstractSurefireMojo
 items.add( artifact.getFile().getAbsolutePath() );
 }
 existing = new Classpath( items );
-ClasspathCache.setCachedClasspath( 
surefireArtifact.getArtifactId(), existing );
+classpathCache.setCachedClasspath( 
surefireArtifact.getArtifactId(), existing );
 }
 return existing;
 }
@@ -3839,4 +3841,31 @@ public abstract class AbstractSurefireMojo
 throw new IllegalArgumentException( "Fork mode " + forkMode + " is 
not a legal value" );
 }
 }
+
+private static final class ClasspathCache
+{
+private final Map classpaths = new HashMap<>( 4 );
+
+private Classpath getCachedClassPath( @Nonnull String artifactId )
+{
+return classpaths.get( artifactId );
+}
+
+private void setCachedClasspath( @Nonnull String key, @Nonnull 
Classpath classpath )
+{
+classpaths.put( key, 

[maven-surefire] branch SUREFIRE-1679 deleted (was 0cf43c9)

2019-08-14 Thread tibordigana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch SUREFIRE-1679
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.


 was 0cf43c9  [SUREFIRE-1679] Prevent classpath caching from causing 
pollution

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



svn commit: r1865200 [5/6] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do

2019-08-14 Thread svn-site-role
Modified: maven/website/content/maven-conventions.html
==
--- maven/website/content/maven-conventions.html (original)
+++ maven/website/content/maven-conventions.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Maven Conventions
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Conventions https://github.com/apache/maven-site/tree/master/content/markdown/maven-conventions.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/maven-features.html
==
--- maven/website/content/maven-features.html (original)
+++ maven/website/content/maven-features.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Maven Features
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Features https://github.com/apache/maven-site/tree/master/content/apt/maven-features.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/maven-jsr330.html
==
--- maven/website/content/maven-jsr330.html (original)
+++ maven/website/content/maven-jsr330.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Maven & JSR-330
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven & JSR-330 https://github.com/apache/maven-site/tree/master/content/markdown/maven-jsr330.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/maven-logging.html
==
--- maven/website/content/maven-logging.html (original)
+++ maven/website/content/maven-logging.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Maven 3.1.x logging
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven 3.1.x logging https://github.com/apache/maven-site/tree/master/content/markdown/maven-logging.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/maven-site-1.0-site.jar
==
Binary files - no diff available.

Modified: maven/website/content/maven1.html
==
--- maven/website/content/maven1.html (original)
+++ maven/website/content/maven1.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Information for Maven 1.0 Users
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Information for Maven 1.0 Users https://github.com/apache/maven-site/tree/master/content/fml/maven1.fml;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/plugin-developers/common-bugs.html
==
--- maven/website/content/plugin-developers/common-bugs.html (original)
+++ maven/website/content/plugin-developers/common-bugs.html Thu Aug 15 
04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Common Bugs and Pitfalls
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Common Bugs and Pitfalls https://github.com/apache/maven-site/tree/master/content/apt/plugin-developers/common-bugs.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: 
maven/website/content/plugin-developers/cookbook/add-build-time-to-manifest.html
==
--- 
maven/website/content/plugin-developers/cookbook/add-build-time-to-manifest.html
 (original)
+++ 

svn commit: r1865200 [2/6] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do

2019-08-14 Thread svn-site-role
Modified: maven/website/content/docs/2.0.11/release-notes.html
==
--- maven/website/content/docs/2.0.11/release-notes.html (original)
+++ maven/website/content/docs/2.0.11/release-notes.html Thu Aug 15 04:14:48 
2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.11
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.11 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0.11/release-notes.apt.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/2.0.2/release-notes.html
==
--- maven/website/content/docs/2.0.2/release-notes.html (original)
+++ maven/website/content/docs/2.0.2/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.2
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.2 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0.2/release-notes.apt.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/2.0.3/release-notes.html
==
--- maven/website/content/docs/2.0.3/release-notes.html (original)
+++ maven/website/content/docs/2.0.3/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.3
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.3 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0.3/release-notes.apt.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/2.0.4/release-notes.html
==
--- maven/website/content/docs/2.0.4/release-notes.html (original)
+++ maven/website/content/docs/2.0.4/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.4
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.4 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0.4/release-notes.apt.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/2.0.5/release-notes.html
==
--- maven/website/content/docs/2.0.5/release-notes.html (original)
+++ maven/website/content/docs/2.0.5/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.5
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.5 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0.5/release-notes.apt.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/2.0.6/release-notes.html
==
--- maven/website/content/docs/2.0.6/release-notes.html (original)
+++ maven/website/content/docs/2.0.6/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.6
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.6 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0.6/release-notes.apt.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/2.0.7/release-notes.html

svn commit: r1865200 [6/6] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do

2019-08-14 Thread svn-site-role
Modified: maven/website/content/team.html
==
--- maven/website/content/team.html (original)
+++ maven/website/content/team.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Project Team
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Project Team
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/testimonials.html
==
--- maven/website/content/testimonials.html (original)
+++ maven/website/content/testimonials.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Testimonials
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Testimonials https://github.com/apache/maven-site/tree/master/content/markdown/testimonials.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/users/getting-help.html
==
--- maven/website/content/users/getting-help.html (original)
+++ maven/website/content/users/getting-help.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Maven  Getting Help
 
@@ -42,7 +42,7 @@ Karl Heinz Marbaise" />
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Getting Help https://github.com/apache/maven-site/tree/master/content/apt/users/getting-help.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/users/index.html
==
--- maven/website/content/users/index.html (original)
+++ maven/website/content/users/index.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Users Centre
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Users Centre https://github.com/apache/maven-site/tree/master/content/apt/users/index.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/what-is-maven.html
==
--- maven/website/content/what-is-maven.html (original)
+++ maven/website/content/what-is-maven.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Introduction
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction https://github.com/apache/maven-site/tree/master/content/markdown/what-is-maven.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download




svn commit: r1865200 [4/6] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do

2019-08-14 Thread svn-site-role
Modified: 
maven/website/content/guides/mini/guide-building-for-different-environments.html
==
--- 
maven/website/content/guides/mini/guide-building-for-different-environments.html
 (original)
+++ 
maven/website/content/guides/mini/guide-building-for-different-environments.html
 Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Building For Different Environments with Maven 
2
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Building For Different Environments with Maven 2 https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-building-for-different-environments.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/guides/mini/guide-building-jdk14-on-jdk15.html
==
--- maven/website/content/guides/mini/guide-building-jdk14-on-jdk15.html 
(original)
+++ maven/website/content/guides/mini/guide-building-jdk14-on-jdk15.html Thu 
Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Guide to Building JDK 1.4 Projects Using JDK 
1.5
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Guide to Building JDK 1.4 Projects Using JDK 1.5 https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-building-jdk14-on-jdk15.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/guides/mini/guide-configuring-maven.html
==
--- maven/website/content/guides/mini/guide-configuring-maven.html (original)
+++ maven/website/content/guides/mini/guide-configuring-maven.html Thu Aug 15 
04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Guide to Configuring Maven
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Guide to Configuring Maven https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-configuring-maven.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/guides/mini/guide-configuring-plugins.html
==
--- maven/website/content/guides/mini/guide-configuring-plugins.html (original)
+++ maven/website/content/guides/mini/guide-configuring-plugins.html Thu Aug 15 
04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Maven  Guide to Configuring Plug-ins
 
@@ -42,7 +42,7 @@ Vincent Siveton" />
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Guide to Configuring Plug-ins https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-configuring-plugins.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/guides/mini/guide-coping-with-sun-jars.html
==
--- maven/website/content/guides/mini/guide-coping-with-sun-jars.html (original)
+++ maven/website/content/guides/mini/guide-coping-with-sun-jars.html Thu Aug 
15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Guide to Coping with Sun JARs
 
@@ -41,7 +41,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Guide to Coping with Sun JARs https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-coping-with-sun-jars.apt;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/guides/mini/guide-creating-archetypes.html
==
--- maven/website/content/guides/mini/guide-creating-archetypes.html (original)
+++ maven/website/content/guides/mini/guide-creating-archetypes.html Thu Aug 15 
04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Guide 

svn commit: r1865200 [3/6] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do

2019-08-14 Thread svn-site-role
Modified: maven/website/content/docs/3.5.3/release-notes.html
==
--- maven/website/content/docs/3.5.3/release-notes.html (original)
+++ maven/website/content/docs/3.5.3/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Release Notes – Maven 3.5.3
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes – Maven 3.5.3 https://github.com/apache/maven-site/tree/master/content/markdown/docs/3.5.3/release-notes.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/3.5.4/release-notes.html
==
--- maven/website/content/docs/3.5.4/release-notes.html (original)
+++ maven/website/content/docs/3.5.4/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Release Notes – Maven 3.5.4
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes – Maven 3.5.4 https://github.com/apache/maven-site/tree/master/content/markdown/docs/3.5.4/release-notes.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/3.6.0/release-notes.html
==
--- maven/website/content/docs/3.6.0/release-notes.html (original)
+++ maven/website/content/docs/3.6.0/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Release Notes – Maven 3.6.0
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes – Maven 3.6.0 https://github.com/apache/maven-site/tree/master/content/markdown/docs/3.6.0/release-notes.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/3.6.1/release-notes.html
==
--- maven/website/content/docs/3.6.1/release-notes.html (original)
+++ maven/website/content/docs/3.6.1/release-notes.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Release Notes – Maven 3.6.1
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes – Maven 3.6.1 https://github.com/apache/maven-site/tree/master/content/markdown/docs/3.6.1/release-notes.md;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/docs/history.html
==
--- maven/website/content/docs/history.html (original)
+++ maven/website/content/docs/history.html Thu Aug 15 04:14:48 2019
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Maven Releases History
 
@@ -39,7 +39,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Maven Releases History https://github.com/apache/maven-site/tree/master/content/markdown/docs/history.md.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/download.html
==
--- maven/website/content/download.html (original)
+++ maven/website/content/download.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 Maven  Download Apache Maven
 
@@ -43,7 +43,7 @@
   https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Download Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/download.xml.vm;>
-| 
Last Published: 2019-08-09
+| 
Last Published: 2019-08-15
   |
 Get Sources
   Download

Modified: maven/website/content/errors/404.html
==
--- maven/website/content/errors/404.html (original)
+++ maven/website/content/errors/404.html Thu Aug 15 04:14:48 2019
@@ -1,6 +1,6 @@
 
 
 

svn commit: r1865200 [1/6] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do

2019-08-14 Thread svn-site-role
Author: svn-site-role
Date: Thu Aug 15 04:14:48 2019
New Revision: 1865200

Log:
Site checkin for project Apache Maven Site

Modified:
maven/website/content/about.html
maven/website/content/aether.html
maven/website/content/apache-resource-bundles/index.html
maven/website/content/archives/maven-2.x/index.html
maven/website/content/articles.html
maven/website/content/background/history-of-maven.html
maven/website/content/background/philosophy-of-maven.html
maven/website/content/ci-management.html
maven/website/content/code-quality-management.html
maven/website/content/community.html
maven/website/content/configure.html
maven/website/content/continuous-integration.html
maven/website/content/developers/committer-environment.html
maven/website/content/developers/committer-settings.html
maven/website/content/developers/conventions/code.html
maven/website/content/developers/conventions/git.html
maven/website/content/developers/conventions/jira.html
maven/website/content/developers/dependency-policies.html
maven/website/content/developers/index.html
maven/website/content/developers/java6.html
maven/website/content/developers/mojo-api-specification.html
maven/website/content/developers/release/index.html
maven/website/content/developers/release/maven-core-release.html

maven/website/content/developers/release/maven-project-release-procedure.html
maven/website/content/developers/release/parent-pom-release.html
maven/website/content/developers/release/pmc-gpg-keys.html
maven/website/content/developers/retirement-plan-plugins.html

maven/website/content/developers/website/component-reference-documentation-helper.html

maven/website/content/developers/website/deploy-component-reference-documentation.html
maven/website/content/developers/website/deploy-maven-website.html
maven/website/content/developers/website/index.html
maven/website/content/developers/website/website-overview.html
maven/website/content/developers/welcome-to-new-committers.html
maven/website/content/docs-required.html
maven/website/content/docs/2.0.1/release-notes.html
maven/website/content/docs/2.0.10/release-notes.html
maven/website/content/docs/2.0.11/release-notes.html
maven/website/content/docs/2.0.2/release-notes.html
maven/website/content/docs/2.0.3/release-notes.html
maven/website/content/docs/2.0.4/release-notes.html
maven/website/content/docs/2.0.5/release-notes.html
maven/website/content/docs/2.0.6/release-notes.html
maven/website/content/docs/2.0.7/release-notes.html
maven/website/content/docs/2.0.8/release-notes.html
maven/website/content/docs/2.0.9/release-notes.html
maven/website/content/docs/2.0/release-notes.html
maven/website/content/docs/2.1.0/release-notes.html
maven/website/content/docs/2.2.0/release-notes.html
maven/website/content/docs/2.2.1/release-notes.html
maven/website/content/docs/3.0-alpha-3/release-notes.html
maven/website/content/docs/3.0-alpha-4/release-notes.html
maven/website/content/docs/3.0-alpha-5/release-notes.html
maven/website/content/docs/3.0-alpha-6/release-notes.html
maven/website/content/docs/3.0-alpha-7/release-notes.html
maven/website/content/docs/3.0-beta-1/release-notes.html
maven/website/content/docs/3.0-beta-2/release-notes.html
maven/website/content/docs/3.0-beta-3/release-notes.html
maven/website/content/docs/3.0.1/release-notes.html
maven/website/content/docs/3.0.2/release-notes.html
maven/website/content/docs/3.0.3/release-notes.html
maven/website/content/docs/3.0.4/release-notes.html
maven/website/content/docs/3.0.5/release-notes.html
maven/website/content/docs/3.0/release-notes.html
maven/website/content/docs/3.1.0-alpha-1/release-notes.html
maven/website/content/docs/3.1.0/release-notes.html
maven/website/content/docs/3.1.1/release-notes.html
maven/website/content/docs/3.2.1/release-notes.html
maven/website/content/docs/3.2.2/release-notes.html
maven/website/content/docs/3.2.3/release-notes.html
maven/website/content/docs/3.2.5/release-notes.html
maven/website/content/docs/3.3.1/release-notes.html
maven/website/content/docs/3.3.3/release-notes.html
maven/website/content/docs/3.3.9/release-notes.html
maven/website/content/docs/3.5.0-alpha-1/release-notes.html
maven/website/content/docs/3.5.0-beta-1/release-notes.html
maven/website/content/docs/3.5.0/release-notes.html
maven/website/content/docs/3.5.2/release-notes.html
maven/website/content/docs/3.5.3/release-notes.html
maven/website/content/docs/3.5.4/release-notes.html
maven/website/content/docs/3.6.0/release-notes.html
maven/website/content/docs/3.6.1/release-notes.html
maven/website/content/docs/history.html
maven/website/content/download.html
maven/website/content/errors/404.html