[6/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
[SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b54e33e6 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b54e33e6 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b54e33e6 Branch: refs/heads/master Commit: b54e33e68e9c3e13f8fca4b66dbb5c89a0a30715 Parents: cba4adb Author: Tibor17Authored: Sun Apr 23 10:20:35 2017 +0200 Committer: Tibor17 Committed: Mon May 1 14:21:46 2017 +0200 -- maven-failsafe-plugin/pom.xml | 23 ++ .../plugin/failsafe/IntegrationTestMojo.java| 203 ++ .../maven/plugin/failsafe/VerifyMojo.java | 2 +- .../failsafe/util/FailsafeSummaryXmlUtils.java | 94 .../apache/maven/plugin/failsafe/util/JAXB.java | 104 + .../plugin/failsafe/xmlsummary/ErrorType.java | 1 - .../failsafe/xmlsummary/FailsafeSummary.java| 1 - .../xmlsummary/FailsafeSummaryXmlUtils.java | 104 - .../maven/plugin/failsafe/xmlsummary/JAXB.java | 1 - .../failsafe/xmlsummary/ObjectFactory.java | 1 - .../failsafe/MarshallerUnmarshallerTest.java| 62 ++ .../maven/plugin/failsafe/RunResultTest.java| 2 +- maven-surefire-common/pom.xml | 1 - .../plugin/surefire/AbstractSurefireMojo.java | 214 ++- .../surefire/InPluginVMSurefireStarter.java | 2 +- .../surefire/StartupReportConfiguration.java| 6 +- .../surefire/SurefireExecutionParameters.java | 1 - .../surefire/SurefireReportParameters.java | 1 - .../surefire/booterclient/BooterSerializer.java | 4 +- .../booterclient/ForkConfiguration.java | 3 +- .../surefire/booterclient/ForkStarter.java | 4 +- .../surefire/booterclient/ProviderDetector.java | 1 - .../lazytestprovider/AbstractCommandStream.java | 4 + .../TestProvidingInputStream.java | 6 +- .../output/DeserializedStacktraceWriter.java| 2 +- .../booterclient/output/ForkClient.java | 6 +- .../output/ThreadedStreamConsumer.java | 8 +- .../report/ConsoleOutputFileReporter.java | 2 +- .../surefire/report/DefaultReporterFactory.java | 4 +- .../surefire/report/DirectConsoleOutput.java| 2 +- .../surefire/report/StatelessXmlReporter.java | 5 +- .../surefire/report/TestSetRunListener.java | 2 +- .../org/apache/maven/surefire/spi/IDefault.java | 4 +- .../maven/plugin/surefire/SurefirePlugin.java | 204 +- .../src/site/resources/xsd/bindings.xml | 1 - .../src/site/resources/xsd/failsafe-summary.xjb | 31 +++ maven-surefire-report-plugin/pom.xml| 1 - .../surefire/report/FailsafeReportMojo.java | 2 +- .../surefire/report/SurefireReportMojo.java | 2 +- .../resources/surefire-report_sv.properties | 2 + pom.xml | 53 - .../maven/surefire/booter/CommandReader.java| 4 +- .../surefire/booter/DumpErrorSingleton.java | 2 +- .../maven/surefire/booter/FailFastAware.java| 2 +- .../surefire/booter/ForkingReporterFactory.java | 2 - .../surefire/booter/ForkingRunListener.java | 6 +- .../maven/surefire/booter/ShutdownAware.java| 2 +- .../surefire/booter/SurefireReflector.java | 2 +- .../maven/surefire/cli/CommandLineOption.java | 2 +- .../providerapi/ProviderParameters.java | 8 +- .../surefire/providerapi/SurefireProvider.java | 17 +- .../surefire/report/ConsoleOutputCapture.java | 2 +- .../report/LegacyPojoStackTraceWriter.java | 1 - .../maven/surefire/report/ReportEntry.java | 3 +- .../surefire/report/ReporterConfiguration.java | 2 +- .../maven/surefire/report/RunListener.java | 2 +- .../surefire/report/SimpleReportEntry.java | 45 ++-- .../apache/maven/surefire/suite/RunResult.java | 2 +- .../maven/surefire/testset/ResolvedTest.java| 29 ++- .../surefire/testset/TestListResolver.java | 8 +- .../maven/surefire/testset/TestRequest.java | 2 + .../testset/TestSetFailedException.java | 23 +- .../util/SurefireReflectionException.java | 5 +- .../util/internal/DaemonThreadFactory.java | 1 + .../surefire/util/internal/DumpFileUtils.java | 3 + .../surefire/util/internal/StringUtils.java | 66 ++ .../surefire/testset/FundamentalFilterTest.java | 1 + .../surefire/booter/BooterDeserializer.java | 4 +- .../apache/maven/surefire/booter/Classpath.java | 3 + .../surefire/booter/ClasspathConfiguration.java | 2 +- .../maven/surefire/booter/ForkedBooter.java | 6 +- .../surefire/booter/IsolatedClassLoader.java| 2 +- .../surefire/booter/ProviderConfiguration.java | 2 +-
[2/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml index e7c4b6f..08ba73d 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml index 62ef251..479caa3 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml index d9a9a84..6a1b46e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml @@ -21,7 +21,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml index 799f87e..b35d70e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml index 28d0420..3867dd2 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0;
[5/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/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 f2c32d0..551d980 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 @@ -135,7 +135,7 @@ public abstract class AbstractSurefireMojo protected boolean skipTests; /** - * This old parameter is just like skipTests, but bound to the old property "maven.test.skip.exec". + * This old parameter is just like {@code skipTests}, but bound to the old property "maven.test.skip.exec". * * @since 2.3 * @deprecated Use skipTests instead. @@ -147,7 +147,7 @@ public abstract class AbstractSurefireMojo /** * Set this to "true" to bypass unit tests entirely. Its use is NOT RECOMMENDED, especially if you enable it using * the "maven.test.skip" property, because maven.test.skip disables both running the tests and compiling the tests. - * Consider using the skipTests parameter instead. + * Consider using the {@code skipTests} parameter instead. */ @Parameter( property = "maven.test.skip", defaultValue = "false" ) protected boolean skip; @@ -184,7 +184,7 @@ public abstract class AbstractSurefireMojo /** * A dependency scope to exclude from the test classpath. The scope should be one of the scopes defined by * org.apache.maven.artifact.Artifact. This includes the following: - * + * * * compile - system, provided, compile * runtime - compile, runtime @@ -215,23 +215,28 @@ public abstract class AbstractSurefireMojo private File testSourceDirectory; /** - * A list of exclude> elements specifying the tests (by pattern) that should be excluded in testing. When not - * specified and when the test parameter is not specified, the default excludes will be - * excludes> - * exclude>***$*/exclude> - * /excludes> - * (which excludes all inner classes). - * This parameter is ignored if the TestNG suiteXmlFiles parameter is specified. - * - * Each exclude item may also contain a comma-separated sublist of items, which will be treated as multiple - * exclude> entries. - * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG): - * %regex[pkg.*Slow.*.class], Unstable* - * - * Notice that these values are relative to the directory containing generated test classes of the project - * being tested. This directory is declared by the parameter testClassesDirectory which defaults - * to the POM property ${project.build.testOutputDirectory}, typically src/test/java - * unless overridden. + * A list of exclude elements specifying the tests (by pattern) that should be excluded in testing. When not + * specified and when the {@code test} parameter is not specified, the default excludes will be + * + * {@literal } + * {@literal }**{@literal /}*$*{@literal } + * {@literal } + * + * (which excludes all inner classes). + * + * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified. + * + * Each exclude item may also contain a comma-separated sub-list of items, which will be treated as multiple + * exclude entries. + * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG): + * + * {@literal }%regex[pkg.*Slow.*.class], Unstable*{@literal } + * + * + * Notice that these values are relative to the directory containing generated test classes of the project + * being tested. This directory is declared by the parameter {@code testClassesDirectory} which defaults + * to the POM property ${project.build.testOutputDirectory}, typically + * {@literal src/test/java} unless overridden. */ @Parameter // TODO use regex for fully qualified class names in 3.0 and change the filtering abilities @@ -319,13 +324,14 @@ public abstract class AbstractSurefireMojo private Boolean failIfNoTests; /** - * DEPRECATED since version 2.14. Use forkCount and reuseForks instead. - * - * - * Option to specify the forking mode. Can be "never", "once", "always", "perthread". "none" and "pertest" are also - * accepted for backwards compatibility. "always" forks for each test-class. "perthread" will create - * threadCount parallel forks, each executing one test-class. See also parameter - * reuseForks. + *
[4/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java index 9b27c1c..9eccf6b 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java @@ -26,13 +26,13 @@ import org.apache.maven.surefire.testset.TestSetFailedException; /** * Interface to be implemented by all Surefire providers. - * + * * NOTE: This class is part of the proposed public api for surefire providers for 2.7. It may * still be subject to changes, even for minor revisions. - * + * * The api covers this interface and all the types reachable from it. And nothing else. - * - * + * + * * Called in one of three ways: * Forkmode = never: getSuites is not called, invoke is called with null parameter * Forkmode = once: getSuites is not called, invoke is called with null parameter @@ -45,7 +45,7 @@ public interface SurefireProvider { /** * Determines the number of forks. - * + * * Called when forkmode is different from "never" or "always", allows the provider to define * how to behave for the fork. * @@ -64,6 +64,7 @@ public interface SurefireProvider * When reporting fails * @throws org.apache.maven.surefire.testset.TestSetFailedException * When testset fails + * @throws InvocationTargetException fails in {@code ProviderFactory} */ @SuppressWarnings( "checkstyle:redundantthrows" ) RunResult invoke( Object forkTestSet ) @@ -72,14 +73,14 @@ public interface SurefireProvider /** * Makes an attempt at cancelling the current run, giving the provider a chance to notify * reporting that the remaining tests have been cancelled due to timeout. - * + * * If the provider thinks it can terminate properly it is the responsibility of * the invoke method to return a RunResult with a booter code of failure. - * + * * It is up to the provider to find out how to implement this method properly. * A provider may also choose to not do anything at all in this method, * which means surefire will kill the forked process soon afterwards anyway. - * + * * Will be called on a different thread than the one calling invoke. */ // Todo: Need to think a lot closer about how/if this works and if there is a use case for it. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java index 28f111b..d4af679 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java @@ -29,7 +29,7 @@ import static org.apache.maven.surefire.util.internal.StringUtils.NL; /** * Deals with system.out/err. - * + * */ public class ConsoleOutputCapture { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java index 88552cb..dee095c 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java @@ -29,7 +29,6 @@ import java.io.StringWriter; * Write the trace out for a POJO test. Java 1.5 compatible. * * @author mailto:br...@apache.org;>Brett Porter - * @noinspection ThrowableResultOfMethodCallIgnored */ public class LegacyPojoStackTraceWriter implements StackTraceWriter http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java index 2bc3fcd..ec0f782 100644 ---
[3/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml index 3cc74a1..6360bed 100644 --- a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml +++ b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml index 2eed551..0cce4c9 100644 --- a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml +++ b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml index e679767..2a6d6c2 100644 --- a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml +++ b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml index 069dacf..8530eca 100644 --- a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml +++ b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> org.apache.maven.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml index 6b16431..49c4e34 100644 --- a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml +++ b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-order/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml index a72c2f5..b49fda7
[1/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
Repository: maven-surefire Updated Branches: refs/heads/master cba4adb1b -> b54e33e68 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml index 4cb27c6..760211d 100644 --- a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml index f1a554b..84378e8 100644 --- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml index d9d0a31..c90c6e0 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml index 58c275c..ca93853 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml @@ -10,7 +10,7 @@ --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml index 88eb6da..5f2e8e7 100644 --- a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0
[23/27] maven git commit: Improve Javadoc of ComparableVersion#main()
Improve Javadoc of ComparableVersion#main() This closes #108 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6a93bbea Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6a93bbea Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6a93bbea Branch: refs/heads/MNG-6069 Commit: 6a93bbea23e362c9cea7d710a37556258c2dbd47 Parents: 08f3c76 10a18cf Author: Lubomir VargaAuthored: Tue Apr 11 16:00:42 2017 +0200 Committer: Michael Osipov Committed: Tue Apr 11 16:02:21 2017 +0200 -- .../maven/artifact/versioning/ComparableVersion.java | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/6a93bbea/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java -- diff --cc maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 5222871,0ae4acb..e1fc5f0 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@@ -472,8 -472,19 +472,19 @@@ public class ComparableVersio /** * Main to test version parsing and comparison. + * - * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can issue - * java -cp ~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT" - * command to commandline. Result of given command will be something like this: - * java -cp ${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT" ++ * command to command line. Result of given command will be something like this: ++ * + * Display parameters as parsed by Maven (in canonical form) and comparison result: + * 1. 1.2.7 == 1.2.7 - *1.2.7 > 1.2-SNAPSHOT ++ *1.2.7 1.2-SNAPSHOT + * 2. 1.2-SNAPSHOT == 1.2-snapshot + * * - * @param args the version strings to parse and compare + * @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always + * two adjacent will be compared */ public static void main( String... args ) {
[24/27] maven git commit: use "java -jar" command
use "java -jar" command Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/567af0d9 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/567af0d9 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/567af0d9 Branch: refs/heads/MNG-6069 Commit: 567af0d964cf823b275300aa4671b84a28da5baa Parents: 6a93bbe Author: Hervé BoutemyAuthored: Wed Apr 12 03:59:44 2017 +0200 Committer: Hervé Boutemy Committed: Wed Apr 12 03:59:44 2017 +0200 -- .../apache/maven/artifact/versioning/ComparableVersion.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/567af0d9/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java -- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index e1fc5f0..105d9b5 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -470,11 +470,12 @@ public class ComparableVersion return canonical.hashCode(); } +// CHECKSTYLE_OFF: LineLength /** * Main to test version parsing and comparison. * - * Checks how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can issue - * java -cp ${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT" + * To check how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can issue + * java -jar ${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar "1.2.7" "1.2-SNAPSHOT" * command to command line. Result of given command will be something like this: * * Display parameters as parsed by Maven (in canonical form) and comparison result: @@ -486,6 +487,7 @@ public class ComparableVersion * @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always * two adjacent will be compared */ +// CHECKSTYLE_ON: LineLength public static void main( String... args ) { System.out.println( "Display parameters as parsed by Maven (in canonical form) and comparison result:" );
[11/27] maven git commit: trying to make Jenkinsfile easier to understand
trying to make Jenkinsfile easier to understand Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/16805f50 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/16805f50 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/16805f50 Branch: refs/heads/MNG-6069 Commit: 16805f50ea1715c42ad59312f3e64ab70af3acfe Parents: 33c8d8e Author: Hervé BoutemyAuthored: Fri Mar 24 03:25:17 2017 +0100 Committer: Hervé Boutemy Committed: Tue Mar 28 08:03:44 2017 +0200 -- Jenkinsfile | 41 +++-- 1 file changed, 27 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/16805f50/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 123a246..cc9bd92 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,24 +22,32 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def tests try { + node('ubuntu') { -stage 'Checkout' -def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation' -echo "Driving build and unit tests using Maven $MAVEN_BUILD" -def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' -echo "Running build and unit tests with Java $JAVA7_HOME" dir('build') { -checkout scm -def WORK_DIR=pwd() -stage 'Build / Unit Test' -withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) { -sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository" +stage('Checkout') { +checkout scm } -dir ('apache-maven/target') { -sh "mv apache-maven-*-bin.zip apache-maven-dist.zip" -stash includes: 'apache-maven-dist.zip', name: 'dist' + +def WORK_DIR=pwd() + +stage('Build / Unit Test') { +def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation' +echo "Driving build and unit tests using Maven $MAVEN_BUILD" +def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' +echo "Running build and unit tests with Java $JAVA7_HOME" + + withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) { +sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository" +} + +dir ('apache-maven/target') { +sh "mv apache-maven-*-bin.zip apache-maven-dist.zip" +stash includes: 'apache-maven-dist.zip', name: 'dist' +} +junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' + tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] } } @@ -51,6 +59,7 @@ parallel linuxJava7:{ echo "Driving integration tests using Maven $MAVEN_NIX_J7" def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' echo "Running integration tests with Java $JAVA_NIX_J7" + dir('test') { def WORK_DIR=pwd() checkout tests @@ -69,6 +78,7 @@ parallel linuxJava7:{ echo "Driving integration tests using Maven $MAVEN_NIX_J8" def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK' echo "Running integration tests with Java $JAVA_NIX_J8" + dir('test') { def WORK_DIR=pwd() checkout tests @@ -93,6 +103,7 @@ parallel linuxJava7:{ JAVA_WIN_J7=pwd() } echo "Running integration tests with Java $JAVA_WIN_J7" + // need a short path or we hit 256 character limit for paths // using EXECUTOR_NUMBER guarantees that concurrent builds on same agent // will not trample each other @@ -122,6 +133,7 @@ parallel linuxJava7:{ JAVA_WIN_J8=pwd() } echo "Running integration tests with Java $JAVA_WIN_J8" + // need a short path or we hit 256 character limit for paths // using EXECUTOR_NUMBER guarantees that concurrent builds on same agent // will not trample each other @@ -140,6 +152,7 @@ parallel linuxJava7:{ } } } + } finally { node('ubuntu') { emailext
[10/27] maven git commit: INFRA have been changing JDK labels again
INFRA have been changing JDK labels again Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33c8d8ef Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33c8d8ef Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33c8d8ef Branch: refs/heads/MNG-6069 Commit: 33c8d8efe9410e134080bd979a7df82de80bcf74 Parents: 8400984 Author: Stephen ConnollyAuthored: Mon Mar 27 16:22:29 2017 +0100 Committer: Stephen Connolly Committed: Mon Mar 27 16:22:29 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/33c8d8ef/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 2ac2644..123a246 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,7 +117,7 @@ parallel linuxJava7:{ MAVEN_WIN_J8=pwd() } echo "Driving integration tests using Maven $MAVEN_WIN_J8" -def JAVA_WIN_J8=tool name: 'JDK 1.8 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' +def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' dir(JAVA_WIN_J8) { JAVA_WIN_J8=pwd() }
[25/27] maven git commit: MNG-6209 better executeMojo thread context classloader
MNG-6209 better executeMojo thread context classloader Signed-off-by: Igor FedorenkoProject: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ec629f7d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ec629f7d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ec629f7d Branch: refs/heads/MNG-6069 Commit: ec629f7d511eb910b4e80112a9fbe85ed8786f10 Parents: 567af0d Author: Igor Fedorenko Authored: Tue Apr 11 07:59:34 2017 -0700 Committer: Igor Fedorenko Committed: Thu Apr 13 14:12:23 2017 -0700 -- .../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ec629f7d/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java index b4f7a4d..3af1125 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java @@ -106,8 +106,11 @@ public class DefaultBuildPluginManager throw new PluginExecutionException( mojoExecution, project, e ); } +// use project realm as thread context classloader to enable components from all extensions=true plugins +ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? project.getClassRealm() : pluginRealm; + ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); -Thread.currentThread().setContextClassLoader( pluginRealm ); +Thread.currentThread().setContextClassLoader( tccl ); MavenSession oldSession = legacySupport.getSession();
[21/27] maven git commit: Update the DOAP to include the 3.5.0 release
Update the DOAP to include the 3.5.0 release Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/70eabfe0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/70eabfe0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/70eabfe0 Branch: refs/heads/MNG-6069 Commit: 70eabfe0f2bc5fe85b666ca511ec35574b23d32f Parents: 4c6d3a3 Author: Stephen ConnollyAuthored: Fri Apr 7 09:11:26 2017 +0100 Committer: Stephen Connolly Committed: Fri Apr 7 09:11:30 2017 +0100 -- doap_Maven.rdf | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/70eabfe0/doap_Maven.rdf -- diff --git a/doap_Maven.rdf b/doap_Maven.rdf index 86fbd1d..7b671d7 100644 --- a/doap_Maven.rdf +++ b/doap_Maven.rdf @@ -33,6 +33,17 @@ under the License. Latest stable release +2017-04-07 +3.5.0 + http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip + http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz + http://archive.apache.org/dist/maven/maven-3/3.5.0/source/apache-maven-3.5.0-src.zip + http://archive.apache.org/dist/maven/maven-3/3.5.0/source/apache-maven-3.5.0-src.tar.gz + + + + +Apache Maven 3.3.9 2015-11-14 3.3.9 http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip
[16/27] maven git commit: [MNG-6198] Use the directory specified by -f for searching with 'mvn'
[MNG-6198] Use the directory specified by -f for searching with 'mvn' Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/87cf1eeb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/87cf1eeb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/87cf1eeb Branch: refs/heads/MNG-6069 Commit: 87cf1eeb7d2506e192da77f7d5b286fae2b20314 Parents: 96543b7 Author: Stephen ConnollyAuthored: Mon Mar 27 21:07:01 2017 +0100 Committer: Stephen Connolly Committed: Sat Apr 1 11:29:09 2017 +0100 -- apache-maven/src/bin/mvn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/87cf1eeb/apache-maven/src/bin/mvn -- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index e569633..623b5f2 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -122,7 +122,7 @@ fi find_maven_basedir() { ( basedir=`find_file_argument_basedir "$@"` - wdir=`pwd` + wdir="${basedir}" while [ "$wdir" != '/' ] ; do if [ -d "$wdir"/.mvn ] ; then basedir=$wdir
[26/27] maven git commit: MNG-6210 allow maven custom guice scopes in .mvn/extensions
MNG-6210 allow maven custom guice scopes in .mvn/extensions Signed-off-by: Igor FedorenkoProject: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c2c6259d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c2c6259d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c2c6259d Branch: refs/heads/MNG-6069 Commit: c2c6259de6f1262d9b31509b8c30844a386a4f29 Parents: ec629f7 Author: Igor Fedorenko Authored: Thu Apr 13 12:58:29 2017 -0700 Committer: Igor Fedorenko Committed: Fri Apr 14 10:38:45 2017 -0700 -- .../src/main/java/org/apache/maven/cli/MavenCli.java | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/c2c6259d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 877b88b..79ab45d 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -56,6 +56,7 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequestPopulationException; import org.apache.maven.execution.MavenExecutionRequestPopulator; import org.apache.maven.execution.MavenExecutionResult; +import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule; import org.apache.maven.extension.internal.CoreExports; import org.apache.maven.extension.internal.CoreExtensionEntry; import org.apache.maven.lifecycle.LifecycleExecutionException; @@ -63,6 +64,7 @@ import org.apache.maven.model.building.ModelProcessor; import org.apache.maven.project.MavenProject; import org.apache.maven.properties.internal.EnvironmentUtils; import org.apache.maven.properties.internal.SystemProperties; +import org.apache.maven.session.scope.internal.SessionScopeModule; import org.apache.maven.shared.utils.logging.MessageBuilder; import org.apache.maven.shared.utils.logging.MessageUtils; import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest; @@ -684,20 +686,20 @@ public class MavenCli // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups container.setLookupRealm( null ); +Thread.currentThread().setContextClassLoader( container.getContainerRealm() ); container.setLoggerManager( plexusLoggerManager ); for ( CoreExtensionEntry extension : extensions ) { -container.discoverComponents( extension.getClassRealm() ); +container.discoverComponents( extension.getClassRealm(), new SessionScopeModule( container ), + new MojoExecutionScopeModule( container ) ); } customizeContainer( container ); container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() ); -Thread.currentThread().setContextClassLoader( container.getContainerRealm() ); - eventSpyDispatcher = container.lookup( EventSpyDispatcher.class ); DefaultEventSpyContext eventSpyContext = new DefaultEventSpyContext();
[14/27] maven git commit: use new "Maven 3 (latest)" and "JDK 1.x (latest)" Ubuntu+win aliases
use new "Maven 3 (latest)" and "JDK 1.x (latest)" Ubuntu+win aliases Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0baa4234 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0baa4234 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0baa4234 Branch: refs/heads/MNG-6069 Commit: 0baa42345283f4fea3938a8ccd7c8e12b34203b1 Parents: 94c3b60 Author: Hervé BoutemyAuthored: Sun Mar 26 10:27:59 2017 +0200 Committer: Hervé Boutemy Committed: Tue Mar 28 08:05:56 2017 +0200 -- Jenkinsfile | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0baa4234/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index be4485c..b6c7e19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ node('ubuntu') { stage 'Integration Test' parallel linuxJava7:{ node('ubuntu') { -def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation' +def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' echo "Driving integration tests using Maven $MAVEN_NIX_J7" def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' echo "Running integration tests with Java $JAVA_NIX_J7" @@ -75,7 +75,7 @@ parallel linuxJava7:{ } },linuxJava8: { node('ubuntu') { -def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation' +def MAVEN_NIX_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' echo "Driving integration tests using Maven $MAVEN_NIX_J8" def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK' echo "Running integration tests with Java $JAVA_NIX_J8" @@ -94,12 +94,12 @@ parallel linuxJava7:{ } }, winJava7: { node('Windows') { -def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' +def MAVEN_WIN_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J7) { MAVEN_WIN_J7=pwd() } echo "Driving integration tests using Maven $MAVEN_WIN_J7" -def JAVA_WIN_J7=tool name: 'JDK 1.7 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' +def JAVA_WIN_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK' dir(JAVA_WIN_J7) { JAVA_WIN_J7=pwd() } @@ -124,12 +124,12 @@ parallel linuxJava7:{ } }, winJava8: { node('Windows') { -def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' +def MAVEN_WIN_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J8) { MAVEN_WIN_J8=pwd() } echo "Driving integration tests using Maven $MAVEN_WIN_J8" -def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' +def JAVA_WIN_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK' dir(JAVA_WIN_J8) { JAVA_WIN_J8=pwd() }
[07/27] maven git commit: [MNG-6192] upgraded m-assembly-p to get ordered entries in zip
[MNG-6192] upgraded m-assembly-p to get ordered entries in zip Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f0535a40 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f0535a40 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f0535a40 Branch: refs/heads/MNG-6069 Commit: f0535a40e2dba47f00c5469941d3edad2a8effef Parents: 27ab750 Author: Hervé BoutemyAuthored: Thu Mar 23 05:11:12 2017 +0100 Committer: Hervé Boutemy Committed: Thu Mar 23 05:11:12 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f0535a40/pom.xml -- diff --git a/pom.xml b/pom.xml index a3d5f67..857ce07 100644 --- a/pom.xml +++ b/pom.xml @@ -539,7 +539,7 @@ under the License. org.apache.maven.plugins maven-assembly-plugin - 2.6 + 3.0.0
[08/27] maven git commit: [MNG-6168] Fix unclosed streams
[MNG-6168] Fix unclosed streams Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c Branch: refs/heads/MNG-6069 Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee Parents: f0535a4 Author: Christian SchulteAuthored: Fri Mar 24 22:04:37 2017 +0100 Committer: Christian Schulte Committed: Fri Mar 24 22:04:37 2017 +0100 -- .../metadata/io/DefaultMetadataReader.java | 19 ++--- .../toolchain/io/DefaultToolchainsReader.java | 19 ++--- .../maven/model/io/DefaultModelReader.java | 18 +++-- .../maven/model/io/DefaultModelWriter.java | 27 + .../internal/DefaultVersionRangeResolver.java | 18 +++-- .../internal/DefaultVersionResolver.java| 42 .../settings/io/DefaultSettingsReader.java | 19 ++--- .../settings/io/DefaultSettingsWriter.java | 27 + 8 files changed, 58 insertions(+), 131 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java index c769f89..51a2849 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -58,19 +57,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final Reader in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } public Metadata read( InputStream input, Map options ) @@ -78,19 +72,14 @@ public class DefaultMetadataReader { Validate.notNull( input, "input cannot be null" ); -try +try ( final InputStream in = input ) { -MetadataXpp3Reader r = new MetadataXpp3Reader(); -return r.read( input, isStrict( options ) ); +return new MetadataXpp3Reader().read( in, isStrict( options ) ); } catch ( XmlPullParserException e ) { throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e ); } -finally -{ -IOUtil.close( input ); -} } private boolean isStrict( Map options ) http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java -- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java index 9b5bdd7..86a1784 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java @@ -31,7 +31,6 @@ import javax.inject.Singleton; import org.apache.commons.lang3.Validate; import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,19 +61,14 @@ public class DefaultToolchainsReader { Validate.notNull( input, "input cannot be null" ); -
[13/27] maven git commit: switch to embedded core ITs run for faster result
switch to embedded core ITs run for faster result Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/94c3b600 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/94c3b600 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/94c3b600 Branch: refs/heads/MNG-6069 Commit: 94c3b600ec3290cda98a66c108ff021b7c4c482e Parents: ad514f5 Author: Hervé BoutemyAuthored: Fri Mar 24 03:28:59 2017 +0100 Committer: Hervé Boutemy Committed: Tue Mar 28 08:04:16 2017 +0200 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/94c3b600/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 0dae3a3..be4485c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))]) def tests -def CORE_IT_PROFILES='run-its' +def CORE_IT_PROFILES='run-its,embedded' try {
[04/27] maven git commit: s/@since 3.5.0-alpha-2/@since 3.5.0/g
s/@since 3.5.0-alpha-2/@since 3.5.0/g Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d54e6f91 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d54e6f91 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d54e6f91 Branch: refs/heads/MNG-6069 Commit: d54e6f91a8652cdda61a20f051f97f11d4c3c982 Parents: fd29dde Author: Christian SchulteAuthored: Tue Mar 21 00:21:43 2017 +0100 Committer: Christian Schulte Committed: Tue Mar 21 00:21:43 2017 +0100 -- .../java/org/apache/maven/execution/ProjectDependencyGraph.java | 2 +- .../org/apache/maven/graph/DefaultProjectDependencyGraph.java| 4 ++-- .../org/apache/maven/graph/FilteredProjectDependencyGraph.java | 2 +- .../java/org/apache/maven/project/ProjectModelResolverTest.java | 2 +- .../java/org/apache/maven/model/resolution/ModelResolver.java| 2 +- .../maven/repository/internal/DefaultModelResolverTest.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java -- diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java index d206d73..bbc8272 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java @@ -37,7 +37,7 @@ public interface ProjectDependencyGraph * * @return All collected projects. * - * @since 3.5.0-alpha-2 + * @since 3.5.0 */ List getAllProjects(); http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java -- diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java index effab0b..73cadf6 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java @@ -69,7 +69,7 @@ public class DefaultProjectDependencyGraph * * @throws DuplicateProjectException * @throws CycleDetectedException - * @since 3.5.0-alpha-2 + * @since 3.5.0 */ public DefaultProjectDependencyGraph( final List allProjects, final Collection projects ) @@ -81,7 +81,7 @@ public class DefaultProjectDependencyGraph } /** - * @since 3.5.0-alpha-2 + * @since 3.5.0 */ public List getAllProjects() { http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java -- diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java index ad3910d..c4f8e1a 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java @@ -65,7 +65,7 @@ class FilteredProjectDependencyGraph } /** - * @since 3.5.0-alpha-2 + * @since 3.5.0 */ public List getAllProjects() { http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java index c21796b..6302a82 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java @@ -44,7 +44,7 @@ import static org.codehaus.plexus.PlexusTestCase.getBasedir; * Test cases for the project {@code ModelResolver} implementation. * * @author Christian Schulte - * @since 3.5.0-alpha-2 + * @since 3.5.0 */ public class ProjectModelResolverTest extends AbstractMavenProjectTestCase { http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
[05/27] maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
[MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/13adc1bc Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/13adc1bc Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/13adc1bc Branch: refs/heads/MNG-6069 Commit: 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8 Parents: d54e6f9 Author: Christian SchulteAuthored: Tue Mar 21 00:30:28 2017 +0100 Committer: Christian Schulte Committed: Tue Mar 21 00:30:28 2017 +0100 -- .../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++-- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java -- diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 9331710..509f302 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -573,8 +573,8 @@ public class MavenRepositorySystem throws Exception { return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, RepositorySystem.DEFAULT_REMOTE_REPO_ID, - true, ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false, - ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, + true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false, + ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN ); } http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml -- diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index 91492a9..9487a9a 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -32,6 +32,9 @@ under the License. false + +never +
[01/27] maven git commit: Added some javadoc [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6069 0cafb4c04 -> 7e8b0e090 (forced update) Added some javadoc Added javadoc help for making easier to compare two versions in command line. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/10a18cfe Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/10a18cfe Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/10a18cfe Branch: refs/heads/MNG-6069 Commit: 10a18cfee7a981a41c1f571ef3c60138d40e839e Parents: 181b021 Author: LuboVargaAuthored: Mon Mar 13 13:23:04 2017 +0100 Committer: GitHub Committed: Mon Mar 13 13:23:04 2017 +0100 -- .../maven/artifact/versioning/ComparableVersion.java | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/10a18cfe/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java -- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 5222871..0ae4acb 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -472,8 +472,19 @@ public class ComparableVersion /** * Main to test version parsing and comparison. + * + * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can issue + * java -cp ~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT" + * command to commandline. Result of given command will be something like this: + * 1.2-SNAPSHOT + * 2. 1.2-SNAPSHOT == 1.2-snapshot + * * - * @param args the version strings to parse and compare + * @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always + * two adjacent will be compared */ public static void main( String... args ) {
[20/27] maven git commit: Minor cleanup in MavenCli.java
Minor cleanup in MavenCli.java There is some unnecessary code in the MavenCli.java from line #1465 to #1474. The functionality has been moved to line #1215. Signed-off-by: Karl Heinz MarbaiseProject: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4c6d3a34 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4c6d3a34 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4c6d3a34 Branch: refs/heads/MNG-6069 Commit: 4c6d3a3462783507921d1a0100e3fa22ef8a98e4 Parents: a4b0b63 Author: Stefan Eicher Authored: Wed Apr 5 20:52:01 2017 +0200 Committer: Karl Heinz Marbaise Committed: Wed Apr 5 23:51:26 2017 +0200 -- .../src/main/java/org/apache/maven/cli/MavenCli.java | 11 --- 1 file changed, 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/4c6d3a34/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 004cf4e..877b88b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1462,17 +1462,6 @@ public class MavenCli alternatePomFile = commandLine.getOptionValue( CLIManager.ALTERNATE_POM_FILE ); } -File userToolchainsFile; -if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) ) -{ -userToolchainsFile = new File( commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) ); -userToolchainsFile = resolveFile( userToolchainsFile, workingDirectory ); -} -else -{ -userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE; -} - request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties( cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast
[27/27] maven git commit: [MNG-6069] Migrate to non deprecated parts of Commons CLI
[MNG-6069] Migrate to non deprecated parts of Commons CLI Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7e8b0e09 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7e8b0e09 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7e8b0e09 Branch: refs/heads/MNG-6069 Commit: 7e8b0e090d18264f8307958dbac38b55d33416e4 Parents: c2c6259 Author: Karl Heinz MarbaiseAuthored: Sat Mar 18 18:18:27 2017 +0100 Committer: Karl Heinz Marbaise Committed: Mon May 1 16:40:53 2017 +0200 -- .../java/org/apache/maven/cli/CLIManager.java | 118 ++- 1 file changed, 60 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/7e8b0e09/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index a9038bf..20376d9 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -24,9 +24,9 @@ import java.io.PrintWriter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException; */ public class CLIManager { -public static final char ALTERNATE_POM_FILE = 'f'; +public static final String ALTERNATE_POM_FILE = "f"; -public static final char BATCH_MODE = 'B'; +public static final String BATCH_MODE = "B"; -public static final char SET_SYSTEM_PROPERTY = 'D'; +public static final String SET_SYSTEM_PROPERTY = "D"; -public static final char OFFLINE = 'o'; +public static final String OFFLINE = "o"; -public static final char QUIET = 'q'; +public static final String QUIET = "q"; -public static final char DEBUG = 'X'; +public static final String DEBUG = "X"; -public static final char ERRORS = 'e'; +public static final String ERRORS = "e"; -public static final char HELP = 'h'; +public static final String HELP = "h"; -public static final char VERSION = 'v'; +public static final String VERSION = "v"; -public static final char SHOW_VERSION = 'V'; +public static final String SHOW_VERSION = "V"; -public static final char NON_RECURSIVE = 'N'; +public static final String NON_RECURSIVE = "N"; -public static final char UPDATE_SNAPSHOTS = 'U'; +public static final String UPDATE_SNAPSHOTS = "U"; -public static final char ACTIVATE_PROFILES = 'P'; +public static final String ACTIVATE_PROFILES = "P"; public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu"; -public static final char CHECKSUM_FAILURE_POLICY = 'C'; +public static final String CHECKSUM_FAILURE_POLICY = "C"; -public static final char CHECKSUM_WARNING_POLICY = 'c'; +public static final String CHECKSUM_WARNING_POLICY = "c"; -public static final char ALTERNATE_USER_SETTINGS = 's'; +public static final String ALTERNATE_USER_SETTINGS = "s"; public static final String ALTERNATE_GLOBAL_SETTINGS = "gs"; -public static final char ALTERNATE_USER_TOOLCHAINS = 't'; +public static final String ALTERNATE_USER_TOOLCHAINS = "t"; public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt"; @@ -103,50 +103,52 @@ public class CLIManager protected Options options; -@SuppressWarnings( { "static-access", "checkstyle:linelength" } ) +// CHECKSTYLE_OFF: LineLength public CLIManager() { options = new Options(); -options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) ); -options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) ); -options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); -options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); -options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) ); -options.addOption(
[06/27] maven git commit: [MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods
[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/27ab7503 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/27ab7503 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/27ab7503 Branch: refs/heads/MNG-6069 Commit: 27ab7503a7196a40b5ed1007181c82cdcf11e03c Parents: 13adc1b Author: Christian SchulteAuthored: Tue Mar 21 04:06:02 2017 +0100 Committer: Christian Schulte Committed: Tue Mar 21 19:16:44 2017 +0100 -- .../internal/DefaultArtifactDescriptorReader.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/27ab7503/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java -- diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java index 1df1c12..82e1284 100644 --- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java +++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java @@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader @Inject DefaultArtifactDescriptorReader( RemoteRepositoryManager remoteRepositoryManager, VersionResolver versionResolver, - ArtifactResolver artifactResolver, ModelBuilder modelBuilder, - RepositoryEventDispatcher repositoryEventDispatcher, LoggerFactory loggerFactory ) + VersionRangeResolver versionRangeResolver, ArtifactResolver artifactResolver, + ModelBuilder modelBuilder, RepositoryEventDispatcher repositoryEventDispatcher, + LoggerFactory loggerFactory ) { setRemoteRepositoryManager( remoteRepositoryManager ); setVersionResolver( versionResolver ); @@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader public void initService( ServiceLocator locator ) { -setLoggerFactory( locator.getService( LoggerFactory.class ) ); setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) ); setVersionResolver( locator.getService( VersionResolver.class ) ); setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) ); setArtifactResolver( locator.getService( ArtifactResolver.class ) ); -setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); modelBuilder = locator.getService( ModelBuilder.class ); if ( modelBuilder == null ) { setModelBuilder( new DefaultModelBuilderFactory().newInstance() ); } +setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) ); +setLoggerFactory( locator.getService( LoggerFactory.class ) ); } public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory loggerFactory )
[22/27] maven git commit: improved description of styled message API
improved description of styled message API Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/08f3c76a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/08f3c76a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/08f3c76a Branch: refs/heads/MNG-6069 Commit: 08f3c76a09601d85503c35743458d977a92e492d Parents: 70eabfe Author: Hervé BoutemyAuthored: Sat Apr 8 08:50:55 2017 +0200 Committer: Hervé Boutemy Committed: Sat Apr 8 08:50:55 2017 +0200 -- maven-embedder/src/site/apt/index.apt.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/08f3c76a/maven-embedder/src/site/apt/index.apt.vm -- diff --git a/maven-embedder/src/site/apt/index.apt.vm b/maven-embedder/src/site/apt/index.apt.vm index e820765..d327717 100644 --- a/maven-embedder/src/site/apt/index.apt.vm +++ b/maven-embedder/src/site/apt/index.apt.vm @@ -44,5 +44,6 @@ ${project.name} * since 3.5.0, output is colorized by default, with color disabled in batch mode: see {{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled message API}} - for more details. + for more details on adding color to a plugin output or customizing colors. + \ No newline at end of file
[15/27] maven git commit: Squashed commit of the following:
Squashed commit of the following: commit 049228ce76927a6740500e1b750f0e8f201f2478 Author: rfscholteDate: Mon Mar 27 20:22:46 2017 +0200 [MNG-6185] Replace doclettag explanation with annotations in AbstractMojo javadoc Fix by Checkstyle reported issues commit 63796a649e6e3b25a58fb567d354ca1849f48819 Author: rfscholte Date: Sat Mar 25 23:15:00 2017 +0100 [MNG-6185] Replace doclettag explanation with annotations in AbstractMojo javadoc Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/00c82b7e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/00c82b7e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/00c82b7e Branch: refs/heads/MNG-6069 Commit: 00c82b7e234c6ed33f76ba48a236130c5511ab3a Parents: 0baa423 Author: rfscholte Authored: Wed Mar 29 19:50:15 2017 +0200 Committer: rfscholte Committed: Wed Mar 29 19:50:15 2017 +0200 -- .../org/apache/maven/plugin/AbstractMojo.java | 37 +--- 1 file changed, 17 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/00c82b7e/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java -- diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java index f85e7f3..6292116 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java @@ -27,17 +27,15 @@ import org.apache.maven.plugin.logging.SystemStreamLog; /** * Abstract class to provide most of the infrastructure required to implement a Mojo except for * the execute method. - * The implementation should have a goal annotation in the class-level javadoc annotation: + * The implementation should have a Mojo annotation with the name of the goal: * - * - * goal goalName - * + * Mojo( name = "goal-name" ) * * - * There are also a number of class-level javadoc annotations which can be used to control how and when the + * There are also a number of attributes which can be used to control how and when the * Mojo is executed: * - * + * * * Descriptor Element * Annotation @@ -46,7 +44,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * goal - * @goal goalName + * name = "goal-name" * Yes * The name for the Mojo that users will reference from the command line to execute the Mojo directly, * or inside a POM in order to provide Mojo-specific configuration. @@ -65,7 +63,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * configurator - * @configurator roleHint + * configurator = "role-hint" * No * The configurator type to use when injecting parameter values into this Mojo. The value is normally * deduced from the Mojo's implementation language, but can be specified to allow a custom @@ -77,7 +75,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * phase - * @phase phaseName + * defaultPhase = LifecyclePhase.phase * No * Binds this Mojo to a particular phase of the standard build lifecycle, if specified. * @@ -86,7 +84,8 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * execute - * @execute [phase=phaseName|goal=goalName] [lifecycle=lifecycleId] + * @Execute + * ( phase=LifecyclePhase.phase, goal= "goal-name", lifecycle="lifecycle-id" ) * No * When this goal is invoked, it will first invoke a parallel lifecycle, ending at the given phase. * If a goal is provided instead of a phase, that goal will be executed in isolation. @@ -99,7 +98,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * requiresDependencyResolution - * @requiresDependencyResolution requiredScope + * requiresDependencyResolution = ResolutionScope.scope * No * Flags this Mojo as requiring the dependencies in the specified scope (or an implied scope) to be * resolved before it can execute. @@ -128,6 +127,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * + * This is only a small set of all the options. A complete list can be found at + * https://maven.apache.org/components/plugin-tools/maven-plugin-tools-annotations/index.html; target="_blank"> + * Maven Plugin Tool for Annotations. * * @see https://maven.apache.org/guides/plugin/guide-java-plugin-development.html; target="_blank">Guide to
[17/27] maven git commit: [MNG-6195] Tidy up quoting and command substitution
[MNG-6195] Tidy up quoting and command substitution Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/96543b7c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/96543b7c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/96543b7c Branch: refs/heads/MNG-6069 Commit: 96543b7c6ea52ad7ba3bcd559c38b159f8aa4c0d Parents: 00c82b7 Author: Stephen ConnollyAuthored: Sun Mar 26 22:41:24 2017 +0100 Committer: Stephen Connolly Committed: Sat Apr 1 11:29:09 2017 +0100 -- apache-maven/src/bin/mvn | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/96543b7c/apache-maven/src/bin/mvn -- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index df62f68..e569633 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -83,14 +83,14 @@ fi # For MinGW, ensure paths are in Unix format before anything is touched if $mingw ; then [ -n "$MAVEN_HOME" ] && -MAVEN_HOME="`(cd "$MAVEN_HOME"; pwd)`" +MAVEN_HOME=`(cd "$MAVEN_HOME"; pwd)` [ -n "$JAVA_HOME" ] && -JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +JAVA_HOME=`(cd "$JAVA_HOME"; pwd)` # TODO classpath? fi if [ -z "$JAVA_HOME" ] ; then - JAVACMD="`which java`" + JAVACMD=`which java` else JAVACMD="$JAVA_HOME/bin/java" fi @@ -122,13 +122,13 @@ fi find_maven_basedir() { ( basedir=`find_file_argument_basedir "$@"` - wdir="`pwd`" + wdir=`pwd` while [ "$wdir" != '/' ] ; do if [ -d "$wdir"/.mvn ] ; then basedir=$wdir break fi -wdir="`cd "$wdir/.."; pwd`" +wdir=`cd "$wdir/.."; pwd` done echo "${basedir}" ) @@ -136,13 +136,14 @@ find_maven_basedir() { find_file_argument_basedir() { ( - basedir="`pwd`" + basedir=`pwd` found_file_switch=0 for arg in "$@"; do if [ ${found_file_switch} -eq 1 ]; then if [ -f "${arg}" ]; then -basedir=$(dirname "$(readlink -f "${arg}")") +basedir=`dirname "${arg}"` +basedir=`cd "${basedir}" && pwd -P` if [ ! -d "${basedir}" ]; then echo "Directory ${basedir} extracted from the -f/--file command-line argument ${arg} does not exist" >&2 exit 1
[19/27] maven git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a4b0b63b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a4b0b63b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a4b0b63b Branch: refs/heads/MNG-6069 Commit: a4b0b63b62533399878c9de0656f88f100a46aa0 Parents: ff8f5e7 Author: Stephen ConnollyAuthored: Mon Apr 3 20:35:47 2017 +0100 Committer: Stephen Connolly Committed: Mon Apr 3 20:35:47 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 8a72146..b286f74 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 977fd34..b13482b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 7457a4c..5eb7903 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 9552803..8392dca 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 4fb86a3..71f09c0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 3e778b3..66e09a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 3aefbc7..859f0b3 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 1ec4f89..aabb25d 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0 +3.5.1-SNAPSHOT maven-model http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-plugin-api/pom.xml
[18/27] maven git commit: [maven-release-plugin] prepare release maven-3.5.0
[maven-release-plugin] prepare release maven-3.5.0 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ff8f5e74 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ff8f5e74 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ff8f5e74 Branch: refs/heads/MNG-6069 Commit: ff8f5e7444045639af65f6095c62210b5713f426 Parents: 87cf1ee Author: Stephen ConnollyAuthored: Mon Apr 3 20:35:30 2017 +0100 Committer: Stephen Connolly Committed: Mon Apr 3 20:35:30 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index a528ddb..8a72146 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..977fd34 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..7457a4c 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index bfd2b47..9552803 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..4fb86a3 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..3e778b3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..3aefbc7 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..1ec4f89 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0 maven-model http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-plugin-api/pom.xml
[12/27] maven git commit: added CORE_IT_PROFILES parameter
added CORE_IT_PROFILES parameter Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ad514f5c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ad514f5c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ad514f5c Branch: refs/heads/MNG-6069 Commit: ad514f5cb55d16ca116c5c529ad48dd32d5bac61 Parents: 16805f5 Author: Hervé BoutemyAuthored: Fri Mar 24 03:28:26 2017 +0100 Committer: Hervé Boutemy Committed: Tue Mar 28 08:04:07 2017 +0200 -- Jenkinsfile | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ad514f5c/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index cc9bd92..0dae3a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,6 +20,7 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))]) def tests +def CORE_IT_PROFILES='run-its' try { @@ -66,7 +67,7 @@ parallel linuxJava7:{ sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" unstash 'dist' withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) { -sh "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" } junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' deleteDir() // clean up after ourselves to reduce disk space @@ -85,7 +86,7 @@ parallel linuxJava7:{ sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" unstash 'dist' withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) { -sh "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" } junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' deleteDir() // clean up after ourselves to reduce disk space @@ -115,7 +116,7 @@ parallel linuxJava7:{ withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin","JAVA_HOME=$JAVA_WIN_J7"]) { bat "set" unstash 'dist' -bat "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" } junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' deleteDir() // clean up after ourselves to reduce disk space @@ -145,7 +146,7 @@ parallel linuxJava7:{ withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin","JAVA_HOME=$JAVA_WIN_J8"]) { bat "set" unstash 'dist' -bat "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" } junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' deleteDir() // clean up after ourselves to reduce disk space
[09/27] maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
[MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'. This reverts commit 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8 *not changing anything* just because someone did not react in time when this issue had been lying around on a branch. If we would set pace for the industrie, everyone would still be using 5.25" floppy disks and 8 bit hardware and we would tell them that upgrading to be able to use new software would be too risky and they better keep theire broken assembly routines until the machine goes up in smoke. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8400984a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8400984a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8400984a Branch: refs/heads/MNG-6069 Commit: 8400984ac5201ae6bf06bfa88ade8a8468c76634 Parents: 0931bb2 Author: Christian SchulteAuthored: Sat Mar 25 20:40:05 2017 +0100 Committer: Christian Schulte Committed: Sat Mar 25 20:53:06 2017 +0100 -- .../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++-- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java -- diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 509f302..9331710 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -573,8 +573,8 @@ public class MavenRepositorySystem throws Exception { return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, RepositorySystem.DEFAULT_REMOTE_REPO_ID, - true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false, - ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, + true, ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false, + ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN ); } http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml -- diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index 9487a9a..91492a9 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -32,9 +32,6 @@ under the License. false - -never -
[02/27] maven git commit: [maven-release-plugin] prepare release maven-3.5.0-beta-1
[maven-release-plugin] prepare release maven-3.5.0-beta-1 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/214540c2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/214540c2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/214540c2 Branch: refs/heads/MNG-6069 Commit: 214540c2ae5431645bb927d6dc5498ebafc27359 Parents: 68e38e50 Author: Stephen ConnollyAuthored: Mon Mar 20 16:55:36 2017 + Committer: Stephen Connolly Committed: Mon Mar 20 16:55:36 2017 + -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index a528ddb..7bf2dd2 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e3943c9..0d07e98 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 39eb161..c303646 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index bfd2b47..fd0a307 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 0e20235..beb8a16 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 30ad2ce..21531a3 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0dd08ac..c8ede97 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 41cf168..a3ed1c5 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-SNAPSHOT +3.5.0-beta-1 maven-model
[03/27] maven git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fd29ddeb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fd29ddeb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fd29ddeb Branch: refs/heads/MNG-6069 Commit: fd29ddebf980b895ca3a1665aec49b3c7d17eeaf Parents: 214540c Author: Stephen ConnollyAuthored: Mon Mar 20 16:55:53 2017 + Committer: Stephen Connolly Committed: Mon Mar 20 16:55:53 2017 + -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml| 2 +- maven-settings/pom.xml| 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 7bf2dd2..a528ddb 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 0d07e98..e3943c9 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index c303646..39eb161 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index fd0a307..bfd2b47 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index beb8a16..0e20235 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 21531a3..30ad2ce 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index c8ede97..0dd08ac 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index a3ed1c5..41cf168 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.0-beta-1 +3.5.0-SNAPSHOT maven-model
[2/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml index e7c4b6f..08ba73d 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml index 62ef251..479caa3 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml index d9a9a84..6a1b46e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml @@ -21,7 +21,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml index 799f87e..b35d70e 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml index 28d0420..3867dd2 100644 --- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml +++ b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0;
[1/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8 [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1366 1ca9a35b3 -> b54e33e68 (forced update) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml index 4cb27c6..760211d 100644 --- a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml index f1a554b..84378e8 100644 --- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml index d9d0a31..c90c6e0 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml index 58c275c..ca93853 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml @@ -10,7 +10,7 @@ --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.maven.plugins.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml index 88eb6da..5f2e8e7 100644 --- a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
[4/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java index 9b27c1c..9eccf6b 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java @@ -26,13 +26,13 @@ import org.apache.maven.surefire.testset.TestSetFailedException; /** * Interface to be implemented by all Surefire providers. - * + * * NOTE: This class is part of the proposed public api for surefire providers for 2.7. It may * still be subject to changes, even for minor revisions. - * + * * The api covers this interface and all the types reachable from it. And nothing else. - * - * + * + * * Called in one of three ways: * Forkmode = never: getSuites is not called, invoke is called with null parameter * Forkmode = once: getSuites is not called, invoke is called with null parameter @@ -45,7 +45,7 @@ public interface SurefireProvider { /** * Determines the number of forks. - * + * * Called when forkmode is different from "never" or "always", allows the provider to define * how to behave for the fork. * @@ -64,6 +64,7 @@ public interface SurefireProvider * When reporting fails * @throws org.apache.maven.surefire.testset.TestSetFailedException * When testset fails + * @throws InvocationTargetException fails in {@code ProviderFactory} */ @SuppressWarnings( "checkstyle:redundantthrows" ) RunResult invoke( Object forkTestSet ) @@ -72,14 +73,14 @@ public interface SurefireProvider /** * Makes an attempt at cancelling the current run, giving the provider a chance to notify * reporting that the remaining tests have been cancelled due to timeout. - * + * * If the provider thinks it can terminate properly it is the responsibility of * the invoke method to return a RunResult with a booter code of failure. - * + * * It is up to the provider to find out how to implement this method properly. * A provider may also choose to not do anything at all in this method, * which means surefire will kill the forked process soon afterwards anyway. - * + * * Will be called on a different thread than the one calling invoke. */ // Todo: Need to think a lot closer about how/if this works and if there is a use case for it. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java index 28f111b..d4af679 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java @@ -29,7 +29,7 @@ import static org.apache.maven.surefire.util.internal.StringUtils.NL; /** * Deals with system.out/err. - * + * */ public class ConsoleOutputCapture { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java index 88552cb..dee095c 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java @@ -29,7 +29,6 @@ import java.io.StringWriter; * Write the trace out for a POJO test. Java 1.5 compatible. * * @author mailto:br...@apache.org;>Brett Porter - * @noinspection ThrowableResultOfMethodCallIgnored */ public class LegacyPojoStackTraceWriter implements StackTraceWriter http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java index 2bc3fcd..ec0f782 100644 ---
[3/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml index 3cc74a1..6360bed 100644 --- a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml +++ b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml index 2eed551..0cce4c9 100644 --- a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml +++ b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml index e679767..2a6d6c2 100644 --- a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml +++ b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml index 069dacf..8530eca 100644 --- a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml +++ b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml @@ -18,7 +18,7 @@ ~ under the License. --> http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> org.apache.maven.surefire http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml index 6b16431..49c4e34 100644 --- a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml +++ b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-order/pom.xml -- diff --git a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml index a72c2f5..b49fda7
[6/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
[SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b54e33e6 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b54e33e6 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b54e33e6 Branch: refs/heads/SUREFIRE-1366 Commit: b54e33e68e9c3e13f8fca4b66dbb5c89a0a30715 Parents: cba4adb Author: Tibor17Authored: Sun Apr 23 10:20:35 2017 +0200 Committer: Tibor17 Committed: Mon May 1 14:21:46 2017 +0200 -- maven-failsafe-plugin/pom.xml | 23 ++ .../plugin/failsafe/IntegrationTestMojo.java| 203 ++ .../maven/plugin/failsafe/VerifyMojo.java | 2 +- .../failsafe/util/FailsafeSummaryXmlUtils.java | 94 .../apache/maven/plugin/failsafe/util/JAXB.java | 104 + .../plugin/failsafe/xmlsummary/ErrorType.java | 1 - .../failsafe/xmlsummary/FailsafeSummary.java| 1 - .../xmlsummary/FailsafeSummaryXmlUtils.java | 104 - .../maven/plugin/failsafe/xmlsummary/JAXB.java | 1 - .../failsafe/xmlsummary/ObjectFactory.java | 1 - .../failsafe/MarshallerUnmarshallerTest.java| 62 ++ .../maven/plugin/failsafe/RunResultTest.java| 2 +- maven-surefire-common/pom.xml | 1 - .../plugin/surefire/AbstractSurefireMojo.java | 214 ++- .../surefire/InPluginVMSurefireStarter.java | 2 +- .../surefire/StartupReportConfiguration.java| 6 +- .../surefire/SurefireExecutionParameters.java | 1 - .../surefire/SurefireReportParameters.java | 1 - .../surefire/booterclient/BooterSerializer.java | 4 +- .../booterclient/ForkConfiguration.java | 3 +- .../surefire/booterclient/ForkStarter.java | 4 +- .../surefire/booterclient/ProviderDetector.java | 1 - .../lazytestprovider/AbstractCommandStream.java | 4 + .../TestProvidingInputStream.java | 6 +- .../output/DeserializedStacktraceWriter.java| 2 +- .../booterclient/output/ForkClient.java | 6 +- .../output/ThreadedStreamConsumer.java | 8 +- .../report/ConsoleOutputFileReporter.java | 2 +- .../surefire/report/DefaultReporterFactory.java | 4 +- .../surefire/report/DirectConsoleOutput.java| 2 +- .../surefire/report/StatelessXmlReporter.java | 5 +- .../surefire/report/TestSetRunListener.java | 2 +- .../org/apache/maven/surefire/spi/IDefault.java | 4 +- .../maven/plugin/surefire/SurefirePlugin.java | 204 +- .../src/site/resources/xsd/bindings.xml | 1 - .../src/site/resources/xsd/failsafe-summary.xjb | 31 +++ maven-surefire-report-plugin/pom.xml| 1 - .../surefire/report/FailsafeReportMojo.java | 2 +- .../surefire/report/SurefireReportMojo.java | 2 +- .../resources/surefire-report_sv.properties | 2 + pom.xml | 53 - .../maven/surefire/booter/CommandReader.java| 4 +- .../surefire/booter/DumpErrorSingleton.java | 2 +- .../maven/surefire/booter/FailFastAware.java| 2 +- .../surefire/booter/ForkingReporterFactory.java | 2 - .../surefire/booter/ForkingRunListener.java | 6 +- .../maven/surefire/booter/ShutdownAware.java| 2 +- .../surefire/booter/SurefireReflector.java | 2 +- .../maven/surefire/cli/CommandLineOption.java | 2 +- .../providerapi/ProviderParameters.java | 8 +- .../surefire/providerapi/SurefireProvider.java | 17 +- .../surefire/report/ConsoleOutputCapture.java | 2 +- .../report/LegacyPojoStackTraceWriter.java | 1 - .../maven/surefire/report/ReportEntry.java | 3 +- .../surefire/report/ReporterConfiguration.java | 2 +- .../maven/surefire/report/RunListener.java | 2 +- .../surefire/report/SimpleReportEntry.java | 45 ++-- .../apache/maven/surefire/suite/RunResult.java | 2 +- .../maven/surefire/testset/ResolvedTest.java| 29 ++- .../surefire/testset/TestListResolver.java | 8 +- .../maven/surefire/testset/TestRequest.java | 2 + .../testset/TestSetFailedException.java | 23 +- .../util/SurefireReflectionException.java | 5 +- .../util/internal/DaemonThreadFactory.java | 1 + .../surefire/util/internal/DumpFileUtils.java | 3 + .../surefire/util/internal/StringUtils.java | 66 ++ .../surefire/testset/FundamentalFilterTest.java | 1 + .../surefire/booter/BooterDeserializer.java | 4 +- .../apache/maven/surefire/booter/Classpath.java | 3 + .../surefire/booter/ClasspathConfiguration.java | 2 +- .../maven/surefire/booter/ForkedBooter.java | 6 +- .../surefire/booter/IsolatedClassLoader.java| 2 +- .../surefire/booter/ProviderConfiguration.java | 2 +-
[5/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/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 f2c32d0..551d980 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 @@ -135,7 +135,7 @@ public abstract class AbstractSurefireMojo protected boolean skipTests; /** - * This old parameter is just like skipTests, but bound to the old property "maven.test.skip.exec". + * This old parameter is just like {@code skipTests}, but bound to the old property "maven.test.skip.exec". * * @since 2.3 * @deprecated Use skipTests instead. @@ -147,7 +147,7 @@ public abstract class AbstractSurefireMojo /** * Set this to "true" to bypass unit tests entirely. Its use is NOT RECOMMENDED, especially if you enable it using * the "maven.test.skip" property, because maven.test.skip disables both running the tests and compiling the tests. - * Consider using the skipTests parameter instead. + * Consider using the {@code skipTests} parameter instead. */ @Parameter( property = "maven.test.skip", defaultValue = "false" ) protected boolean skip; @@ -184,7 +184,7 @@ public abstract class AbstractSurefireMojo /** * A dependency scope to exclude from the test classpath. The scope should be one of the scopes defined by * org.apache.maven.artifact.Artifact. This includes the following: - * + * * * compile - system, provided, compile * runtime - compile, runtime @@ -215,23 +215,28 @@ public abstract class AbstractSurefireMojo private File testSourceDirectory; /** - * A list of exclude> elements specifying the tests (by pattern) that should be excluded in testing. When not - * specified and when the test parameter is not specified, the default excludes will be - * excludes> - * exclude>***$*/exclude> - * /excludes> - * (which excludes all inner classes). - * This parameter is ignored if the TestNG suiteXmlFiles parameter is specified. - * - * Each exclude item may also contain a comma-separated sublist of items, which will be treated as multiple - * exclude> entries. - * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG): - * %regex[pkg.*Slow.*.class], Unstable* - * - * Notice that these values are relative to the directory containing generated test classes of the project - * being tested. This directory is declared by the parameter testClassesDirectory which defaults - * to the POM property ${project.build.testOutputDirectory}, typically src/test/java - * unless overridden. + * A list of exclude elements specifying the tests (by pattern) that should be excluded in testing. When not + * specified and when the {@code test} parameter is not specified, the default excludes will be + * + * {@literal } + * {@literal }**{@literal /}*$*{@literal } + * {@literal } + * + * (which excludes all inner classes). + * + * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified. + * + * Each exclude item may also contain a comma-separated sub-list of items, which will be treated as multiple + * exclude entries. + * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG): + * + * {@literal }%regex[pkg.*Slow.*.class], Unstable*{@literal } + * + * + * Notice that these values are relative to the directory containing generated test classes of the project + * being tested. This directory is declared by the parameter {@code testClassesDirectory} which defaults + * to the POM property ${project.build.testOutputDirectory}, typically + * {@literal src/test/java} unless overridden. */ @Parameter // TODO use regex for fully qualified class names in 3.0 and change the filtering abilities @@ -319,13 +324,14 @@ public abstract class AbstractSurefireMojo private Boolean failIfNoTests; /** - * DEPRECATED since version 2.14. Use forkCount and reuseForks instead. - * - * - * Option to specify the forking mode. Can be "never", "once", "always", "perthread". "none" and "pertest" are also - * accepted for backwards compatibility. "always" forks for each test-class. "perthread" will create - * threadCount parallel forks, each executing one test-class. See also parameter - * reuseForks. + *
svn commit: r1011460 [7/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/DefaultArtifactHandlerStub.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/DefaultArtifactHandlerStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/DefaultArtifactHandlerStub.html Mon May 1 07:24:19 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugin.pmd.stubs.DefaultArtifactHandlerStub (Apache Maven PMD Plugin 3.7 Test API) +Uses of Class org.apache.maven.plugin.pmd.stubs.DefaultArtifactHandlerStub (Apache Maven PMD Plugin 3.8 Test API) @@ -110,6 +110,6 @@ -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/DefaultConfigurationMavenProjectStub.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/DefaultConfigurationMavenProjectStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/DefaultConfigurationMavenProjectStub.html Mon May 1 07:24:19 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugin.pmd.stubs.DefaultConfigurationMavenProjectStub (Apache Maven PMD Plugin 3.7 Test API) +Uses of Class org.apache.maven.plugin.pmd.stubs.DefaultConfigurationMavenProjectStub (Apache Maven PMD Plugin 3.8 Test API) @@ -110,6 +110,6 @@ -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/InvalidFormatMavenProjectStub.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/InvalidFormatMavenProjectStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/InvalidFormatMavenProjectStub.html Mon May 1 07:24:19 2017 @@ -3,13 +3,13 @@ -Uses of Class org.apache.maven.plugin.pmd.stubs.InvalidFormatMavenProjectStub (Apache Maven PMD Plugin 3.7 Test API) +Uses of Class org.apache.maven.plugin.pmd.stubs.InvalidFormatMavenProjectStub (Apache Maven PMD Plugin 3.8 Test API) @@ -110,6 +110,6 @@ -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/testapidocs/org/apache/maven/plugin/pmd/stubs/class-use/PmdPluginArtifactStub.html == ---
svn commit: r1011460 [6/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/surefire-report.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/surefire-report.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/surefire-report.html Mon May 1 07:24:19 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven PMD Plugin Surefire Report @@ -77,9 +77,9 @@ Surefire Report - | Last Published: 2016-10-08 + | Last Published: 2017-05-01 -Version: 3.7 +Version: 3.8 @@ -488,12 +488,12 @@ function toggleDisplay(elementId) { Success Rate Time -34 +35 0 0 0 100% -6.276 +6.19 Note: failures are anticipated and checked for with assertions while errors are unanticipated. Package List @@ -509,12 +509,12 @@ function toggleDisplay(elementId) { Time org.apache.maven.plugin.pmd -34 +35 0 0 0 100% -6.276 +6.19 Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. org.apache.maven.plugin.pmd @@ -529,23 +529,23 @@ function toggleDisplay(elementId) { Success Rate Time - -PmdReportTest -15 + +CpdViolationCheckMojoTest +4 0 0 0 100% -2.602 +0.179 - -CpdViolationCheckMojoTest -4 + +PmdReportTest +16 0 0 0 100% -1.561 +3.411 CpdReportTest @@ -554,7 +554,7 @@ function toggleDisplay(elementId) { 0 0 100% -1.121 +2.199 PmdViolationCheckMojoTest @@ -563,158 +563,162 @@ function toggleDisplay(elementId) { 0 0 100% -0.992 +0.401 Test Cases [Summary] [Package List] [Test Cases] -PmdReportTest +CpdViolationCheckMojoTest -testCustomConfiguration -0.327 +testDefaultConfiguration +0.027 -testInvalidFormat -0.145 +testExclusionsConfiguration +0.056 -testSkipEmptyReportConfiguration -0.113 +testNotFailOnViolation +0.078 -testEmptyReportConfiguration -0.167 +testException +0.018 + +PmdReportTest + -testDefaultConfiguration -0.197 +testDefaultConfigurationWithAnalysisCache +0.492 -testJspConfiguration -0.136 +testJavascriptConfiguration +0.243 -testPMDProcessingError -0.065 +testSkipConfiguration +0.023 -testPMDExcludeRootsShouldExcludeSubdirectories -0.107 +testInvalidTargetJdk +0.023 -testViolationExclusion -0.16 +testLocationTemp +0.024 -testJavascriptConfiguration -0.197 +testSuppressMarkerConfiguration +0.211 -testFileURL -0.712 +testJspConfiguration +0.17 -testSkipConfiguration -0.022 +testPMDProcessingError +0.071 -testInvalidTargetJdk -0.021 +testPMDExcludeRootsShouldExcludeSubdirectories +0.122 -testLocationTemp -0.022 +testViolationExclusion +0.204 -testSuppressMarkerConfiguration -0.211 - -CpdViolationCheckMojoTest - +testDefaultConfiguration +0.305 + + +testEmptyReportConfiguration +0.137 -testException -0.323 +testFileURL +0.967 -testNotFailOnViolation -0.938 +testCustomConfiguration +0.246 -testDefaultConfiguration -0.091 +testInvalidFormat +0.087 -testExclusionsConfiguration -0.2 +testSkipEmptyReportConfiguration +0.086 CpdReportTest -testCustomConfiguration -0.223 +testDefaultConfiguration +1.262 -testInvalidFormat -0.044 +testEmptyReportConfiguration +0.162 -testWriteNonHtml -0.07 +testCpdEncodingConfiguration +0.18 -testSkipEmptyReportConfiguration -0.049 +testCpdJavascriptConfiguration +0.142 -testEmptyReportConfiguration -0.128 +testCpdJspConfiguration +0.096 -testCpdEncodingConfiguration -0.104 +testExclusionsConfiguration +0.089 -testCpdJavascriptConfiguration -0.111 +testWriteNonHtml +0.045 -testCpdJspConfiguration -0.115 +testCustomConfiguration +0.14 -testDefaultConfiguration -0.176 +testInvalidFormat +0.034 -testExclusionsConfiguration -0.1 +testSkipEmptyReportConfiguration +0.03 PmdViolationCheckMojoTest -testException -0.03 +testViolationExclusion +0.154 -testNotFailOnViolation -0.469 - - testDefaultConfiguration 0.021 + + +testNotFailOnViolation +0.103 testFailurePriority -0.234 +0.105 -testViolationExclusion -0.237 +testException +0.017 @@ -724,7 +728,7 @@ function toggleDisplay(elementId) { - Copyright 20052016 + Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/taglist.html
svn commit: r1011460 [11/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/c
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdReport.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdReport.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdReport.html Mon May 1 07:24:19 2017 @@ -140,7 +140,7 @@ 132 * 133 * @since 3.0 134 */ -135 @Parameter( property = "pmd.typeResolution", defaultValue = "false" ) +135 @Parameter( property = "pmd.typeResolution", defaultValue = "true" ) 136 private boolean typeResolution; 137 138 /** @@ -190,508 +190,537 @@ 182 private boolean skipPmdError; 183 184 /** -185 * {@inheritDoc} -186 */ -187 public String getName( Locale locale ) -188 { -189 return getBundle( locale ).getString( "report.pmd.name" ); -190 } -191 -192 /** -193 * {@inheritDoc} -194 */ -195 public String getDescription( Locale locale ) -196 { -197 return getBundle( locale ).getString( "report.pmd.description" ); -198 } -199 -200 public void setRulesets( String[] rules ) -201 { -202 rulesets = rules; -203 } -204 -205 /** -206 * {@inheritDoc} -207 */ -208 @Override -209 public void executeReport( Locale locale ) -210 throws MavenReportException +185 * Enables the analysis cache, which speeds up PMD. This +186 * requires a cache file, that contains the results of the last +187 * PMD run. Thus the cache is only effective, if this file is +188 * not cleaned between runs. +189 * +190 * @since 3.8 +191 */ +192 @Parameter( property = "pmd.analysisCache", defaultValue = "false" ) +193 private boolean analysisCache; +194 +195 /** +196 * The location of the analysis cache, if it is enabled. +197 * This file contains the results of the last PMD run and must not be cleaned +198 * between consecutive PMD runs. Otherwise the cache is not in use. +199 * If the file doesn't exist, PMD executes as if there is no cache enabled and +200 * all files are analyzed. Otherwise only changed files will be analyzed again. +201 * +202 * @since 3.8 +203 */ +204 @Parameter( property = "pmd.analysisCacheLocation", defaultValue = "${project.build.directory}/pmd/pmd.cache" ) +205 private String analysisCacheLocation; +206 +207 /** +208 * {@inheritDoc} +209 */ +210 public String getName( Locale locale ) 211 { -212 try -213 { -214 execute( locale ); -215 } -216 finally -217 { -218 if ( getSink() != null ) -219 { -220 getSink().close(); -221 } -222 } -223 } -224 -225 private void execute( Locale locale ) -226 throws MavenReportException -227 { -228 if ( !skip canGenerateReport() ) -229 { -230 ClassLoader origLoader = Thread.currentThread().getContextClassLoader(); -231 try -232 { -233 Thread.currentThread().setContextClassLoader( this.getClass().getClassLoader() ); -234 -235 Report report = generateReport( locale ); -236 -237 if ( !isHtml() !isXml() ) -238 { -239 writeNonHtml( report ); -240 } -241 } -242 finally -243 { -244 Thread.currentThread().setContextClassLoader( origLoader ); -245 } -246 } -247 } -248 -249 @Override -250 public boolean canGenerateReport() -251 { -252 if ( skip ) -253 { -254 return false; -255 } -256 -257 boolean result = super.canGenerateReport(); -258 if ( result ) -259 { -260 try -261 { -262 executePmdWithClassloader(); -263 if ( skipEmptyReport ) -264 { -265 result = renderer.hasViolations(); -266 if ( result ) -267 { -268 getLog().debug( "Skipping report since skipEmptyReport is true and" -269 + "there are no PMD violations." ); -270 } -271 } -272 } -273 catch ( MavenReportException e ) -274 { -275 throw new RuntimeException( e ); -276 } -277 } -278 return result; -279 } -280 -281 private void executePmdWithClassloader() -282 throws MavenReportException -283 { -284 ClassLoader origLoader =
svn commit: r1011460 [2/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReport.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReport.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReport.html Mon May 1 07:24:19 2017 @@ -3,13 +3,13 @@ -PmdReport (Apache Maven PMD Plugin 3.7 API) +PmdReport (Apache Maven PMD Plugin 3.8 API) @@ -195,7 +195,7 @@ extends canGenerateReport() -http://pmd.sourceforge.net/pmd-core/apidocs/net/sourceforge/pmd/renderers/Renderer.html?is-external=true; title="class or interface in net.sourceforge.pmd.renderers">Renderer +net.sourceforge.pmd.renderers.Renderer createRenderer() Create and return the correct renderer for the output type. @@ -223,7 +223,7 @@ extends getOutputName() -http://pmd.sourceforge.net/pmd-core/apidocs/net/sourceforge/pmd/PMDConfiguration.html?is-external=true; title="class or interface in net.sourceforge.pmd">PMDConfiguration +net.sourceforge.pmd.PMDConfiguration getPMDConfiguration() Constructs the PMD configuration class, passing it an argument that configures the target JDK. @@ -368,8 +368,8 @@ extends getPMDConfiguration -publichttp://pmd.sourceforge.net/pmd-core/apidocs/net/sourceforge/pmd/PMDConfiguration.html?is-external=true; title="class or interface in net.sourceforge.pmd">PMDConfigurationgetPMDConfiguration() - throws http://maven.apache.org/shared/maven-reporting-api/apidocs/org/apache/maven/reporting/MavenReportException.html?is-external=true; title="class or interface in org.apache.maven.reporting">MavenReportException +publicnet.sourceforge.pmd.PMDConfigurationgetPMDConfiguration() + throws http://maven.apache.org/shared/maven-reporting-api/apidocs/org/apache/maven/reporting/MavenReportException.html?is-external=true; title="class or interface in org.apache.maven.reporting">MavenReportException Constructs the PMD configuration class, passing it an argument that configures the target JDK. Returns:the resulting PMD Throws: @@ -391,8 +391,8 @@ extends createRenderer -public finalhttp://pmd.sourceforge.net/pmd-core/apidocs/net/sourceforge/pmd/renderers/Renderer.html?is-external=true; title="class or interface in net.sourceforge.pmd.renderers">RenderercreateRenderer() - throws http://maven.apache.org/shared/maven-reporting-api/apidocs/org/apache/maven/reporting/MavenReportException.html?is-external=true; title="class or interface in org.apache.maven.reporting">MavenReportException +public finalnet.sourceforge.pmd.renderers.RenderercreateRenderer() +throws http://maven.apache.org/shared/maven-reporting-api/apidocs/org/apache/maven/reporting/MavenReportException.html?is-external=true; title="class or interface in org.apache.maven.reporting">MavenReportException Create and return the correct renderer for the output type. Returns:the renderer based on the configured output Throws: @@ -466,6 +466,6 @@ extends Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReportGenerator.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReportGenerator.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReportGenerator.html Mon May 1 07:24:19 2017 @@ -3,13 +3,13 @@ -PmdReportGenerator (Apache Maven PMD Plugin 3.7 API) +PmdReportGenerator (Apache Maven PMD Plugin 3.8 API) @@ -149,7 +149,7 @@ extends http://docs.oracle.com/ endDocument() -http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true; title="class or interface in
svn commit: r1011460 [8/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/CpdReportTest.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/CpdReportTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/CpdReportTest.html Mon May 1 07:24:19 2017 @@ -38,270 +38,270 @@ 30 import javax.xml.parsers.DocumentBuilder; 31 import javax.xml.parsers.DocumentBuilderFactory; 32 -33 import net.sourceforge.pmd.cpd.CPD; -34 import net.sourceforge.pmd.cpd.CPDConfiguration; -35 import net.sourceforge.pmd.cpd.JavaLanguage; -36 import net.sourceforge.pmd.cpd.Mark; -37 import net.sourceforge.pmd.cpd.Match; -38 import net.sourceforge.pmd.cpd.TokenEntry; -39 -40 import org.apache.commons.lang3.StringUtils; -41 import org.codehaus.plexus.util.FileUtils; -42 import org.w3c.dom.Document; -43 -44 /** -45 * @author a href="mailto:och...@apache.org; target="alexandria_uri">mailto:och...@apache.org"Maria Odea Ching/a -46 * @version $Id$ -47 */ -48 public class CpdReportTest -49 extends AbstractPmdReportTest -50 { -51 /** -52 * {@inheritDoc} -53 */ -54 @Override -55 protected void setUp() -56 throws Exception -57 { -58 super.setUp(); -59 FileUtils.deleteDirectory( new File( getBasedir(), "target/test/unit" ) ); -60 } -61 -62 /** -63 * Test CPDReport given the default configuration -64 * -65 * @throws Exception -66 */ -67 public void testDefaultConfiguration() -68 throws Exception -69 { -70 File testPom = -71 new File( getBasedir(), -72 "src/test/resources/unit/default-configuration/cpd-default-configuration-plugin-config.xml" ); -73 CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom ); -74 mojo.execute(); -75 -76 // check if the CPD files were generated -77 File generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/cpd.xml" ); -78 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -79 -80 generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ); -81 renderer( mojo, generatedFile ); -82 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -83 -84 // check the contents of cpd.html -85 String str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) ); -86 assertTrue( lowerCaseContains( str, "AppSample.java" ) ); -87 -88 str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) ); -89 assertTrue( lowerCaseContains( str, "App.java" ) ); -90 -91 str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) ); -92 assertTrue( lowerCaseContains( str, "public String dup( String str )" ) ); -93 -94 str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) ); -95 assertTrue( lowerCaseContains( str, "tmp = tmp + str.substring( i, i + 1);" ) ); -96 } -97 -98 /** -99 * Test CPDReport using custom configuration -100 * -101 * @throws Exception -102 */ -103 public void testCustomConfiguration() -104 throws Exception -105 { -106 File testPom = -107 new File( getBasedir(), -108 "src/test/resources/unit/custom-configuration/cpd-custom-configuration-plugin-config.xml" ); -109 CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom ); -110 mojo.execute(); -111 -112 // check if the CPD files were generated -113 File generatedFile = new File( getBasedir(), "target/test/unit/custom-configuration/target/cpd.csv" ); -114 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -115 -116 generatedFile = new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ); -117 renderer( mojo, generatedFile ); -118 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -119 -120 // Contents that should NOT be in the report -121 String str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) ); -122 assertFalse( lowerCaseContains( str, "/Sample.java" ) ); -123 -124 str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) ); -125
svn commit: r1011460 [4/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/dependency-convergence.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/dependency-convergence.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/dependency-convergence.html Mon May 1 07:24:19 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven PMD Plugin Dependency Convergence @@ -77,9 +77,9 @@ Dependency Convergence - | Last Published: 2016-10-08 + | Last Published: 2017-05-01 -Version: 3.7 +Version: 3.8 @@ -477,19 +477,19 @@ Number of dependencies (NOD): -110 +109 Number of unique artifacts (NOA): 142 Number of version-conflicting artifacts (NOC): -18 +19 Number of SNAPSHOT artifacts (NOS): 0 Convergence (NOD/NOA): -77 % +76 % Ready for release (100% convergence and no SNAPSHOTS): ErrorYou do not have 100% convergence. @@ -505,11 +505,11 @@ 1.1 -org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.7\-org.apache.maven.plugin-testing:maven-plugin-testing-harness:jar:1.3:test\-org.apache.maven:maven-core:jar:2.2.1:test\-(classworlds:classworlds:jar:1.1:test - omitted for conflict with 1.1-alpha-2) +org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.8\-org.apache.maven.plugin-testing:maven-plugin-testing-harness:jar:1.3:test\-org.apache.maven:maven-core:jar:2.2.1:test\-(classworlds:classworlds:jar:1.1:test - omitted for conflict with 1.1-alpha-2) 1.1-alpha-2 -org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.7+-org.apache.maven:maven-project:jar:2.2.1:compile|\-org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile|\-classworlds:classworlds:jar:1.1-alpha-2:compile\-org.apache.maven.plugin-testing:maven-plugin-testing-harness:jar:1.3:test\-org.apache.maven:maven-core:jar:2.2.1:test\-org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-4:test\-(classworlds:classworlds:jar:1.1-alpha-2:test - omitted for duplicate) +org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.8+-org.apache.maven:maven-project:jar:2.2.1:compile|\-org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile|\-classworlds:classworlds:jar:1.1-alpha-2:compile\-org.apache.maven.plugin-testing:maven-plugin-testing-harness:jar:1.3:test\-org.apache.maven:maven-core:jar:2.2.1:test\-org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-4:test\-(classworlds:classworlds:jar:1.1-alpha-2:test - omitted for duplicate) com.fasterxml.jackson.core:jackson-annotations @@ -520,11 +520,11 @@ 2.4.0 -org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.7\-com.github.tomakehurst:wiremock:jar:1.52:test\-com.fasterxml.jackson.core:jackson-databind:jar:2.4.2:test\-(com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:test - omitted for conflict with 2.4.2) +org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.8\-com.github.tomakehurst:wiremock:jar:1.52:test\-com.fasterxml.jackson.core:jackson-databind:jar:2.4.2:test\-(com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:test - omitted for conflict with 2.4.2) 2.4.2 -org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.7\-com.github.tomakehurst:wiremock:jar:1.52:test\-com.fasterxml.jackson.core:jackson-annotations:jar:2.4.2:test +org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.8\-com.github.tomakehurst:wiremock:jar:1.52:test\-com.fasterxml.jackson.core:jackson-annotations:jar:2.4.2:test commons-codec:commons-codec @@ -535,11 +535,11 @@ 1.2 -org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.7\-org.apache.maven.plugin-testing:maven-plugin-testing-harness:jar:1.3:test\-org.apache.maven:maven-core:jar:2.2.1:test\-org.apache.maven.wagon:wagon-webdav-jackrabbit:jar:1.0-beta-6:test\-org.apache.jackrabbit:jackrabbit-webdav:jar:1.5.0:test\-commons-httpclient:commons-httpclient:jar:3.0:test\-(commons-codec:commons-codec:jar:1.2:test - omitted for conflict with 1.3) +org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.8\-org.apache.maven.plugin-testing:maven-plugin-testing-harness:jar:1.3:test\-org.apache.maven:maven-core:jar:2.2.1:test\-org.apache.maven.wagon:wagon-webdav-jackrabbit:jar:1.0-beta-6:test\-org.apache.jackrabbit:jackrabbit-webdav:jar:1.5.0:test\-commons-httpclient:commons-httpclient:jar:3.0:test\-(commons-codec:commons-codec:jar:1.2:test - omitted for conflict with 1.3) 1.6 -org.apache.maven.plugins:maven-pmd-plugin:maven-plugin:3.7\-org.apache.httpcomponents:httpclient:jar:4.3.5:test (scope not updated to compile)\-commons-codec:commons-codec:jar:1.6:test
svn commit: r1011460 [9/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/PmdReportTest.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/PmdReportTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/PmdReportTest.html Mon May 1 07:24:19 2017 @@ -99,232 +99,232 @@ 91 assertTrue( str.contains( "/xref/def/configuration/AppSample.html#L45" ) ); 92 } 93 -94 public void testJavascriptConfiguration() -95 throws Exception +94 public void testDefaultConfigurationWithAnalysisCache() +95 throws Exception 96 { -97 File testPom = -98 new File( getBasedir(), -99 "src/test/resources/unit/default-configuration/javascript-configuration-plugin-config.xml" ); -100 PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom ); -101 mojo.execute(); -102 -103 // check if the PMD files were generated -104 File generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/pmd.xml" ); -105 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); +97 FileUtils.copyDirectoryStructure( new File( getBasedir(), +98 "src/test/resources/unit/default-configuration/jxr-files" ), +99 new File( getBasedir(), "target/test/unit/pmd-with-analysis-cache-plugin-config/target/site" ) ); +100 +101 File testPom = +102 new File( getBasedir(), +103 "src/test/resources/unit/default-configuration/pmd-with-analysis-cache-plugin-config.xml" ); +104 PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom ); +105 mojo.execute(); 106 -107 // these are the rulesets, that have been applied... -108 generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/ecmascript-basic.xml" ); -109 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -110 -111 generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/ecmascript-braces.xml" ); -112 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -113 -114 generatedFile = -115 new File( getBasedir(), "target/test/unit/default-configuration/target/ecmascript-unnecessary.xml" ); -116 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -117 -118 generatedFile = new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ); -119 renderer( mojo, generatedFile ); -120 assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) ); -121 -122 String str = readFile( generatedFile ); -123 assertTrue( str.contains( "Avoid using global variables" ) ); -124 } -125 -126 public void testFileURL() -127 throws Exception -128 { -129 FileUtils.copyDirectoryStructure( new File( getBasedir(), -130 "src/test/resources/unit/default-configuration/jxr-files" ), -131 new File( getBasedir(), "target/test/unit/default-configuration/target/site" ) ); -132 -133 File testPom = -134 new File( getBasedir(), -135 "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ); -136 PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom ); -137 -138 // Additional test case for MPMD-174 (http://jira.codehaus.org/browse/MPMD-174). -139 WireMockServer mockServer = new WireMockServer( 3456 ); -140 mockServer.start(); -141 -142 String sonarRuleset = -143 IOUtils.toString( getClass().getClassLoader().getResourceAsStream( "unit/default-configuration/rulesets/sonar-way-ruleset.xml" ), -144 StandardCharsets.UTF_8 ); -145 -146 String sonarMainPageHtml = -147 IOUtils.toString( getClass().getClassLoader().getResourceAsStream( "unit/default-configuration/rulesets/sonar-main-page.html" ), -148 StandardCharsets.UTF_8 ); -149 -150 final String sonarBaseUrl = "/profiles"; -151 final String sonarProfileUrl = sonarBaseUrl + "/export?format=pmdlanguage=javaname=Sonar%2520way"; -152 final String sonarExportRulesetUrl = "http://localhost:; + mockServer.port() + sonarProfileUrl; -153 -154 mockServer.stubFor( WireMock.get( WireMock.urlEqualTo( sonarBaseUrl ) ).willReturn(
svn commit: r1011460 [5/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/javascriptReport.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/javascriptReport.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/javascriptReport.html Mon May 1 07:24:19 2017 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Apache Maven PMD Plugin Analyzing JavaScript Code @@ -79,9 +79,9 @@ Analyzing JavaScript Code - | Last Published: 2016-10-08 + | Last Published: 2017-05-01 -Version: 3.7 +Version: 3.8 @@ -378,7 +378,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId -version3.7/version +version3.8/version configuration languagejavascript/language rulesets @@ -408,7 +408,7 @@ - Copyright 20052016 + Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/jspReport.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/jspReport.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/jspReport.html Mon May 1 07:24:19 2017 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -9,7 +9,7 @@ - + Apache Maven PMD Plugin Analyzing JSP Code @@ -79,9 +79,9 @@ Analyzing JSP Code - | Last Published: 2016-10-08 + | Last Published: 2017-05-01 -Version: 3.7 +Version: 3.8 @@ -378,7 +378,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId -version3.7/version +version3.8/version configuration languagejsp/language rulesets @@ -406,7 +406,7 @@ - Copyright 20052016 + Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/multi-module-config.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/multi-module-config.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/examples/multi-module-config.html Mon May 1 07:24:19 2017 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> @@ -8,7 +8,7 @@ - + Apache Maven PMD Plugin Multimodule Configuration @@ -78,9 +78,9 @@ Multimodule Configuration - | Last Published: 2016-10-08 + | Last Published: 2017-05-01 -Version: 3.7 +Version: 3.8 @@ -436,7 +436,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId -version3.7/version +version3.8/version configuration rulesets rulesetwhizbang/pmd-ruleset.xml/ruleset @@ -465,7 +465,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId -version3.7/version +version3.8/version configuration rulesets rulesetwhizbang/pmd-ruleset.xml/ruleset @@ -497,7 +497,7 @@ - Copyright 20052016 + Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All
svn commit: r1011460 [10/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/c
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/PmdViolationCheckMojoTest.html Mon May 1 07:24:19 2017 @@ -166,6 +166,6 @@ 158 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/package-frame.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/package-frame.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/package-frame.html Mon May 1 07:24:19 2017 @@ -3,7 +3,7 @@ - Apache Maven PMD Plugin 3.7 Reference Package org.apache.maven.plugin.pmd + Apache Maven PMD Plugin 3.8 Reference Package org.apache.maven.plugin.pmd Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/package-summary.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/package-summary.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/package-summary.html Mon May 1 07:24:19 2017 @@ -3,7 +3,7 @@ - Apache Maven PMD Plugin 3.7 Reference Package org.apache.maven.plugin.pmd + Apache Maven PMD Plugin 3.8 Reference Package org.apache.maven.plugin.pmd @@ -88,7 +88,7 @@ - Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. + Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.html Mon May 1 07:24:19 2017 @@ -128,6 +128,6 @@ 120 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.html Mon May 1 07:24:19 2017 @@ -57,6 +57,6 @@ 49 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref-test/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.html == ---
svn commit: r1011460 [1/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/cl
Author: adangel Date: Mon May 1 07:24:19 2017 New Revision: 1011460 Log: Site checkin for project Apache Maven PMD Plugin Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/allclasses-frame.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/allclasses-noframe.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/constant-values.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/deprecated-list.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/help-doc.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/index-all.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/index.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/AbstractPmdReport.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/CpdReport.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/CpdReportGenerator.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/ExcludeDuplicationsFromFile.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/ExcludeFromFile.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/HelpMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdCollectingRenderer.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdFileInfo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReport.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdReportGenerator.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/ViolationDetails.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/AbstractPmdReport.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/AbstractPmdViolationCheckMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/CpdReport.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/CpdReportGenerator.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/CpdViolationCheckMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/ExcludeDuplicationsFromFile.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/ExcludeFromFile.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/ExcludeViolationsFromFile.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/HelpMojo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/PmdCollectingRenderer.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/PmdFileInfo.html websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/apidocs/org/apache/maven/plugin/pmd/class-use/PmdReport.html
svn commit: r1011460 [12/12] - in /websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/pmd/ apidocs/org/apache/maven/plugin/pmd/c
Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdReportGenerator.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdReportGenerator.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdReportGenerator.html Mon May 1 07:24:19 2017 @@ -331,6 +331,6 @@ 323 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.html Mon May 1 07:24:19 2017 @@ -179,6 +179,6 @@ 171 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/ViolationDetails.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/ViolationDetails.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/ViolationDetails.html Mon May 1 07:24:19 2017 @@ -77,6 +77,6 @@ 69 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/CpdErrorDetail.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/CpdErrorDetail.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/CpdErrorDetail.html Mon May 1 07:24:19 2017 @@ -110,6 +110,6 @@ 102 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/CpdFile.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/CpdFile.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/CpdFile.html Mon May 1 07:24:19 2017 @@ -85,6 +85,6 @@ 77 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/Duplication.html == --- websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/Duplication.html (original) +++ websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/Duplication.html Mon May 1 07:24:19 2017 @@ -160,6 +160,6 @@ 152 } -Copyright 20052016 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20052017 https://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-pmd-plugin-LATEST/xref/org/apache/maven/plugin/pmd/model/PmdErrorDetail.html
svn commit: r1793285 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Mon May 1 06:50:44 2017 New Revision: 1793285 URL: http://svn.apache.org/viewvc?rev=1793285=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1793285=1793284=1793285=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Mon May 1 06:50:44 2017 @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.8 + 3.9-SNAPSHOT maven-plugin Apache Maven PMD Plugin @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.8 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.8 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-pmd-plugin-3.8 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/ JIRA
svn commit: r1793283 - /maven/plugins/trunk/maven-pmd-plugin/pom.xml
Author: adangel Date: Mon May 1 06:50:28 2017 New Revision: 1793283 URL: http://svn.apache.org/viewvc?rev=1793283=rev Log: [maven-release-plugin] prepare release maven-pmd-plugin-3.8 Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1793283=1793282=1793283=diff == --- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Mon May 1 06:50:28 2017 @@ -30,7 +30,7 @@ under the License. maven-pmd-plugin - 3.8-SNAPSHOT + 3.8 maven-plugin Apache Maven PMD Plugin @@ -64,9 +64,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pmd-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.8 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-pmd-plugin-3.8 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-pmd-plugin-3.8 JIRA
svn commit: r1793284 - /maven/plugins/tags/maven-pmd-plugin-3.8/
Author: adangel Date: Mon May 1 06:50:42 2017 New Revision: 1793284 URL: http://svn.apache.org/viewvc?rev=1793284=rev Log: [maven-release-plugin] copy for tag maven-pmd-plugin-3.8 Added: maven/plugins/tags/maven-pmd-plugin-3.8/ - copied from r1793283, maven/plugins/trunk/maven-pmd-plugin/