maven-surefire git commit: [SUREFIRE-1310] ForkClient should handle only one channel-id

2016-12-30 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/master df7e143c2 -> 27fbe2c19


[SUREFIRE-1310] ForkClient should handle only one channel-id


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

Branch: refs/heads/master
Commit: 27fbe2c190a204e19dc42c86e9769bf384e7ec91
Parents: df7e143
Author: Tibor17 
Authored: Sat Dec 31 06:46:06 2016 +0100
Committer: Tibor17 
Committed: Sat Dec 31 06:46:06 2016 +0100

--
 .../booterclient/output/ForkClient.java | 37 
 1 file changed, 23 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/27fbe2c1/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index d0aecf9..68ce40d 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -79,8 +79,6 @@ public class ForkClient
 private static final long START_TIME_ZERO = 0L;
 private static final long START_TIME_NEGATIVE_TIMEOUT = -1L;
 
-private final RunListener testSetReporter;
-
 private final DefaultReporterFactory defaultReporterFactory;
 
 private final Properties testVmSystemProperties;
@@ -97,6 +95,8 @@ public class ForkClient
 
 private final ConsoleLogger log;
 
+private RunListener testSetReporter;
+
 private volatile boolean saidGoodBye;
 
 private volatile StackTraceWriter errorInFork;
@@ -104,7 +104,6 @@ public class ForkClient
 public ForkClient( DefaultReporterFactory defaultReporterFactory, 
Properties testVmSystemProperties,
NotifiableTestStream notifiableTestStream, 
ConsoleLogger log )
 {
-testSetReporter = defaultReporterFactory.createReporter();
 this.defaultReporterFactory = defaultReporterFactory;
 this.testVmSystemProperties = testVmSystemProperties;
 this.notifiableTestStream = notifiableTestStream;
@@ -168,6 +167,15 @@ public class ForkClient
 return testSetStartedAt.get() == START_TIME_NEGATIVE_TIMEOUT;
 }
 
+private RunListener getTestSetReporter()
+{
+if ( testSetReporter == null )
+{
+testSetReporter = defaultReporterFactory.createReporter();
+}
+return testSetReporter;
+}
+
 private void processLine( String s )
 {
 try
@@ -185,49 +193,49 @@ public class ForkClient
 switch ( operationId )
 {
 case BOOTERCODE_TESTSET_STARTING:
-testSetReporter.testSetStarting( createReportEntry( 
remaining ) );
+getTestSetReporter().testSetStarting( createReportEntry( 
remaining ) );
 setCurrentStartTime();
 break;
 case BOOTERCODE_TESTSET_COMPLETED:
 testsInProgress.clear();
 
-testSetReporter.testSetCompleted( createReportEntry( 
remaining ) );
+getTestSetReporter().testSetCompleted( createReportEntry( 
remaining ) );
 break;
 case BOOTERCODE_TEST_STARTING:
 ReportEntry reportEntry = createReportEntry( remaining );
 testsInProgress.offer( reportEntry.getSourceName() );
 
-testSetReporter.testStarting( createReportEntry( remaining 
) );
+getTestSetReporter().testStarting( createReportEntry( 
remaining ) );
 break;
 case BOOTERCODE_TEST_SUCCEEDED:
 reportEntry = createReportEntry( remaining );
 testsInProgress.remove( reportEntry.getSourceName() );
 
-testSetReporter.testSucceeded( createReportEntry( 
remaining ) );
+getTestSetReporter().testSucceeded( createReportEntry( 
remaining ) );
 break;
 case BOOTERCODE_TEST_FAILED:
 reportEntry = createReportEntry( remaining );
 testsInProgress.remove( reportEntry.getSourceName() );
 
-

maven-surefire git commit: [SUREFIRE-1322] Surefire and Failsafe should dump critical errors in dump file and console

2016-12-30 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/master 9dd4074e8 -> df7e143c2


[SUREFIRE-1322] Surefire and Failsafe should dump critical errors in dump file 
and console


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

Branch: refs/heads/master
Commit: df7e143c26b09678a0e6885b7ffcc65070688eb9
Parents: 9dd4074
Author: Tibor17 
Authored: Sat Dec 31 06:26:36 2016 +0100
Committer: Tibor17 
Committed: Sat Dec 31 06:26:36 2016 +0100

--
 .../maven/plugin/surefire/booterclient/ForkStarter.java   |  9 ++---
 .../plugin/surefire/booterclient/output/ForkClient.java   |  3 ---
 .../booterclient/output/NativeStdErrStreamConsumer.java   | 10 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/df7e143c/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 2d0ae38..05c4cc2 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -603,10 +603,13 @@ public class ForkStarter
 SurefireBooterForkException booterForkException = null;
 try
 {
+NativeStdErrStreamConsumer stdErrConsumer =
+new NativeStdErrStreamConsumer( 
forkClient.getDefaultReporterFactory() );
+
 CommandLineCallable future =
-executeCommandLineAsCallable( cli, testProvidingInputStream, 
threadedStreamConsumer,
-  new 
NativeStdErrStreamConsumer(), 0, closer,
-  Charset.forName( 
FORK_STREAM_CHARSET_NAME ) );
+executeCommandLineAsCallable( cli, 
testProvidingInputStream, threadedStreamConsumer,
+stdErrConsumer, 0, 
closer,
+Charset.forName( 
FORK_STREAM_CHARSET_NAME ) );
 
 currentForkClients.add( forkClient );
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/df7e143c/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index 46c747b..d0aecf9 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -272,19 +272,16 @@ public class ForkClient
 break;
 default:
 LostCommandsDumpSingleton.getSingleton().dumpText( s, 
defaultReporterFactory );
-log.warning( s );
 }
 }
 catch ( NumberFormatException e )
 {
 // SUREFIRE-859
-log.warning( s );
 LostCommandsDumpSingleton.getSingleton().dumpException( e, s, 
defaultReporterFactory );
 }
 catch ( NoSuchElementException e )
 {
 // SUREFIRE-859
-log.warning( s );
 LostCommandsDumpSingleton.getSingleton().dumpException( e, s, 
defaultReporterFactory );
 }
 catch ( ReporterException e )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/df7e143c/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
index 84ca474..c92361d 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/NativeStdErrStreamConsumer.java
+++

maven-surefire git commit: [SUREFIRE-1239] ExecutionException java.lang.RuntimeException: org.apache.maven.surefire.report.ReporterException: When writing xml report stdout/stderr (No such file or dir

2016-12-30 Thread tibordigana 
Repository: maven-surefire
Updated Branches:
  refs/heads/master cf6e75c8f -> 9dd4074e8


[SUREFIRE-1239] ExecutionException java.lang.RuntimeException: 
org.apache.maven.surefire.report.ReporterException: When writing xml report 
stdout/stderr (No such file or directory)


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

Branch: refs/heads/master
Commit: 9dd4074e83c0edae5e2050f66e9cadfdba40fe01
Parents: cf6e75c
Author: Tibor17 
Authored: Sat Dec 31 02:42:35 2016 +0100
Committer: Tibor17 
Committed: Sat Dec 31 02:42:35 2016 +0100

--
 .../org/apache/maven/plugin/surefire/report/TestSetRunListener.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9dd4074e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index ca12c90..f0f996d 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -166,6 +166,7 @@ public class TestSetRunListener
 
 addTestMethodStats();
 detailsForThis.reset();
+clearCapture();
 }
 
 // --

svn commit: r1776671 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

2016-12-30 Thread schulte 
Author: schulte
Date: Sat Dec 31 01:06:53 2016
New Revision: 1776671

URL: http://svn.apache.org/viewvc?rev=1776671=rev
Log:
[MINVOKER-213] The plugin should escape any XML special characters (&<>) during 
interpolating XML files.

o Updated to only escape characters leading to invalid XML if not escaped.
  I did run the ITs locally and they succeeded. On Jenkins they fail.


Modified:

maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1776671=1776670=1776671=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 Sat Dec 31 01:06:53 2016
@@ -51,7 +51,6 @@ import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
@@ -2303,7 +2302,12 @@ public abstract class AbstractInvokerMoj
 
 for ( final Map.Entry e : props.entrySet() )
 {
-escapedProperties.put( e.getKey(), 
StringEscapeUtils.escapeXml( e.getValue().toString() ) );
+escapedProperties.put( e.getKey(), e.getValue().toString().
+   replaceAll( "\"", "" ).
+   replaceAll( "<", "" ).
+   replaceAll( ">", "" ).
+   replaceAll( "&", "" ) );
+
 }
 
 props = escapedProperties;

svn commit: r1776657 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

2016-12-30 Thread schulte 
Author: schulte
Date: Fri Dec 30 23:18:05 2016
New Revision: 1776657

URL: http://svn.apache.org/viewvc?rev=1776657=rev
Log:
[MINVOKER-213] The plugin should escape any XML special characters (&<>) during 
interpolating XML files.


Modified:

maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1776657=1776656=1776657=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 Fri Dec 30 23:18:05 2016
@@ -19,8 +19,6 @@ package org.apache.maven.plugin.invoker;
  * under the License.
  */
 
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -53,7 +51,7 @@ import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
@@ -100,6 +98,7 @@ import org.codehaus.plexus.util.cli.Comm
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
 
 /**
  * Provides common code for mojos invoking sub builds.
@@ -2277,9 +2276,12 @@ public abstract class AbstractInvokerMoj
 /**
  * Returns the map-based value source used to interpolate POMs and other 
stuff.
  *
+ * @param escapeXml {@code true}, to escape any XML special characters in 
the property values; {@code false}, to not
+ * escape any property values.
+ *
  * @return The map-based value source for interpolation, never 
null.
  */
-private Map getInterpolationValueSource()
+private Map getInterpolationValueSource( final boolean 
escapeXml )
 {
 Map props = new HashMap();
 
@@ -2294,6 +2296,19 @@ public abstract class AbstractInvokerMoj
 props.put( "localRepository", settings.getLocalRepository() );
 props.put( "localRepositoryUrl", toUrl( 
settings.getLocalRepository() ) );
 }
+
+if ( escapeXml )
+{
+final Map escapedProperties = new HashMap( props.size() );
+
+for ( final Map.Entry e : props.entrySet() )
+{
+escapedProperties.put( e.getKey(), 
StringEscapeUtils.escapeXml( e.getValue().toString() ) );
+}
+
+props = escapedProperties;
+}
+
 return new CompositeMap( this.project, props );
 }
 
@@ -2364,7 +2379,7 @@ public abstract class AbstractInvokerMoj
 BufferedReader reader = null;
 try
 {
-Map composite = getInterpolationValueSource();
+Map composite = getInterpolationValueSource( false 
);
 reader = new BufferedReader( new InterpolationFilterReader( 
newReader( tokenFile ), composite ) );
 
 for ( String line = reader.readLine(); line != null; line = 
reader.readLine() )
@@ -2409,10 +2424,14 @@ public abstract class AbstractInvokerMoj
 /**
  * Interpolates the specified POM/settings file to a temporary file. The 
destination file may be same as the input
  * file, i.e. interpolation can be performed in-place.
+ * 
+ * Note:This methods expects the file to be a XML file and applies 
special XML escaping during interpolation.
+ * 
  *
  * @param originalFile The XML file to interpolate, must not be 
null.
  * @param interpolatedFile The target file to write the interpolated 
contents of the original file to, must not be
- *null.
+ * null.
+ *
  * @throws org.apache.maven.plugin.MojoExecutionException If the target 
file could not be created.
  */
 void buildInterpolatedFile( File originalFile, File interpolatedFile )
@@ -2428,7 +2447,7 @@ public abstract class AbstractInvokerMoj
 try
 {
 // interpolation with token @...@
-Map composite = getInterpolationValueSource();
+Map composite = getInterpolationValueSource( 
true );
 reader =

svn commit: r1776659 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

2016-12-30 Thread schulte 
Author: schulte
Date: Fri Dec 30 23:18:52 2016
New Revision: 1776659

URL: http://svn.apache.org/viewvc?rev=1776659=rev
Log:
[MINVOKER-213] The plugin should escape any XML special characters (&<>) during 
interpolating XML files.

o Updated to use maven-invoker-plugin 3.0.0-SNAPSHOT due make the ITs run on 
Windows.


Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1776659=1776658=1776659=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Dec 30 23:18:52 2016
@@ -367,7 +367,7 @@ under the License.
   
 
   
-2.0.0
+3.0.0-SNAPSHOT
 
file://${project.build.testOutputDirectory}/remote-repository
 false
 ${project.version}

maven git commit: [MNG-5889] .mvn directory should be picked when using --file

2016-12-30 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/master 65960ac18 -> 1a94cd4a7


[MNG-5889] .mvn directory should be picked when using --file

o Updated to restore quoting the path argument so that the script starts to work
  again when used in a "directory name with spaces and & special characters".


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

Branch: refs/heads/master
Commit: 1a94cd4a76cd528eb4b8f46b853f8d77d7d5352d
Parents: 65960ac
Author: Christian Schulte 
Authored: Fri Dec 30 22:57:13 2016 +0100
Committer: Christian Schulte 
Committed: Fri Dec 30 22:57:13 2016 +0100

--
 apache-maven/src/bin/mvn.cmd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1a94cd4a/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 6271f17..80a4c0e 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -83,11 +83,11 @@ set MAVEN_CMD_LINE_ARGS=%*
 @REM Find the project basedir, i.e., the directory that contains the folder 
".mvn".
 @REM Fallback to current working directory if not found.
 
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+set "MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%"
 if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
 
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
+set "EXEC_DIR=%CD%"
+set "WDIR=%EXEC_DIR%"
 
 @REM Look for the --file switch and start the search for the .mvn directory 
from the specified
 @REM POM location, if supplied.
@@ -125,7 +125,7 @@ if not exist "%POM_DIR%" (
   echo Directory %POM_DIR% extracted from the -f/--file command-line argument 
%FILE_ARG% does not exist >&2
   goto error
 )
-set WDIR=%POM_DIR%
+set "WDIR=%POM_DIR%"
 goto findBaseDir
 
 :get_directory_from_file
@@ -138,7 +138,7 @@ goto stripPomDir
 exit /b
 
 :findBaseDir
-cd /d %WDIR%
+cd /d "%WDIR%"
 :findBaseDirLoop
 if exist "%WDIR%\.mvn" goto baseDirFound
 cd ..
@@ -152,7 +152,7 @@ cd /d "%EXEC_DIR%"
 goto endDetectBaseDir
 
 :baseDirNotFound
-if "_%EXEC_DIR:~-1%"=="_\" set EXEC_DIR=%EXEC_DIR:~0,-1%
+if "_%EXEC_DIR:~-1%"=="_\" set "EXEC_DIR=%EXEC_DIR:~0,-1%"
 set "MAVEN_PROJECTBASEDIR=%EXEC_DIR%"
 cd "%EXEC_DIR%"

maven-wagon git commit: Intermedite commit; will disappear soon

2016-12-30 Thread michaelo 
Repository: maven-wagon
Updated Branches:
  refs/heads/jetty-8 307f8a6db -> df0af51bc


Intermedite commit; will disappear soon

* Use fsutil on Windows to create a 4 GiB file very fast


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

Branch: refs/heads/jetty-8
Commit: df0af51bca96570e3cff1f1a84746329b146cf36
Parents: 307f8a6
Author: Michael Osipov 
Authored: Fri Dec 30 22:03:55 2016 +0100
Committer: Michael Osipov 
Committed: Fri Dec 30 22:03:55 2016 +0100

--
 .../providers/http/HugeFileDownloadTest.java| 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/df0af51b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
--
diff --git 
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
 
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
index f460e0b..fba63c4 100644
--- 
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
+++ 
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
@@ -24,6 +24,7 @@ import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.observers.Debug;
 import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.Os;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -168,11 +169,20 @@ public class HugeFileDownloadTest
 private void makeHugeFile( File hugeFile )
 throws Exception
 {
-RandomAccessFile ra = new RandomAccessFile( hugeFile.getPath(), "rw" );
-ra.setLength( HUGE_FILE_SIZE + 1 );
-ra.seek( HUGE_FILE_SIZE );
-ra.write( 1 );
-ra.close();
+if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+{
+Process p = new ProcessBuilder( "fsutil", "file", "createnew", 
hugeFile.getAbsolutePath(),
+String.valueOf( HUGE_FILE_SIZE ) 
).start();
+p.waitFor();
+}
+else
+{
+RandomAccessFile ra = new RandomAccessFile( hugeFile.getPath(), 
"rw" );
+ra.setLength( HUGE_FILE_SIZE + 1L );
+ra.seek( HUGE_FILE_SIZE );
+ra.write( 1 );
+ra.close();
+}
 }
 
 }

svn commit: r1776610 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: copy-from-remote-repository/ unpack-from-remote-repository/

2016-12-30 Thread gboue 
Author: gboue
Date: Fri Dec 30 17:13:57 2016
New Revision: 1776610

URL: http://svn.apache.org/viewvc?rev=1776610=rev
Log:
Updating the tests so that they no longer rely on reading the logs, making them 
more robust: a setup script first deletes from the local repository the 
artifact that should be downloaded, then it is verified that they are present 
in the local repository after the build (thus verifying that they were 
correctly downloaded).

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
  - copied, changed from r1776513, 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.bsh
  - copied, changed from r1776513, 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
Removed:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh?rev=1776610=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
 Fri Dec 30 17:13:57 2016
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.*;
+
+import org.codehaus.plexus.util.*;
+
+String[] foldersToDelete = {
+"org/apache/maven/its/dependency/fake-remote-copy"
+};
+
+try
+{
+for ( String folderToDelete : foldersToDelete )
+{
+FileUtils.deleteDirectory( new File( localRepositoryPath, 
folderToDelete ) );
+}
+}
+catch ( IOException e )
+{
+e.printStackTrace();
+return false;
+}
+
+return true;

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
--
svn:keywords = Author Date Id Revision

Copied: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
 (from r1776513, 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh?p2=maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh=maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy=1776513=1776610=1776610=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
 Fri Dec 30 17:13:57 2016
@@ -16,19 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+ 
 import java.io.*;
 
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.exists()
-String expectedDownloadingPattern = "Downloading.*: file:///" + 
basedir.getPath().replaceAll( "", "") +
-

svn commit: r1776591 - /maven/plugins/trunk/maven-clean-plugin/pom.xml

2016-12-30 Thread schulte 
Author: schulte
Date: Fri Dec 30 15:33:49 2016
New Revision: 1776591

URL: http://svn.apache.org/viewvc?rev=1776591=rev
Log:
[MNG-5761] Dependency management is not transitive.

o Updated to add a missing test dependency (used but undeclared) managed to
  non-transitive test scope transitively. The compilation error without
  that declaration in fact is expected behaviour. Don't let them fool you.

  I can build all plugins using 3.4.0-SNAPSHOT by upgrading the plugin tools
  manually on the command line like:

  mvn -DmavenPluginToolsVersion=3.5 test-compile


Modified:
maven/plugins/trunk/maven-clean-plugin/pom.xml

Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=1776591=1776590=1776591=diff
==
--- maven/plugins/trunk/maven-clean-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/pom.xml Fri Dec 30 15:33:49 2016
@@ -101,6 +101,12 @@ under the License.
   ${mavenVersion}
   test
 
+
+  junit
+  junit
+  4.12
+  test
+