svn commit: r1772492 - /maven/doxia/doxia/trunk/pom.xml
Author: rfscholte Date: Sat Dec 3 22:23:31 2016 New Revision: 1772492 URL: http://svn.apache.org/viewvc?rev=1772492=rev Log: Upgrade org.codehaus.plexus:plexus-component-metadata to 1.7.1 This will make projects build with Java9 Modified: maven/doxia/doxia/trunk/pom.xml Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1772492=1772491=1772492=diff == --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Sat Dec 3 22:23:31 2016 @@ -257,6 +257,7 @@ under the License. org.codehaus.plexus plexus-component-metadata +1.7.1
maven-surefire git commit: [SUREFIRE-1305] surefire fails on parallel tests when newline character is in test description [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/master ce6264f2d -> d7bf6ce49 (forced update) [SUREFIRE-1305] surefire fails on parallel tests when newline character is in test description Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d7bf6ce4 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d7bf6ce4 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d7bf6ce4 Branch: refs/heads/master Commit: d7bf6ce49043a3301494fdd26c538afad4e1938d Parents: 569e754 Author: Tibor17Authored: Sat Dec 3 22:26:42 2016 +0100 Committer: Tibor17 Committed: Sat Dec 3 22:26:42 2016 +0100 -- .../util/internal/TestClassMethodNameUtils.java | 1 + .../common/junit4/JUnit4RunListener.java| 25 .../common/junit4/JUnit4StackTraceWriter.java | 8 +++ 3 files changed, 9 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7bf6ce4/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java new file mode 100644 index 000..29b4f51 --- /dev/null +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java @@ -0,0 +1 @@ +package org.apache.maven.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ import java.util.regex.Matcher; import java.util.regex.Pattern; /** * JUnit Description parser. * Used by JUnit Version lower than 4. 7. * * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17) * @since 2.19.2 */ public final class TestClassMethodNameUtils { private static final Pattern METHOD_CLASS_PATTERN = Pattern.compile( "([\\s\\S]*)\\((.*)\\)" ); private TestClassMethodNameUtils() { throw new IllegalStateException( "no instantiable constructor" ); } public static String extractClassName( String displayName ) { Matcher m = METHOD_CLASS_PATTERN.matcher( displayName ); return m.matches() ? m.group( 2 ) : displayName; } public static String extractMethodName( String displayName ) { int i = displayName.indexOf( "(" ); return i >= 0 ? displayName.substring( 0, i ) : displayName; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7bf6ce4/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java -- diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java index dd004fa..1d365cf 100644 --- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java +++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java @@ -28,14 +28,13 @@ import org.junit.runner.Description; import org.junit.runner.Result; import org.junit.runner.notification.Failure; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.isFailureInsideJUnitItself; import static org.apache.maven.surefire.common.junit4.JUnit4Reflector.getAnnotatedIgnoreValue; import static org.apache.maven.surefire.report.SimpleReportEntry.assumption; import static org.apache.maven.surefire.report.SimpleReportEntry.ignored; import static org.apache.maven.surefire.report.SimpleReportEntry.withException; +import static
[2/2] maven-surefire git commit: [SUREFIRE-1272] Create better report for AssumptionFailure
[SUREFIRE-1272] Create better report for AssumptionFailure Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/ce6264f2 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/ce6264f2 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/ce6264f2 Branch: refs/heads/master Commit: ce6264f2dcd1fc210d61e9ad02badabbba10a6b4 Parents: 569e754 Author: Tibor17Authored: Sat Dec 3 22:16:05 2016 +0100 Committer: Tibor17 Committed: Sat Dec 3 22:16:05 2016 +0100 -- .../util/internal/TestClassMethodNameUtils.java | 1 + .../common/junit4/JUnit4RunListener.java| 25 .../common/junit4/JUnit4StackTraceWriter.java | 8 +++ 3 files changed, 9 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ce6264f2/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java new file mode 100644 index 000..29b4f51 --- /dev/null +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java @@ -0,0 +1 @@ +package org.apache.maven.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ import java.util.regex.Matcher; import java.util.regex.Pattern; /** * JUnit Description parser. * Used by JUnit Version lower than 4. 7. * * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17) * @since 2.19.2 */ public final class TestClassMethodNameUtils { private static final Pattern METHOD_CLASS_PATTERN = Pattern.compile( "([\\s\\S]*)\\((.*)\\)" ); private TestClassMethodNameUtils() { throw new IllegalStateException( "no instantiable constructor" ); } public static String extractClassName( String displayName ) { Matcher m = METHOD_CLASS_PATTERN.matcher( displayName ); return m.matches() ? m.group( 2 ) : displayName; } public static String extractMethodName( String displayName ) { int i = displayName.indexOf( "(" ); return i >= 0 ? displayName.substring( 0, i ) : displayName; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ce6264f2/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java -- diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java index dd004fa..1d365cf 100644 --- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java +++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java @@ -28,14 +28,13 @@ import org.junit.runner.Description; import org.junit.runner.Result; import org.junit.runner.notification.Failure; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.isFailureInsideJUnitItself; import static org.apache.maven.surefire.common.junit4.JUnit4Reflector.getAnnotatedIgnoreValue; import static org.apache.maven.surefire.report.SimpleReportEntry.assumption; import static org.apache.maven.surefire.report.SimpleReportEntry.ignored; import static org.apache.maven.surefire.report.SimpleReportEntry.withException; +import static org.apache.maven.surefire.util.internal.TestClassMethodNameUtils.extractClassName; +import static org.apache.maven.surefire.util.internal.TestClassMethodNameUtils.extractMethodName;
[1/2] maven-surefire git commit: [SUREFIRE] moved UrlUtils to internal package
Repository: maven-surefire Updated Branches: refs/heads/master d9b577cdc -> ce6264f2d [SUREFIRE] moved UrlUtils to internal package Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/569e7545 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/569e7545 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/569e7545 Branch: refs/heads/master Commit: 569e75452b1180251190c34713714bb4ac515d0e Parents: d9b577c Author: Tibor17Authored: Sat Dec 3 20:57:21 2016 +0100 Committer: Tibor17 Committed: Sat Dec 3 20:57:21 2016 +0100 -- .../booterclient/ForkConfiguration.java | 5 +- .../apache/maven/surefire/util/UrlUtils.java| 95 --- .../maven/surefire/util/internal/UrlUtils.java | 96 .../maven/surefire/util/UrlUtilsTest.java | 6 +- .../apache/maven/surefire/booter/Classpath.java | 5 +- 5 files changed, 105 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/569e7545/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java index 036ec56..6d43bd2 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java @@ -27,7 +27,6 @@ import org.apache.maven.surefire.booter.Classpath; import org.apache.maven.surefire.booter.ForkedBooter; import org.apache.maven.surefire.booter.StartupConfiguration; import org.apache.maven.surefire.booter.SurefireBooterForkException; -import org.apache.maven.surefire.util.UrlUtils; import java.io.File; import java.io.FileOutputStream; @@ -40,6 +39,8 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import static org.apache.maven.surefire.util.internal.UrlUtils.toURL; + /** * Configuration for forking tests. * @@ -287,7 +288,7 @@ public class ForkConfiguration for ( String el : classPath ) { // NOTE: if File points to a directory, this entry MUST end in '/'. -cp.append( UrlUtils.getURL( new File( el ) ).toExternalForm() ) +cp.append( toURL( new File( el ) ).toExternalForm() ) .append( " " ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/569e7545/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java deleted file mode 100644 index 34dfe3d..000 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.apache.maven.surefire.util; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.BitSet; - -/** - * Utility for dealing with URLs in pre-JDK 1.4. - */ -public class UrlUtils -{ -private static final BitSet UNRESERVED = new BitSet( Byte.MAX_VALUE - Byte.MIN_VALUE + 1 ); - -private static final int RADIX = 16; - -private static final int MASK = 0xf; - -private UrlUtils() -{ -} - -private static final String ENCODING = "UTF-8"; - -static -{ -try -{ -byte[] bytes = -
svn commit: r1772473 - in /maven/doxia: doxia-tools/trunk/doxia-book-maven-plugin/pom.xml doxia-tools/trunk/doxia-book-renderer/pom.xml doxia-tools/trunk/doxia-converter/pom.xml doxia-tools/trunk/doxi
Author: rfscholte Date: Sat Dec 3 15:43:01 2016 New Revision: 1772473 URL: http://svn.apache.org/viewvc?rev=1772473=rev Log: Upgrade parent of tools to org.apache.maven.doxia:doxia-tools:30 Modified: maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml maven/doxia/trunks/ (props changed) Modified: maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml?rev=1772473=1772472=1772473=diff == --- maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml Sat Dec 3 15:43:01 2016 @@ -25,7 +25,7 @@ under the License. org.apache.maven.doxia doxia-tools -3 +30 ../../../pom/maven/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml?rev=1772473=1772472=1772473=diff == --- maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml Sat Dec 3 15:43:01 2016 @@ -25,7 +25,7 @@ under the License. org.apache.maven.doxia doxia-tools -3 +30 ../../../pom/maven/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml?rev=1772473=1772472=1772473=diff == --- maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml Sat Dec 3 15:43:01 2016 @@ -25,7 +25,7 @@ under the License. org.apache.maven.doxia doxia-tools -3 +30 ../../../pom/maven/doxia-tools/pom.xml Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml?rev=1772473=1772472=1772473=diff == --- maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml (original) +++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml Sat Dec 3 15:43:01 2016 @@ -25,7 +25,7 @@ under the License. org.apache.maven.doxia doxia-tools -3 +30 ../../../pom/maven/doxia-tools/pom.xml Propchange: maven/doxia/trunks/ -- --- svn:ignore (original) +++ svn:ignore Sat Dec 3 15:43:01 2016 @@ -1,9 +1,11 @@ -target *.iml *.ipr *.iws -.idea .classpath +.idea +.metadata .project +.recommenders .settings out +target
svn commit: r1772465 - /maven/shared/trunk/maven-reporting-impl/pom.xml
Author: rfscholte Date: Sat Dec 3 13:12:37 2016 New Revision: 1772465 URL: http://svn.apache.org/viewvc?rev=1772465=rev Log: Pass source+target to m-invoker-p, easiest way to override default values of maven-compiler-plugin Use jigsaw profile with groovy-all-2.4.8-SNAPSHOT, which fixes #AwkwardStrongEncapsulation issue Modified: maven/shared/trunk/maven-reporting-impl/pom.xml Modified: maven/shared/trunk/maven-reporting-impl/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/pom.xml?rev=1772465=1772464=1772465=diff == --- maven/shared/trunk/maven-reporting-impl/pom.xml (original) +++ maven/shared/trunk/maven-reporting-impl/pom.xml Sat Dec 3 13:12:37 2016 @@ -158,6 +158,10 @@ */pom.xml + + ${maven.compiler.source} + ${maven.compiler.target} + @@ -188,5 +192,39 @@ + + + jigsaw + +[9,) + + + + oss-jfrog + https://oss.jfrog.org/oss-snapshot-local/ + +false + + +true + + + + + + +org.apache.maven.plugins +maven-invoker-plugin + + +org.codehaus.groovy +groovy-all +2.4.8-SNAPSHOT + + + + + +
svn commit: r1772464 - /maven/shared/trunk/maven-reporting-exec/pom.xml
Author: rfscholte Date: Sat Dec 3 13:04:33 2016 New Revision: 1772464 URL: http://svn.apache.org/viewvc?rev=1772464=rev Log: Pass source+target to m-invoker-p, easiest way to override default values of maven-compiler-plugin Use jigsaw profile with groovy-all-2.4.8-SNAPSHOT, which fixes #AwkwardStrongEncapsulation issue Modified: maven/shared/trunk/maven-reporting-exec/pom.xml Modified: maven/shared/trunk/maven-reporting-exec/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/pom.xml?rev=1772464=1772463=1772464=diff == --- maven/shared/trunk/maven-reporting-exec/pom.xml (original) +++ maven/shared/trunk/maven-reporting-exec/pom.xml Sat Dec 3 13:04:33 2016 @@ -329,6 +329,10 @@ */pom.xml + + ${maven.compiler.source} + ${maven.compiler.target} + @@ -343,4 +347,41 @@ + + + + jigsaw + +[9,) + + + + oss-jfrog + https://oss.jfrog.org/oss-snapshot-local/ + +false + + +true + + + + + + + +org.apache.maven.plugins +maven-invoker-plugin + + +org.codehaus.groovy +groovy-all +2.4.8-SNAPSHOT + + + + + + +