You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2017/04/02 12:04:21 UTC
[2/2] maven-surefire git commit: renamed version 2.19.2 to cut
release version 2.20
renamed version 2.19.2 to cut release version 2.20
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/93d3f8a9
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/93d3f8a9
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/93d3f8a9
Branch: refs/heads/master
Commit: 93d3f8a9e41a334a5e1dacdb511e5d6596f04162
Parents: 04a90a8
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Apr 2 14:04:04 2017 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun Apr 2 14:04:04 2017 +0200
----------------------------------------------------------------------
maven-failsafe-plugin/pom.xml | 2 +-
.../org/apache/maven/plugin/failsafe/IntegrationTestMojo.java | 2 +-
.../plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java | 2 +-
.../java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java | 2 +-
.../apache/maven/plugin/failsafe/IntegrationTestMojoTest.java | 2 +-
.../java/org/apache/maven/plugin/failsafe/RunResultTest.java | 2 +-
maven-surefire-common/pom.xml | 2 +-
.../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 4 ++--
.../surefire/booterclient/output/NativeStdErrStreamConsumer.java | 2 +-
.../apache/maven/plugin/surefire/log/PluginConsoleLogger.java | 2 +-
.../maven/plugin/surefire/report/NullConsoleOutputReceiver.java | 2 +-
.../apache/maven/plugin/surefire/report/NullConsoleReporter.java | 2 +-
.../apache/maven/plugin/surefire/report/NullFileReporter.java | 2 +-
.../maven/plugin/surefire/report/NullStatelessXmlReporter.java | 2 +-
.../maven/plugin/surefire/report/NullStatisticsReporter.java | 2 +-
.../main/java/org/apache/maven/surefire/spi/ServiceLoader.java | 2 +-
.../org/apache/maven/plugin/surefire/SurefireReflectorTest.java | 2 +-
.../test/java/org/apache/maven/surefire/spi/CustomizedImpl.java | 2 +-
.../src/test/java/org/apache/maven/surefire/spi/DefaultImpl.java | 2 +-
.../org/apache/maven/surefire/spi/EmptyServiceInterface.java | 2 +-
.../org/apache/maven/surefire/spi/ExistingServiceInterface.java | 2 +-
.../src/test/java/org/apache/maven/surefire/spi/IDefault.java | 2 +-
.../java/org/apache/maven/surefire/spi/NoServiceInterface.java | 2 +-
.../src/test/java/org/apache/maven/surefire/spi/SPITest.java | 2 +-
.../src/test/java/org/apache/maven/surefire/spi/SPImpl1.java | 2 +-
.../src/test/java/org/apache/maven/surefire/spi/SPImpl2.java | 2 +-
maven-surefire-plugin/pom.xml | 2 +-
.../java/org/apache/maven/plugin/surefire/SurefirePlugin.java | 2 +-
maven-surefire-report-plugin/pom.xml | 2 +-
.../maven/plugins/surefire/report/PluginConsoleLogger.java | 2 +-
pom.xml | 2 +-
surefire-api/pom.xml | 2 +-
.../org/apache/maven/surefire/booter/DumpErrorSingleton.java | 2 +-
.../org/apache/maven/surefire/util/internal/DumpFileUtils.java | 2 +-
.../org/apache/maven/surefire/util/internal/ObjectUtils.java | 2 +-
.../maven/surefire/util/internal/TestClassMethodNameUtils.java | 2 +-
surefire-booter/pom.xml | 2 +-
surefire-grouper/pom.xml | 2 +-
surefire-integration-tests/pom.xml | 2 +-
.../org/apache/maven/surefire/its/fixture/MavenLauncherTest.java | 2 +-
.../maven/surefire/its/jiras/Surefire1260NewTestsPattern.java | 2 +-
.../its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java | 2 +-
surefire-logger-api/pom.xml | 2 +-
.../maven/plugin/surefire/log/api/ConsoleLoggerDecorator.java | 2 +-
.../apache/maven/plugin/surefire/log/api/ConsoleLoggerUtils.java | 2 +-
.../java/org/apache/maven/plugin/surefire/log/api/Level.java | 2 +-
.../apache/maven/plugin/surefire/log/api/NullConsoleLogger.java | 2 +-
surefire-providers/common-java5/pom.xml | 2 +-
surefire-providers/common-junit3/pom.xml | 2 +-
surefire-providers/common-junit4/pom.xml | 2 +-
surefire-providers/common-junit48/pom.xml | 2 +-
surefire-providers/pom.xml | 2 +-
surefire-providers/surefire-junit3/pom.xml | 2 +-
surefire-providers/surefire-junit4/pom.xml | 2 +-
surefire-providers/surefire-junit47/pom.xml | 2 +-
surefire-providers/surefire-testng-utils/pom.xml | 2 +-
surefire-providers/surefire-testng/pom.xml | 2 +-
surefire-report-parser/pom.xml | 2 +-
surefire-setup-integration-tests/pom.xml | 2 +-
surefire-shadefire/pom.xml | 2 +-
60 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index dc1df6d..5cd8afd 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 51c36ee..ddfbe7d 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -167,7 +167,7 @@ public class IntegrationTestMojo
* <a href="http://maven.apache.org/surefire/maven-failsafe-plugin/examples/shutdown.html">see the documentation:
* http://maven.apache.org/surefire/maven-failsafe-plugin/examples/shutdown.html</a>
*
- * @since 2.19.2
+ * @since 2.20
*/
@Parameter( property = "failsafe.exitTimeout", defaultValue = "30" )
private int forkedProcessExitTimeoutInSeconds;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
index 6bfa945..7993a05 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
@@ -1 +1 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;
/*
* 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 org.apache.maven.surefire.suite.RunResult;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.FileOutp
utStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19.2
*/
public final class FailsafeSummaryXmlUtils
{
public static final Charset UTF8 = Charset.forName( "UTF-8" );
private FailsafeSummaryXmlUtils()
{
throw new IllegalStateException( "No instantiable constructor." );
}
public static RunResult toRunResult( File failsafeSummaryXml ) throws JAXBException
{
FailsafeSummary failsafeSummary = JAXB.unmarshal( failsafeSummaryXml, FailsafeSummary.class );
return new RunResult( failsafeSummary.getCompleted(), failsafeSummary.getErrors(),
failsafeSummary.getFailures(), failsafeSummary.getSkipped(),
failsafeSummary.getFailureMessage(), failsafeSummary.isTimeout()
);
}
public static void fromRunResultToFile(
RunResult fromRunResult, File toFailsafeSummaryXml )
throws JAXBException, IOException
{
fromRunResultToFile( fromRunResult, toFailsafeSummaryXml, UTF8 );
}
public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafeSummaryXml, Charset encoding )
throws JAXBException, IOException
{
FailsafeSummary summary = new FailsafeSummary();
summary.setCompleted( fromRunResult.getCompletedCount() );
summary.setFailureMessage( fromRunResult.getFailure() );
summary.setErrors( fromRunResult.getErrors() );
summary.setFailures( fromRunResult.getFailures() );
summary.setSkipped( fromRunResult.getSkipped() );
summary.setTimeout( fromRunResult.isTimeout() );
summary.setResult( ErrorType.fromValue( fromRunResult.getFailsafeCode() ) );
String unmarshalled = JAXB.marshal( summary, encoding );
OutputStreamWriter os = new OutputStreamWriter( new FileOutputS
tream( toFailsafeSummaryXml ), encoding );
try
{
os.write( unmarshalled );
os.flush();
}
finally
{
os.close();
}
}
public static void writeSummary( RunResult mergedSummary, File mergedSummaryFile, boolean inProgress,
Charset encoding )
throws IOException, JAXBException
{
if ( !mergedSummaryFile.getParentFile().isDirectory() )
{
//noinspection ResultOfMethodCallIgnored
mergedSummaryFile.getParentFile().mkdirs();
}
if ( mergedSummaryFile.exists() && inProgress )
{
RunResult runResult = toRunResult( mergedSummaryFile );
mergedSummary = mergedSummary.aggregate( runResult );
}
fromRunResultToFile( mergedSummary, mergedSummaryFile, encoding );
}
}
\ No newline at end of file
+package org.apache.maven.plugin.failsafe.xmlsummary;
/*
* 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 org.apache.maven.surefire.suite.RunResult;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.FileOutp
utStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.20
*/
public final class FailsafeSummaryXmlUtils
{
public static final Charset UTF8 = Charset.forName( "UTF-8" );
private FailsafeSummaryXmlUtils()
{
throw new IllegalStateException( "No instantiable constructor." );
}
public static RunResult toRunResult( File failsafeSummaryXml ) throws JAXBException
{
FailsafeSummary failsafeSummary = JAXB.unmarshal( failsafeSummaryXml, FailsafeSummary.class );
return new RunResult( failsafeSummary.getCompleted(), failsafeSummary.getErrors(),
failsafeSummary.getFailures(), failsafeSummary.getSkipped(),
failsafeSummary.getFailureMessage(), failsafeSummary.isTimeout()
);
}
public static void fromRunResultToFile( R
unResult fromRunResult, File toFailsafeSummaryXml )
throws JAXBException, IOException
{
fromRunResultToFile( fromRunResult, toFailsafeSummaryXml, UTF8 );
}
public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafeSummaryXml, Charset encoding )
throws JAXBException, IOException
{
FailsafeSummary summary = new FailsafeSummary();
summary.setCompleted( fromRunResult.getCompletedCount() );
summary.setFailureMessage( fromRunResult.getFailure() );
summary.setErrors( fromRunResult.getErrors() );
summary.setFailures( fromRunResult.getFailures() );
summary.setSkipped( fromRunResult.getSkipped() );
summary.setTimeout( fromRunResult.isTimeout() );
summary.setResult( ErrorType.fromValue( fromRunResult.getFailsafeCode() ) );
String unmarshalled = JAXB.marshal( summary, encoding );
OutputStreamWriter os = new OutputStreamWriter( new FileOutputStr
eam( toFailsafeSummaryXml ), encoding );
try
{
os.write( unmarshalled );
os.flush();
}
finally
{
os.close();
}
}
public static void writeSummary( RunResult mergedSummary, File mergedSummaryFile, boolean inProgress,
Charset encoding )
throws IOException, JAXBException
{
if ( !mergedSummaryFile.getParentFile().isDirectory() )
{
//noinspection ResultOfMethodCallIgnored
mergedSummaryFile.getParentFile().mkdirs();
}
if ( mergedSummaryFile.exists() && inProgress )
{
RunResult runResult = toRunResult( mergedSummaryFile );
mergedSummary = mergedSummary.aggregate( runResult );
}
fromRunResultToFile( mergedSummary, mergedSummaryFile, encoding );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
index ba3fdd0..723200c 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
@@ -1 +1 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;
/*
* 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 javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Mar
shaller;
import javax.xml.bind.PropertyException;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.helpers.DefaultValidationEventHandler;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
import static javax.xml.bind.JAXBContext.newInstance;
import static javax.xml.bind.Marshaller.JAXB_ENCODING;
import static javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT;
import static javax.xml.bind.Marshaller.JAXB_FRAGMENT;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19.2
*/
public final class JAXB
{
private JAXB()
{
throw new IllegalStateException( "Not instantiated constructor." );
}
public static <T> T unmarshal( File
source, Class<T> rootXmlNode ) throws JAXBException
{
return unmarshal( source, rootXmlNode, Collections.<String, Object>emptyMap() );
}
public static <T> T unmarshal( File source, Class<T> rootXmlNode, Map<String, ?> props )
throws JAXBException
{
Class<?>[] classesToBeBound = { rootXmlNode };
JAXBContext ctx = newInstance( classesToBeBound );
Unmarshaller unmarshaller = ctx.createUnmarshaller();
properties( props, unmarshaller );
unmarshaller.setEventHandler( new DefaultValidationEventHandler() );
JAXBElement<T> element = unmarshaller.unmarshal( new StreamSource( source ), rootXmlNode );
return element.getValue();
}
public static <T> String marshal( T bean, Charset encoding ) throws JAXBException, IOException
{
return marshal( bean, Collections.<String, Object>emptyMap(), encoding ).toString();
}
@SuppressWarnings( "unchecked" )
public static <T> StringWr
iter marshal( T bean, Map<String, Object> props, Charset encoding )
throws JAXBException, IOException
{
return marshal( bean, (Class<T>) bean.getClass(), props, encoding );
}
public static <T> StringWriter marshal( T bean, Class<T> type, Map<String, Object> props, Charset encoding )
throws JAXBException, IOException
{
JAXBElement<T> rootElement = buildJaxbElement( bean, type );
return marshal( rootElement, type, props, encoding );
}
public static <T> StringWriter marshal( JAXBElement<T> rootElement, Class<T> type,
Map<String, Object> props, Charset encoding )
throws JAXBException, IOException
{
StringWriter destination = new StringWriter( 256 );
marshal( rootElement, type, props, destination, encoding );
destination.flush();
return destination;
}
public static <T> void marshal( JAXBElement<T> rootElement, Class
<T> type, Map<String, Object> props,
Writer destination, Charset encoding ) throws JAXBException
{
Class<?>[] classesToBeBound = { type };
JAXBContext context = newInstance( classesToBeBound );
Marshaller marshaller = context.createMarshaller();
marshaller.setProperty( JAXB_ENCODING, encoding.name() );
marshaller.setProperty( JAXB_FORMATTED_OUTPUT, true );
marshaller.setProperty( JAXB_FRAGMENT, true );
properties( props, marshaller );
marshaller.marshal( rootElement, destination );
}
private static <T> JAXBElement<T> buildJaxbElement( T bean, Class<T> type )
{
XmlRootElement xmlRootElement = type.getAnnotation( XmlRootElement.class );
if ( xmlRootElement == null )
{
return null;
}
QName root = new QName( "", xmlRootElement.name() );
return new JAXBElement<T>( root, type, bean );
}
private static void
properties( Map<String, ?> props, Unmarshaller unmarshaller ) throws PropertyException
{
for ( Entry<String, ?> e : props.entrySet() )
{
unmarshaller.setProperty( e.getKey(), e.getValue() );
}
}
private static void properties( Map<String, ?> props, Marshaller marshaller ) throws PropertyException
{
for ( Entry<String, ?> e : props.entrySet() )
{
marshaller.setProperty( e.getKey(), e.getValue() );
}
}
}
\ No newline at end of file
+package org.apache.maven.plugin.failsafe.xmlsummary;
/*
* 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 javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Mar
shaller;
import javax.xml.bind.PropertyException;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.helpers.DefaultValidationEventHandler;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;
import static javax.xml.bind.JAXBContext.newInstance;
import static javax.xml.bind.Marshaller.JAXB_ENCODING;
import static javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT;
import static javax.xml.bind.Marshaller.JAXB_FRAGMENT;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.20
*/
public final class JAXB
{
private JAXB()
{
throw new IllegalStateException( "Not instantiated constructor." );
}
public static <T> T unmarshal( File s
ource, Class<T> rootXmlNode ) throws JAXBException
{
return unmarshal( source, rootXmlNode, Collections.<String, Object>emptyMap() );
}
public static <T> T unmarshal( File source, Class<T> rootXmlNode, Map<String, ?> props )
throws JAXBException
{
Class<?>[] classesToBeBound = { rootXmlNode };
JAXBContext ctx = newInstance( classesToBeBound );
Unmarshaller unmarshaller = ctx.createUnmarshaller();
properties( props, unmarshaller );
unmarshaller.setEventHandler( new DefaultValidationEventHandler() );
JAXBElement<T> element = unmarshaller.unmarshal( new StreamSource( source ), rootXmlNode );
return element.getValue();
}
public static <T> String marshal( T bean, Charset encoding ) throws JAXBException, IOException
{
return marshal( bean, Collections.<String, Object>emptyMap(), encoding ).toString();
}
@SuppressWarnings( "unchecked" )
public static <T> StringWrit
er marshal( T bean, Map<String, Object> props, Charset encoding )
throws JAXBException, IOException
{
return marshal( bean, (Class<T>) bean.getClass(), props, encoding );
}
public static <T> StringWriter marshal( T bean, Class<T> type, Map<String, Object> props, Charset encoding )
throws JAXBException, IOException
{
JAXBElement<T> rootElement = buildJaxbElement( bean, type );
return marshal( rootElement, type, props, encoding );
}
public static <T> StringWriter marshal( JAXBElement<T> rootElement, Class<T> type,
Map<String, Object> props, Charset encoding )
throws JAXBException, IOException
{
StringWriter destination = new StringWriter( 256 );
marshal( rootElement, type, props, destination, encoding );
destination.flush();
return destination;
}
public static <T> void marshal( JAXBElement<T> rootElement, Class<T
> type, Map<String, Object> props,
Writer destination, Charset encoding ) throws JAXBException
{
Class<?>[] classesToBeBound = { type };
JAXBContext context = newInstance( classesToBeBound );
Marshaller marshaller = context.createMarshaller();
marshaller.setProperty( JAXB_ENCODING, encoding.name() );
marshaller.setProperty( JAXB_FORMATTED_OUTPUT, true );
marshaller.setProperty( JAXB_FRAGMENT, true );
properties( props, marshaller );
marshaller.marshal( rootElement, destination );
}
private static <T> JAXBElement<T> buildJaxbElement( T bean, Class<T> type )
{
XmlRootElement xmlRootElement = type.getAnnotation( XmlRootElement.class );
if ( xmlRootElement == null )
{
return null;
}
QName root = new QName( "", xmlRootElement.name() );
return new JAXBElement<T>( root, type, bean );
}
private static void p
roperties( Map<String, ?> props, Unmarshaller unmarshaller ) throws PropertyException
{
for ( Entry<String, ?> e : props.entrySet() )
{
unmarshaller.setProperty( e.getKey(), e.getValue() );
}
}
private static void properties( Map<String, ?> props, Marshaller marshaller ) throws PropertyException
{
for ( Entry<String, ?> e : props.entrySet() )
{
marshaller.setProperty( e.getKey(), e.getValue() );
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
index cd69d68..8414d6b 100644
--- a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
+++ b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java
@@ -1 +1 @@
-package org.apache.maven.plugin.failsafe;
/*
* 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 org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.versioning.Invali
dVersionSpecificationException;
import org.apache.maven.project.MavenProject;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.fest.assertions.Assertions.assertThat;
/**
* @since 2.19.2
*/
public class IntegrationTestMojoTest
{
private IntegrationTestMojo mojo;
@Before
public void init() throws InvalidVersionSpecificationException, IOException
{
Artifact artifact = new DefaultArtifact( "g", "a", createFromVersionSpec( "1.0" ), "compile", "jar", "", null );
artifact.setFile( new File( "./target/tmp/a-1.0.jar" ) );
new File( "./target/tmp" ).mkdir();
artifact.getFile().createNewFile();
mojo = spy( IntegrationTestMojo.class );
MavenProject project =
mock( MavenProject.class );
when( project.getArtifact() ).thenReturn( artifact );
when( mojo.getProject() ).thenReturn( project );
}
@Test
public void shouldBeJar()
{
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
File binaries = mojo.getClassesDirectory();
assertThat( binaries.getName() ).isEqualTo( "a-1.0.jar" );
}
@Test
public void shouldBeAnotherJar()
{
mojo.setClassesDirectory( new File( "./target/another-1.0.jar" ) );
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
File binaries = mojo.getClassesDirectory();
assertThat( binaries.getName() ).isEqualTo( "another-1.0.jar" );
}
@Test
public void shouldBeClasses()
{
mojo.setClassesDirectory( new File( "./target/classes" ) );
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
File binaries = mojo.getClassesDirectory();
assertT
hat( binaries.getName() ).isEqualTo( "classes" );
}
}
\ No newline at end of file
+package org.apache.maven.plugin.failsafe;
/*
* 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 org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.versioning.Invali
dVersionSpecificationException;
import org.apache.maven.project.MavenProject;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.fest.assertions.Assertions.assertThat;
/**
* @since 2.20
*/
public class IntegrationTestMojoTest
{
private IntegrationTestMojo mojo;
@Before
public void init() throws InvalidVersionSpecificationException, IOException
{
Artifact artifact = new DefaultArtifact( "g", "a", createFromVersionSpec( "1.0" ), "compile", "jar", "", null );
artifact.setFile( new File( "./target/tmp/a-1.0.jar" ) );
new File( "./target/tmp" ).mkdir();
artifact.getFile().createNewFile();
mojo = spy( IntegrationTestMojo.class );
MavenProject project = mo
ck( MavenProject.class );
when( project.getArtifact() ).thenReturn( artifact );
when( mojo.getProject() ).thenReturn( project );
}
@Test
public void shouldBeJar()
{
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
File binaries = mojo.getClassesDirectory();
assertThat( binaries.getName() ).isEqualTo( "a-1.0.jar" );
}
@Test
public void shouldBeAnotherJar()
{
mojo.setClassesDirectory( new File( "./target/another-1.0.jar" ) );
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
File binaries = mojo.getClassesDirectory();
assertThat( binaries.getName() ).isEqualTo( "another-1.0.jar" );
}
@Test
public void shouldBeClasses()
{
mojo.setClassesDirectory( new File( "./target/classes" ) );
mojo.setDefaultClassesDirectory( new File( "./target/classes" ) );
File binaries = mojo.getClassesDirectory();
assertTha
t( binaries.getName() ).isEqualTo( "classes" );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
index 1ffb7d9..fa7ac8e 100644
--- a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
+++ b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
@@ -1 +1 @@
-package org.apache.maven.plugin.failsafe;
/*
* 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 org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummaryXmlUtils;
import org.apache.maven.surefire.suite.RunResult;
import org.junit.
Test;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19.2
*/
public class RunResultTest
{
@Test
public void testAggregatedValues()
{
RunResult simple = getSimpleAggregate();
assertThat( simple.getCompletedCount() )
.isEqualTo( 20 );
assertThat( simple.getErrors() )
.isEqualTo( 3 );
assertThat( simple.getFailures() )
.isEqualTo( 7 );
assertThat( simple.getSkipped() )
.isEqualTo( 4 );
assertThat( simple.getFlakes() )
.isEqualTo( 2 );
}
@Test
public void testSerialization()
throws IOException, JAXBException
{
writeReadCheck( getSimpleAggregate() );
}
@Test
public void te
stFailures()
throws IOException, JAXBException
{
writeReadCheck( new RunResult( 0, 1, 2, 3, "stacktraceHere", false ) );
}
@Test
public void testSkipped()
throws IOException, JAXBException
{
writeReadCheck( new RunResult( 3, 2, 1, 0, null, true ) );
}
@Test
public void testAppendSerialization()
throws IOException, JAXBException
{
RunResult simpleAggregate = getSimpleAggregate();
RunResult additional = new RunResult( 2, 1, 2, 2, "msg " + ( (char) 0x0E01 ), true );
File summary = File.createTempFile( "failsafe", "test" );
FailsafeSummaryXmlUtils.writeSummary( simpleAggregate, summary, false, FailsafeSummaryXmlUtils.UTF8 );
FailsafeSummaryXmlUtils.writeSummary( additional, summary, true, FailsafeSummaryXmlUtils.UTF8 );
RunResult actual = FailsafeSummaryXmlUtils.toRunResult( summary );
//noinspection ResultOfMethodCallIgnored
summary.
delete();
RunResult expected = simpleAggregate.aggregate( additional );
assertThat( expected.getCompletedCount() )
.isEqualTo( 22 );
assertThat( expected.getErrors() )
.isEqualTo( 4 );
assertThat( expected.getFailures() )
.isEqualTo( 9 );
assertThat( expected.getSkipped() )
.isEqualTo( 6 );
assertThat( expected.getFlakes() )
.isEqualTo( 2 );
assertThat( expected.getFailure() )
.isEqualTo( "msg " + ( (char) 0x0E01 ) );
assertThat( expected.isTimeout() )
.isTrue();
assertThat( actual )
.isEqualTo( expected );
}
@Test
public void shouldAcceptAliasCharset()
{
Charset charset1 = IntegrationTestMojo.toCharset( "UTF8" );
assertThat( charset1.name() ).isEqualTo( "UTF-8" );
Charset charset2 = IntegrationTestMojo.toCharset( "utf8" );
asse
rtThat( charset2.name() ).isEqualTo( "UTF-8" );
}
private void writeReadCheck( RunResult expected )
throws IOException, JAXBException
{
File tmp = File.createTempFile( "test", "xml" );
FailsafeSummaryXmlUtils.fromRunResultToFile( expected, tmp );
RunResult actual = FailsafeSummaryXmlUtils.toRunResult( tmp );
//noinspection ResultOfMethodCallIgnored
tmp.delete();
assertThat( actual )
.isEqualTo( expected );
}
private RunResult getSimpleAggregate()
{
RunResult resultOne = new RunResult( 10, 1, 3, 2, 1 );
RunResult resultTwo = new RunResult( 10, 2, 4, 2, 1 );
return resultOne.aggregate( resultTwo );
}
}
\ No newline at end of file
+package org.apache.maven.plugin.failsafe;
/*
* 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 org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummaryXmlUtils;
import org.apache.maven.surefire.suite.RunResult;
import org.junit.
Test;
import javax.xml.bind.JAXBException;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.20
*/
public class RunResultTest
{
@Test
public void testAggregatedValues()
{
RunResult simple = getSimpleAggregate();
assertThat( simple.getCompletedCount() )
.isEqualTo( 20 );
assertThat( simple.getErrors() )
.isEqualTo( 3 );
assertThat( simple.getFailures() )
.isEqualTo( 7 );
assertThat( simple.getSkipped() )
.isEqualTo( 4 );
assertThat( simple.getFlakes() )
.isEqualTo( 2 );
}
@Test
public void testSerialization()
throws IOException, JAXBException
{
writeReadCheck( getSimpleAggregate() );
}
@Test
public void test
Failures()
throws IOException, JAXBException
{
writeReadCheck( new RunResult( 0, 1, 2, 3, "stacktraceHere", false ) );
}
@Test
public void testSkipped()
throws IOException, JAXBException
{
writeReadCheck( new RunResult( 3, 2, 1, 0, null, true ) );
}
@Test
public void testAppendSerialization()
throws IOException, JAXBException
{
RunResult simpleAggregate = getSimpleAggregate();
RunResult additional = new RunResult( 2, 1, 2, 2, "msg " + ( (char) 0x0E01 ), true );
File summary = File.createTempFile( "failsafe", "test" );
FailsafeSummaryXmlUtils.writeSummary( simpleAggregate, summary, false, FailsafeSummaryXmlUtils.UTF8 );
FailsafeSummaryXmlUtils.writeSummary( additional, summary, true, FailsafeSummaryXmlUtils.UTF8 );
RunResult actual = FailsafeSummaryXmlUtils.toRunResult( summary );
//noinspection ResultOfMethodCallIgnored
summary.de
lete();
RunResult expected = simpleAggregate.aggregate( additional );
assertThat( expected.getCompletedCount() )
.isEqualTo( 22 );
assertThat( expected.getErrors() )
.isEqualTo( 4 );
assertThat( expected.getFailures() )
.isEqualTo( 9 );
assertThat( expected.getSkipped() )
.isEqualTo( 6 );
assertThat( expected.getFlakes() )
.isEqualTo( 2 );
assertThat( expected.getFailure() )
.isEqualTo( "msg " + ( (char) 0x0E01 ) );
assertThat( expected.isTimeout() )
.isTrue();
assertThat( actual )
.isEqualTo( expected );
}
@Test
public void shouldAcceptAliasCharset()
{
Charset charset1 = IntegrationTestMojo.toCharset( "UTF8" );
assertThat( charset1.name() ).isEqualTo( "UTF-8" );
Charset charset2 = IntegrationTestMojo.toCharset( "utf8" );
assert
That( charset2.name() ).isEqualTo( "UTF-8" );
}
private void writeReadCheck( RunResult expected )
throws IOException, JAXBException
{
File tmp = File.createTempFile( "test", "xml" );
FailsafeSummaryXmlUtils.fromRunResultToFile( expected, tmp );
RunResult actual = FailsafeSummaryXmlUtils.toRunResult( tmp );
//noinspection ResultOfMethodCallIgnored
tmp.delete();
assertThat( actual )
.isEqualTo( expected );
}
private RunResult getSimpleAggregate()
{
RunResult resultOne = new RunResult( 10, 1, 3, 2, 1 );
RunResult resultTwo = new RunResult( 10, 2, 4, 2, 1 );
return resultOne.aggregate( resultTwo );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 6e8ac70..dfe9a02 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<artifactId>maven-surefire-common</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
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 c76d8a1..16c25ec 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
@@ -336,7 +336,7 @@ public abstract class AbstractSurefireMojo
* Relative path to <i>project.build.directory</i> containing internal Surefire temporary files.
* It is deleted after the test set has completed.
*
- * @since 2.19.2
+ * @since 2.20
*/
@Parameter( property = "tempDir", defaultValue = "surefire" )
private String tempDir;
@@ -664,7 +664,7 @@ public abstract class AbstractSurefireMojo
/**
* Read-only parameter with value of Maven property <i>project.build.directory</i>.
- * @since 2.19.2
+ * @since 2.20
*/
@Parameter( defaultValue = "${project.build.directory}", readonly = true )
private File projectBuildDirectory;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/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 48063d3..0ddc392 100644
--- 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
@@ -26,7 +26,7 @@ import org.apache.maven.shared.utils.cli.StreamConsumer;
* Used by forked JMV, see {@link org.apache.maven.plugin.surefire.booterclient.ForkStarter}.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
* @see org.apache.maven.plugin.surefire.booterclient.ForkStarter
*/
public final class NativeStdErrStreamConsumer
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
index 7884270..d93813e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/log/PluginConsoleLogger.java
@@ -27,7 +27,7 @@ import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
* Calling {@link Log#isInfoEnabled()} before {@link Log#info(CharSequence)} due to Maven 2.2.1.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
* @see ConsoleLogger
*/
public final class PluginConsoleLogger
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleOutputReceiver.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleOutputReceiver.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleOutputReceiver.java
index 55e4ee2..e18f3aa 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleOutputReceiver.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleOutputReceiver.java
@@ -25,7 +25,7 @@ import org.apache.maven.surefire.report.ReportEntry;
* ConsoleReporter doing nothing rather than using null.
*
* @author <a href="mailto:britter@apache.org">Benedikt Ritter</a>
- * @since 2.19.2
+ * @since 2.20
*/
class NullConsoleOutputReceiver
implements TestcycleConsoleOutputReceiver
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
index 1bd4e9a..af68d1e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullConsoleReporter.java
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.report.ReportEntry;
* ConsoleReporter doing nothing rather than using null.
*
* @author <a href="mailto:britter@apache.org">Benedikt Ritter</a>
- * @since 2.19.2
+ * @since 2.20
*/
class NullConsoleReporter
extends ConsoleReporter
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
index bf7e3ef..bca3c4c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullFileReporter.java
@@ -25,7 +25,7 @@ import java.util.List;
* FileReporter doing nothing rather than using null.
*
* @author <a href="mailto:britter@apache.org">Benedikt Ritter</a>
- * @since 2.19.2
+ * @since 2.20
*/
class NullFileReporter
extends FileReporter
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatelessXmlReporter.java
index 5895c8a..7f5d202 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatelessXmlReporter.java
@@ -23,7 +23,7 @@ package org.apache.maven.plugin.surefire.report;
* FileReporter doing nothing rather than using null.
*
* @author <a href="mailto:britter@apache.org">Benedikt Ritter</a>
- * @since 2.19.2
+ * @since 2.20
*/
class NullStatelessXmlReporter
extends StatelessXmlReporter
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatisticsReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatisticsReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatisticsReporter.java
index 5e355ca..3d58096 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatisticsReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/NullStatisticsReporter.java
@@ -26,7 +26,7 @@ import org.apache.maven.surefire.report.ReportEntry;
* StatisticsReporter doing nothing rather than using null.
*
* @author <a href="mailto:britter@apache.org">Benedikt Ritter</a>
- * @since 2.19.2
+ * @since 2.20
*/
class NullStatisticsReporter
extends StatisticsReporter
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/main/java/org/apache/maven/surefire/spi/ServiceLoader.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/spi/ServiceLoader.java b/maven-surefire-common/src/main/java/org/apache/maven/surefire/spi/ServiceLoader.java
index c23e5d6..1deae7c 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/spi/ServiceLoader.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/spi/ServiceLoader.java
@@ -38,7 +38,7 @@ import static org.apache.maven.surefire.util.ReflectionUtils.getConstructor;
/**
* SPI loader for Java 1.5.
*
- * @since 2.19.2
+ * @since 2.20
*/
public class ServiceLoader
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireReflectorTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireReflectorTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireReflectorTest.java
index cd31d34..a7c8b9d 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireReflectorTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireReflectorTest.java
@@ -1 +1 @@
-package org.apache.maven.plugin.surefire;
/*
* 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 org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.log.api.ConsoleLoggerDecorator;
import o
rg.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
import org.apache.maven.surefire.booter.IsolatedClassLoader;
import org.apache.maven.surefire.booter.SurefireReflector;
import org.junit.Before;
import org.junit.Test;
import static org.apache.maven.surefire.util.ReflectionUtils.getMethod;
import static org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @see ConsoleLogger
* @see SurefireReflector
* @since 2.19.2
*/
public class SurefireReflectorTest
{
private ConsoleLogger logger;
private SurefireReflector reflector;
@Before
public void prepareData()
{
logger = spy( new PrintStreamLogger( System.out ) );
ClassLoader cl = new IsolatedClassLoader( Thread.currentThread().getContextClassLoader(), false, "role" );
reflector = new SurefireReflector( cl );
}
@Test
public void shouldProxyConsoleLogger()
{
Object mirror = reflector.createConsoleLogger( logger );
assertThat( mirror, is( notNullValue() ) );
assertThat( mirror.getClass().getInterfaces()[0].getName(), is( ConsoleLogger.class.getName() ) );
assertThat( mirror, is( not( sameInstance( (Object) logger ) ) ) );
assertThat( mirror, is( instanceOf( ConsoleLoggerDecorator.class ) ) );
invokeMethodWithArray( mirror, getMethod( mirror, "info", String.class ), "Hi There!" );
verify( logger, times( 1 ) ).info( "Hi There!" );
}
}
\ No newline at end of file
+package org.apache.maven.plugin.surefire;
/*
* 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 org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.log.api.ConsoleLoggerDecorator;
import o
rg.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
import org.apache.maven.surefire.booter.IsolatedClassLoader;
import org.apache.maven.surefire.booter.SurefireReflector;
import org.junit.Before;
import org.junit.Test;
import static org.apache.maven.surefire.util.ReflectionUtils.getMethod;
import static org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @see ConsoleLogger
* @see SurefireReflector
* @since 2.20
*/
public class SurefireReflectorTest
{
private ConsoleLogger logger;
private SurefireReflector reflector;
@Before
public void prepareData()
{
logger = spy( new PrintStreamLogger( System.out ) );
ClassLoader cl = new IsolatedClassLoader( Thread.currentThread().getContextClassLoader(), false, "role" );
reflector = new SurefireReflector( cl );
}
@Test
public void shouldProxyConsoleLogger()
{
Object mirror = reflector.createConsoleLogger( logger );
assertThat( mirror, is( notNullValue() ) );
assertThat( mirror.getClass().getInterfaces()[0].getName(), is( ConsoleLogger.class.getName() ) );
assertThat( mirror, is( not( sameInstance( (Object) logger ) ) ) );
assertThat( mirror, is( instanceOf( ConsoleLoggerDecorator.class ) ) );
invokeMethodWithArray( mirror, getMethod( mirror, "info", String.class ), "Hi There!" );
verify( logger, times( 1 ) ).info( "Hi There!" );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/CustomizedImpl.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/CustomizedImpl.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/CustomizedImpl.java
index 70e2255..2809f2c 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/CustomizedImpl.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/CustomizedImpl.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public class CustomizedImpl
implements IDefault
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/DefaultImpl.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/DefaultImpl.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/DefaultImpl.java
index e623f0b..54de2b7 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/DefaultImpl.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/DefaultImpl.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public class DefaultImpl
implements IDefault
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/EmptyServiceInterface.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/EmptyServiceInterface.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/EmptyServiceInterface.java
index 38a186c..30abd69 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/EmptyServiceInterface.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/EmptyServiceInterface.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public interface EmptyServiceInterface
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/ExistingServiceInterface.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/ExistingServiceInterface.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/ExistingServiceInterface.java
index 9d7fa25..45e3ab4 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/ExistingServiceInterface.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/ExistingServiceInterface.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public interface ExistingServiceInterface
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
index 53b7b38..db8127e 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public interface IDefault
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/NoServiceInterface.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/NoServiceInterface.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/NoServiceInterface.java
index af649b9..e28a07c 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/NoServiceInterface.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/NoServiceInterface.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public interface NoServiceInterface
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPITest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPITest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPITest.java
index a8058f8..2d8cc9f 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPITest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPITest.java
@@ -29,7 +29,7 @@ import static org.fest.assertions.Assertions.assertThat;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public class SPITest
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl1.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl1.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl1.java
index e96cec7..3f3f276 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl1.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl1.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public class SPImpl1 implements ExistingServiceInterface
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl2.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl2.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl2.java
index 75806b9..42b446b 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl2.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/SPImpl2.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.spi;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public class SPImpl2 implements ExistingServiceInterface
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index ba4b748..d6bed25 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index 943ed69..8008a47 100644
--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -145,7 +145,7 @@ public class SurefirePlugin
* http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html</a>
* Turns to default fallback value of 30 seconds if negative integer.
*
- * @since 2.19.2
+ * @since 2.20
*/
@Parameter( property = "surefire.exitTimeout", defaultValue = "30" )
private int forkedProcessExitTimeoutInSeconds;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 81e0214..36fb3c4 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
index ba83734..667bc95 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/PluginConsoleLogger.java
@@ -31,7 +31,7 @@ import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
* Calling {@link Log#isInfoEnabled()} before {@link Log#info(CharSequence)} due to Maven 2.2.1.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
* @see ConsoleLogger
*/
final class PluginConsoleLogger
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02f9b80..688379d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven Surefire</name>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-api/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index a35f983..5f0f2fd 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<artifactId>surefire-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
index 5df6d59..99c921d 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
@@ -31,7 +31,7 @@ import static org.apache.maven.surefire.util.internal.DumpFileUtils.newDumpFile;
* Fail-safe.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public final class DumpErrorSingleton
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
index b561295..ebf0795 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
@@ -35,7 +35,7 @@ import java.util.Date;
* Each call logs a date when it was written to the dump file.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public final class DumpFileUtils
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java
index 93d914d..996c3be 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java
@@ -1 +1 @@
-package org.apache.maven.surefire.util.internal;
/*
* 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.
*/
/**
* Similar to Java 7 java.util.Objects.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2
.19.2
*/
public final class ObjectUtils
{
private ObjectUtils()
{
throw new IllegalStateException( "no instantiable constructor" );
}
public static <T> T useNonNull( T target, T fallback )
{
return isNull( target ) ? fallback : target;
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static boolean isNull( Object target )
{
return target == null;
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static boolean nonNull( Object target )
{
return !isNull( target );
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static <T> T requireNonNull( T obj, String message )
{
if ( isNull( obj ) )
{
throw new NullPointerException( message );
}
return obj;
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static <T> T requireNonN
ull( T obj )
{
return requireNonNull( obj, null );
}
}
\ No newline at end of file
+package org.apache.maven.surefire.util.internal;
/*
* 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.
*/
/**
* Similar to Java 7 java.util.Objects.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2
.20
*/
public final class ObjectUtils
{
private ObjectUtils()
{
throw new IllegalStateException( "no instantiable constructor" );
}
public static <T> T useNonNull( T target, T fallback )
{
return isNull( target ) ? fallback : target;
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static boolean isNull( Object target )
{
return target == null;
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static boolean nonNull( Object target )
{
return !isNull( target );
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static <T> T requireNonNull( T obj, String message )
{
if ( isNull( obj ) )
{
throw new NullPointerException( message );
}
return obj;
}
/*
* In JDK7 use java.util.Objects instead.
* todo
* */
public static <T> T requireNonNul
l( T obj )
{
return requireNonNull( obj, null );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
index 29b4f51..1a30c72 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java
@@ -1 +1 @@
-package org.apache.maven.surefire.util.internal;
/*
* 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.regex.Matcher;
import java.util.regex.Pattern;
/**
* JUnit Description parser.
* Used by JUnit Version lower than 4.
7.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.19.2
*/
public final class TestClassMethodNameUtils
{
private static final Pattern METHOD_CLASS_PATTERN = Pattern.compile( "([\\s\\S]*)\\((.*)\\)" );
private TestClassMethodNameUtils()
{
throw new IllegalStateException( "no instantiable constructor" );
}
public static String extractClassName( String displayName )
{
Matcher m = METHOD_CLASS_PATTERN.matcher( displayName );
return m.matches() ? m.group( 2 ) : displayName;
}
public static String extractMethodName( String displayName )
{
int i = displayName.indexOf( "(" );
return i >= 0 ? displayName.substring( 0, i ) : displayName;
}
}
\ No newline at end of file
+package org.apache.maven.surefire.util.internal;
/*
* 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.regex.Matcher;
import java.util.regex.Pattern;
/**
* JUnit Description parser.
* Used by JUnit Version lower than 4.
7.
*
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
* @since 2.20
*/
public final class TestClassMethodNameUtils
{
private static final Pattern METHOD_CLASS_PATTERN = Pattern.compile( "([\\s\\S]*)\\((.*)\\)" );
private TestClassMethodNameUtils()
{
throw new IllegalStateException( "no instantiable constructor" );
}
public static String extractClassName( String displayName )
{
Matcher m = METHOD_CLASS_PATTERN.matcher( displayName );
return m.matches() ? m.group( 2 ) : displayName;
}
public static String extractMethodName( String displayName )
{
int i = displayName.indexOf( "(" );
return i >= 0 ? displayName.substring( 0, i ) : displayName;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-booter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index 4ded628..803366b 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<artifactId>surefire-booter</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-grouper/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
index bcd1b3f..5abf38c 100644
--- a/surefire-grouper/pom.xml
+++ b/surefire-grouper/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<artifactId>surefire-grouper</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index d55d14b..b8c6d76 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.19.2-SNAPSHOT</version>
+ <version>2.20-SNAPSHOT</version>
</parent>
<artifactId>surefire-integration-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/93d3f8a9/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
index 4a638b6..42657c0 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.hasItems;
/**
* @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19.2
+ * @since 2.20
*/
public class MavenLauncherTest
{