svn commit: r1806717 - in /maven/plugins/trunk/maven-ear-plugin/src/test: java/org/apache/maven/plugins/ear/it/ resources/projects/project-087/ resources/projects/project-087/expected-META-INF/
Author: khmarbaise Date: Wed Aug 30 17:37:39 2017 New Revision: 1806717 URL: http://svn.apache.org/viewvc?rev=1806717=rev Log: [MEAR-247] resource-ref in generated application.xml o Added integration test for resource-refs. Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/application.xml maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java?rev=1806717=1806716=1806717=diff == --- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java (original) +++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugins/ear/it/EarMojoIT.java Wed Aug 30 17:37:39 2017 @@ -892,4 +892,12 @@ public class EarMojoIT doTestProject( "project-086", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } ); } +/** + * Builds an EAR with resource-ref entries. + */ +public void testProject087() +throws Exception +{ +doTestProject( "project-087", new String[] { "ejb-sample-one-1.0.jar", "ejb-sample-two-1.0.jar" } ); +} } Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/application.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/application.xml?rev=1806717=auto == --- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/application.xml (added) +++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/expected-META-INF/application.xml Wed Aug 30 17:37:39 2017 @@ -0,0 +1,53 @@ + + +http://java.sun.com/xml/ns/javaee; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd; version="6"> + maven-ear-plugin-test-project-087 + +ejb-sample-one-1.0.jar + + +ejb-sample-two-1.0.jar + + +A complete entry. +complete +java.lang.Integer +4 + + +no-type +4 + + +no-value +java.lang.String +java:global/Example + + +jdbc/myDs1 +javax.sql.DataSource +Container + + +jdbc/myDs2 +javax.sql.DataSource +Container + + Added: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/pom.xml?rev=1806717=auto == --- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/pom.xml (added) +++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-087/pom.xml Wed Aug 30 17:37:39 2017 @@ -0,0 +1,84 @@ + + + +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;> + 4.0.0 + ear + maven-ear-plugin-test-project-087 + 99.0 + Maven + ear + + + eartest + ejb-sample-one + 1.0 + ejb + + + eartest + ejb-sample-two + 1.0 + ejb + + + + + +org.apache.maven.plugins +maven-ear-plugin +@project.version@ + + 6 + + + jdbc/myDs1 + javax.sql.DataSource + Container + + + jdbc/myDs2 + javax.sql.DataSource + Container + + + + + A complete entry. + complete + java.lang.Integer + 4 + + + no-type + 4 + + + no-value + java.lang.String + java:global/Example + + + + + + +
svn commit: r1806713 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/mplugin-324_javadoc/ maven-plugin-plugin/src/it/mplugin-324_javadoc/src/ maven-plugin-plugin/src/it/mplugin-324_javadoc/
Author: rfscholte Date: Wed Aug 30 17:14:24 2017 New Revision: 1806713 URL: http://svn.apache.org/viewvc?rev=1806713=rev Log: [MPLUGIN-324] javadoc generated by helpmojo goal of maven-plugin-plugin produces build failures Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/invoker.properties maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/invoker.properties?rev=1806713=auto == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/invoker.properties (added) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/invoker.properties Wed Aug 30 17:14:24 2017 @@ -0,0 +1,18 @@ +# 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. + +invoker.goals = process-classes javadoc:javadoc Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml?rev=1806713=auto == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml (added) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/pom.xml Wed Aug 30 17:14:24 2017 @@ -0,0 +1,95 @@ + + + + +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/xsd/maven-4.0.0.xsd;> + 4.0.0 + + org.apache.maven.plugins.plugin.its + mplugin3224 + 1.0-SNAPSHOT + maven-plugin + + +Generation javadoc for private methods should be valid + + + +UTF-8 + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + org.codehaus.plexus + plexus-utils + 3.0.1 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + @project.version@ + provided + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.4 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0-M1 + +private + + + + + + +org.apache.maven.plugins +maven-plugin-plugin +@project.version@ + + +default-descriptor +process-classes + + +help-goal + + helpmojo + + + + + + + Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java?rev=1806713=auto == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java (added) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java Wed Aug 30 17:14:24 2017 @@ -0,0 +1,68 @@ +package test; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or
maven git commit: [MNG-6275] Simpler fix (fingers crossed)
Repository: maven Updated Branches: refs/heads/mng-6275 fef668789 -> 4b5c55663 [MNG-6275] Simpler fix (fingers crossed) Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4b5c5566 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4b5c5566 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4b5c5566 Branch: refs/heads/mng-6275 Commit: 4b5c55663e11e9fbdd028e0aee06b22e3291c0e1 Parents: fef6687 Author: Stephen ConnollyAuthored: Wed Aug 30 16:16:24 2017 +0100 Committer: Stephen Connolly Committed: Wed Aug 30 16:16:24 2017 +0100 -- .../org/apache/maven/classrealm/DefaultClassRealmManager.java | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/4b5c5566/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index eaf1b53..013ab23 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -84,8 +84,6 @@ public class DefaultClassRealmManager private final ClassRealm mavenApiRealm; -private final ClassLoader contextClassLoader; - /** * Patterns of artifacts provided by maven core and exported via maven api realm. These artifacts are filtered from * plugin and build extensions realms to avoid presence of duplicate and possibly conflicting classes on classpath. @@ -96,8 +94,6 @@ public class DefaultClassRealmManager public DefaultClassRealmManager( Logger logger, PlexusContainer container, List delegates, CoreExportsProvider exports ) { -ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); -this.contextClassLoader = contextClassLoader == null ? ClassLoader.getSystemClassLoader() : contextClassLoader; this.logger = logger; this.world = ( (MutablePlexusContainer) container ).getClassWorld(); this.containerRealm = container.getContainerRealm(); @@ -124,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, contextClassLoader ); +ClassRealm classRealm = world.newRealm( realmId, PARENT_CLASSLOADER ); if ( logger.isDebugEnabled() ) {
maven-surefire git commit: [SUREFIRE-1264] Some tests can be lost when running in parallel with parameterized tests
Repository: maven-surefire Updated Branches: refs/heads/master 99cd4f65f -> c8724dd2f [SUREFIRE-1264] Some tests can be lost when running in parallel with parameterized tests Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c8724dd2 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c8724dd2 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c8724dd2 Branch: refs/heads/master Commit: c8724dd2f992625c355e4817a6b7995d3e88fdb4 Parents: 99cd4f6 Author: Tibor17Authored: Mon Aug 28 21:41:56 2017 +0200 Committer: Tibor17 Committed: Wed Aug 30 11:05:26 2017 +0200 -- .../util/internal/TestClassMethodNameUtils.java | 2 +- .../surefire/its/jiras/Surefire1264IT.java | 58 + ...refire621TestCountingJunit3InParallelIT.java | 65 +- .../src/test/resources/surefire-1264/pom.xml| 52 + .../core/surefireJunitTests/ATest.java | 33 +++ .../core/surefireJunitTests/BTest.java | 33 +++ .../core/surefireJunitTests/BaseTest.java | 52 + .../core/surefireJunitTests/CTest.java | 33 +++ .../core/surefireJunitTests/DTest.java | 33 +++ .../pom.xml | 225 --- .../src/it/java/mho/JUnit4AdapterSuiteTest.java | 39 .../common/junit4/JUnit4RunListener.java| 57 +++-- .../maven/surefire/junit4/MockReporter.java | 5 +- .../junitcore/ConcurrentRunListener.java| 2 +- .../junitcore/JUnitCoreRunListener.java | 63 +++--- .../maven/surefire/junitcore/TestSet.java | 22 +- .../junitcore/JUnitCoreRunListenerTest.java | 40 +++- .../surefire/junitcore/TestMethodTest.java | 5 +- 18 files changed, 701 insertions(+), 118 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8724dd2/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java index ed78269..23e72e1 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java @@ -51,6 +51,6 @@ public final class TestClassMethodNameUtils public static String extractMethodName( String displayName ) { Matcher m = METHOD_CLASS_PATTERN.matcher( displayName ); -return m.matches() ? m.group( 1 ) : null; +return m.matches() ? m.group( 1 ) : displayName; } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8724dd2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java -- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java new file mode 100644 index 000..bd9af17 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java @@ -0,0 +1,58 @@ +package org.apache.maven.surefire.its.jiras; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; + +/** + * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17) + * @see https://issues.apache.org/jira/browse/SUREFIRE-1264;>SUREFIRE-1264 + * @since 2.20.1 + */ +public class Surefire1264IT +extends SurefireJUnit4IntegrationTestCase +{ + +@Test +public void positiveTests() +{ +unpack( "surefire-1264" ) +
maven git commit: [MNG-6275] Capture the context classloader at construction
Repository: maven Updated Branches: refs/heads/mng-6275 39004f6ae -> fef668789 [MNG-6275] Capture the context classloader at construction Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fef66878 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fef66878 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fef66878 Branch: refs/heads/mng-6275 Commit: fef668789f6abe79f603b96a8ee6f13ea52de4df Parents: 39004f6 Author: Stephen ConnollyAuthored: Wed Aug 30 12:33:59 2017 +0100 Committer: Stephen Connolly Committed: Wed Aug 30 12:33:59 2017 +0100 -- .../apache/maven/classrealm/DefaultClassRealmManager.java| 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/fef66878/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 7be615c..eaf1b53 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -84,6 +84,8 @@ public class DefaultClassRealmManager private final ClassRealm mavenApiRealm; +private final ClassLoader contextClassLoader; + /** * Patterns of artifacts provided by maven core and exported via maven api realm. These artifacts are filtered from * plugin and build extensions realms to avoid presence of duplicate and possibly conflicting classes on classpath. @@ -94,6 +96,8 @@ public class DefaultClassRealmManager public DefaultClassRealmManager( Logger logger, PlexusContainer container, List delegates, CoreExportsProvider exports ) { +ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); +this.contextClassLoader = contextClassLoader == null ? ClassLoader.getSystemClassLoader() : contextClassLoader; this.logger = logger; this.world = ( (MutablePlexusContainer) container ).getClassWorld(); this.containerRealm = container.getContainerRealm(); @@ -120,9 +124,7 @@ public class DefaultClassRealmManager { try { -ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); -ClassRealm classRealm = world.newRealm( realmId, contextClassLoader == null -? ClassLoader.getSystemClassLoader() : contextClassLoader ); +ClassRealm classRealm = world.newRealm( realmId, contextClassLoader ); if ( logger.isDebugEnabled() ) {
svn commit: r1017472 [3/6] - in /websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/jdeps/ apidocs/org/apache/maven/plugin/jde
Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/integration.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/integration.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/integration.html Wed Aug 30 10:22:28 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven JDeps Plugin Continuous Integration @@ -73,10 +73,10 @@ - | Last Published: 2015-10-26 + | Last Published: 2017-08-30 | -Version: 3.0.0 +Version: 3.1.0 @@ -431,7 +431,7 @@ - Copyright 2015 + Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/invoker-report.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/invoker-report.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/invoker-report.html Wed Aug 30 10:22:28 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven JDeps Plugin Invoker Report @@ -73,10 +73,10 @@ - | Last Published: 2015-10-26 + | Last Published: 2017-08-30 | -Version: 3.0.0 +Version: 3.1.0 @@ -413,10 +413,10 @@ Total Time Avg Time -2 +4 0 0 -2 +4 0.0s 0.0s @@ -429,12 +429,22 @@ Time Message -unsupported-api_test/pom.xml +basic\pom.xml skipped 0.0s Skipped due to JRE version -unsupported-api_main/pom.xml +dependenciesToAnalyze\pom.xml +skipped +0.0s +Skipped due to JRE version + +unsupported-api_main\pom.xml +skipped +0.0s +Skipped due to JRE version + +unsupported-api_test\pom.xml skipped 0.0s Skipped due to JRE version @@ -447,7 +457,7 @@ - Copyright 2015 + Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/issue-tracking.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/issue-tracking.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/issue-tracking.html Wed Aug 30 10:22:28 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven JDeps Plugin Issue Tracking @@ -73,10 +73,10 @@ - | Last Published: 2015-10-26 + | Last Published: 2017-08-30 | -Version: 3.0.0 +Version: 3.1.0 @@ -428,7 +428,7 @@ - Copyright 2015 + Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/jdkinternals-mojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/jdkinternals-mojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/jdkinternals-mojo.html Wed Aug 30 10:22:28 2017 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Maven JDeps Plugin jdeps:jdkinternals
svn commit: r1017472 [2/6] - in /websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/jdeps/ apidocs/org/apache/maven/plugin/jde
Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/JDKInternalsMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/JDKInternalsMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/JDKInternalsMojo.html Wed Aug 30 10:22:28 2017 @@ -1,15 +1,15 @@ http://www.w3.org/TR/html4/loose.dtd;> - + -Uses of Class org.apache.maven.plugin.jdeps.JDKInternalsMojo (Apache Maven JDeps Plugin 3.0.0 API) +Uses of Class org.apache.maven.plugin.jdeps.JDKInternalsMojo (Apache Maven JDeps Plugin 3.1.0 API) @@ -110,6 +110,6 @@ -Copyright 2015 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/TestJDKInternalsMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/TestJDKInternalsMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/TestJDKInternalsMojo.html Wed Aug 30 10:22:28 2017 @@ -1,15 +1,15 @@ http://www.w3.org/TR/html4/loose.dtd;> - + -Uses of Class org.apache.maven.plugin.jdeps.TestJDKInternalsMojo (Apache Maven JDeps Plugin 3.0.0 API) +Uses of Class org.apache.maven.plugin.jdeps.TestJDKInternalsMojo (Apache Maven JDeps Plugin 3.1.0 API) @@ -110,6 +110,6 @@ -Copyright 2015 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/JDepsConsumer.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/JDepsConsumer.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/JDepsConsumer.html Wed Aug 30 10:22:28 2017 @@ -1,15 +1,15 @@ http://www.w3.org/TR/html4/loose.dtd;> - + -JDepsConsumer (Apache Maven JDeps Plugin 3.0.0 API) +JDepsConsumer (Apache Maven JDeps Plugin 3.1.0 API) @@ -86,7 +86,7 @@ http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">java.lang.Object -org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer +http://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/cli/CommandLineUtils.StringStreamConsumer.html?is-external=true; title="class or interface in org.codehaus.plexus.util.cli">org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer org.apache.maven.plugin.jdeps.consumers.JDepsConsumer @@ -100,13 +100,13 @@ All Implemented Interfaces: -org.codehaus.plexus.util.cli.StreamConsumer +http://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/cli/StreamConsumer.html?is-external=true; title="class or interface in org.codehaus.plexus.util.cli">StreamConsumer public class JDepsConsumer -extends org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer -implements
svn commit: r1017472 [6/6] - in /websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/jdeps/ apidocs/org/apache/maven/plugin/jde
Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/HelpMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/HelpMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/HelpMojo.html Wed Aug 30 10:22:28 2017 @@ -462,6 +462,6 @@ 454 } -Copyright 2015 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/JDKInternalsMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/JDKInternalsMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/JDKInternalsMojo.html Wed Aug 30 10:22:28 2017 @@ -27,42 +27,52 @@ 19 * under the License. 20 */ 21 -22 import java.io.File; -23 -24 import org.apache.maven.artifact.DependencyResolutionRequiredException; -25 import org.apache.maven.plugins.annotations.LifecyclePhase; -26 import org.apache.maven.plugins.annotations.Mojo; -27 import org.apache.maven.plugins.annotations.ResolutionScope; -28 import org.codehaus.plexus.util.StringUtils; -29 -30 /** -31 * Check if main classes depend on internal JDK classes -32 * -33 * @author Robert Scholte -34 * -35 */ -36 @Mojo( name = "jdkinternals", -37 requiresDependencyResolution = ResolutionScope.COMPILE, -38 defaultPhase = LifecyclePhase.PROCESS_CLASSES ) -39 public class JDKInternalsMojo -40 extends AbstractJDepsMojo -41 { -42 -43 @Override -44 protected String getClassesDirectory() -45 { -46 return getProject().getBuild().getOutputDirectory(); -47 } -48 -49 @Override -50 protected String getClassPath() throws DependencyResolutionRequiredException -51 { -52 return StringUtils.join( getProject().getCompileClasspathElements().iterator(), File.pathSeparator ); -53 } -54 -55 } +22 import java.nio.file.Path; +23 import java.nio.file.Paths; +24 import java.util.Collection; +25 import java.util.LinkedHashSet; +26 import java.util.Set; +27 +28 import org.apache.maven.artifact.DependencyResolutionRequiredException; +29 import org.apache.maven.plugins.annotations.LifecyclePhase; +30 import org.apache.maven.plugins.annotations.Mojo; +31 import org.apache.maven.plugins.annotations.ResolutionScope; +32 +33 /** +34 * Check if main classes depend on internal JDK classes +35 * +36 * @author Robert Scholte +37 * +38 */ +39 @Mojo( name = "jdkinternals", +40 requiresDependencyResolution = ResolutionScope.COMPILE, +41 defaultPhase = LifecyclePhase.PROCESS_CLASSES, threadSafe = true ) +42 public class JDKInternalsMojo +43 extends AbstractJDepsMojo +44 { +45 +46 @Override +47 protected String getClassesDirectory() +48 { +49 return getProject().getBuild().getOutputDirectory(); +50 } +51 +52 @Override +53 protected CollectionPath getClassPath() +54 throws DependencyResolutionRequiredException +55 { +56 SetPath classPath = new LinkedHashSet( getProject().getCompileClasspathElements().size() ); +57 +58 for ( String elm : getProject().getCompileClasspathElements() ) +59 { +60 classPath.add( Paths.get( elm ) ); +61 } +62 +63 return classPath; +64 } +65 } -Copyright 2015 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/TestJDKInternalsMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/TestJDKInternalsMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/TestJDKInternalsMojo.html Wed Aug 30 10:22:28 2017 @@ -27,41 +27,52 @@ 19 * under the License. 20 */ 21 -22 import java.io.File; -23 -24 import org.apache.maven.artifact.DependencyResolutionRequiredException; -25 import
svn commit: r1017472 [5/6] - in /websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/jdeps/ apidocs/org/apache/maven/plugin/jde
Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.html Wed Aug 30 10:22:28 2017 @@ -31,553 +31,566 @@ 23 import java.io.IOException; 24 import java.lang.reflect.InvocationTargetException; 25 import java.lang.reflect.Method; -26 import java.util.Collections; -27 import java.util.List; -28 import java.util.Map; -29 import java.util.Properties; -30 import java.util.StringTokenizer; -31 -32 import org.apache.commons.lang.SystemUtils; -33 import org.apache.maven.artifact.Artifact; -34 import org.apache.maven.artifact.ArtifactUtils; -35 import org.apache.maven.artifact.DependencyResolutionRequiredException; -36 import org.apache.maven.execution.MavenSession; -37 import org.apache.maven.plugin.AbstractMojo; -38 import org.apache.maven.plugin.MojoExecutionException; -39 import org.apache.maven.plugin.MojoFailureException; -40 import org.apache.maven.plugin.jdeps.consumers.JDepsConsumer; -41 import org.apache.maven.plugins.annotations.Component; -42 import org.apache.maven.plugins.annotations.Parameter; -43 import org.apache.maven.project.MavenProject; -44 import org.apache.maven.toolchain.Toolchain; -45 import org.apache.maven.toolchain.ToolchainManager; -46 import org.codehaus.plexus.util.MatchPatterns; -47 import org.codehaus.plexus.util.StringUtils; -48 import org.codehaus.plexus.util.cli.CommandLineException; -49 import org.codehaus.plexus.util.cli.CommandLineUtils; -50 import org.codehaus.plexus.util.cli.Commandline; -51 -52 /** -53 * Abstract Mojo for JDeps -54 * -55 * @author Robert Scholte -56 * -57 */ -58 public abstract class AbstractJDepsMojo -59 extends AbstractMojo -60 { -61 -62 @Parameter( defaultValue = "${project}", readonly = true, required = true ) -63 private MavenProject project; -64 -65 @Parameter( defaultValue = "${session}", readonly = true, required = true ) -66 private MavenSession session; +26 import java.nio.file.Path; +27 import java.nio.file.Paths; +28 import java.util.ArrayList; +29 import java.util.Collection; +30 import java.util.Collections; +31 import java.util.LinkedHashSet; +32 import java.util.List; +33 import java.util.Map; +34 import java.util.Properties; +35 import java.util.Set; +36 import java.util.StringTokenizer; +37 +38 import org.apache.commons.lang3.SystemUtils; +39 import org.apache.maven.artifact.Artifact; +40 import org.apache.maven.artifact.ArtifactUtils; +41 import org.apache.maven.artifact.DependencyResolutionRequiredException; +42 import org.apache.maven.execution.MavenSession; +43 import org.apache.maven.plugin.AbstractMojo; +44 import org.apache.maven.plugin.MojoExecutionException; +45 import org.apache.maven.plugin.MojoFailureException; +46 import org.apache.maven.plugin.jdeps.consumers.JDepsConsumer; +47 import org.apache.maven.plugins.annotations.Component; +48 import org.apache.maven.plugins.annotations.Parameter; +49 import org.apache.maven.project.MavenProject; +50 import org.apache.maven.toolchain.Toolchain; +51 import org.apache.maven.toolchain.ToolchainManager; +52 import org.codehaus.plexus.util.MatchPatterns; +53 import org.codehaus.plexus.util.StringUtils; +54 import org.codehaus.plexus.util.cli.CommandLineException; +55 import org.codehaus.plexus.util.cli.CommandLineUtils; +56 import org.codehaus.plexus.util.cli.Commandline; +57 +58 /** +59 * Abstract Mojo for JDeps +60 * +61 * @author Robert Scholte +62 * +63 */ +64 public abstract class AbstractJDepsMojo +65 extends AbstractMojo +66 { 67 -68 @Parameter( defaultValue = "${project.build.directory}", readonly = true, required = true ) -69 private File outputDirectory; +68 @Parameter( defaultValue = "${project}", readonly = true, required = true ) +69 private MavenProject project; 70 -71 /** -72 * Indicates whether the build will continue even if there are jdeps warnings. -73 */ -74 @Parameter( defaultValue = "true" ) -75 private boolean failOnWarning; -76 +71 @Parameter( defaultValue = "${session}", readonly = true, required = true ) +72 private MavenSession session; +73 +74 @Parameter( defaultValue = "${project.build.directory}", readonly = true, required = true ) +75 private File outputDirectory; +76 77 /** -78 * Additional dependencies which should be analyzed besides the classes. -79 * Specify as {@code groupId:artifactId}, allowing ant-pattern. -80 * -81 * E.g.
svn commit: r1017472 [1/6] - in /websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/jdeps/ apidocs/org/apache/maven/plugin/jde
Author: rfscholte Date: Wed Aug 30 10:22:28 2017 New Revision: 1017472 Log: Site checkin for project Apache Maven JDeps Plugin Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/allclasses-frame.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/allclasses-noframe.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/constant-values.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/deprecated-list.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/help-doc.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/index-all.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/index.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/AbstractJDKInternalsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/HelpMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/JDKInternalsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/TestJDKInternalsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/AbstractJDKInternalsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/AbstractJDepsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/HelpMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/JDKInternalsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/class-use/TestJDKInternalsMojo.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/JDepsConsumer.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/class-use/JDepsConsumer.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/package-frame.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/package-summary.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/package-tree.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/consumers/package-use.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/package-frame.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/package-summary.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/package-tree.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/org/apache/maven/plugin/jdeps/package-use.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/overview-frame.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/overview-summary.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/overview-tree.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/apidocs/package-list websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/checkstyle.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/checkstyle.rss websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/dependencies.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/dependency-convergence.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/dependency-info.html websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/dependency-management.html
svn commit: r1017472 [4/6] - in /websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST: ./ apidocs/ apidocs/org/apache/maven/plugin/jdeps/ apidocs/org/apache/maven/plugin/jde
Modified: websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/AbstractJDKInternalsMojo.html == --- websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/AbstractJDKInternalsMojo.html (original) +++ websites/production/maven/components/plugins-archives/maven-jdeps-plugin-LATEST/xref/org/apache/maven/plugin/jdeps/AbstractJDKInternalsMojo.html Wed Aug 30 10:22:28 2017 @@ -27,27 +27,30 @@ 19 * under the License. 20 */ 21 -22 import org.apache.maven.plugin.MojoFailureException; -23 import org.codehaus.plexus.util.cli.Commandline; +22 import java.nio.file.Path; +23 import java.util.Set; 24 -25 /** -26 * Abstract Mojo for verifying code with jdkinternals -27 * -28 * @author Robert Scholte -29 */ -30 public abstract class AbstractJDKInternalsMojo extends AbstractJDepsMojo -31 { -32 -33 @Override -34 protected void addJDepsOptions( Commandline cmd ) -35 throws MojoFailureException -36 { -37 super.addJDepsOptions( cmd ); -38 cmd.createArg().setValue( "-jdkinternals" ); -39 } -40 } +25 import org.apache.maven.plugin.MojoFailureException; +26 import org.codehaus.plexus.util.cli.Commandline; +27 +28 /** +29 * Abstract Mojo for verifying code with jdkinternals +30 * +31 * @author Robert Scholte +32 */ +33 public abstract class AbstractJDKInternalsMojo extends AbstractJDepsMojo +34 { +35 +36 @Override +37 protected void addJDepsOptions( Commandline cmd, SetPath dependenciesToAnalyze ) +38 throws MojoFailureException +39 { +40 super.addJDepsOptions( cmd, dependenciesToAnalyze ); +41 cmd.createArg().setValue( "-jdkinternals" ); +42 } +43 } -Copyright 2015 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 20152017 http://www.apache.org/;>The Apache Software Foundation. All rights reserved. \ No newline at end of file
svn commit: r1806684 - /maven/plugins/tags/maven-jdeps-plugin-3.1.0/
Author: rfscholte Date: Wed Aug 30 10:16:07 2017 New Revision: 1806684 URL: http://svn.apache.org/viewvc?rev=1806684=rev Log: [maven-release-plugin] copy for tag maven-jdeps-plugin-3.1.0 Added: maven/plugins/tags/maven-jdeps-plugin-3.1.0/ - copied from r1806683, maven/plugins/trunk/maven-jdeps-plugin/
svn commit: r1806685 - /maven/plugins/trunk/maven-jdeps-plugin/pom.xml
Author: rfscholte Date: Wed Aug 30 10:16:10 2017 New Revision: 1806685 URL: http://svn.apache.org/viewvc?rev=1806685=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-jdeps-plugin/pom.xml Modified: maven/plugins/trunk/maven-jdeps-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/pom.xml?rev=1806685=1806684=1806685=diff == --- maven/plugins/trunk/maven-jdeps-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jdeps-plugin/pom.xml Wed Aug 30 10:16:10 2017 @@ -30,7 +30,7 @@ under the License. maven-jdeps-plugin - 3.1.0 + 3.1.1-SNAPSHOT maven-plugin Apache Maven JDeps Plugin @@ -42,9 +42,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-jdeps-plugin-3.1.0 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-jdeps-plugin-3.1.0 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-jdeps-plugin-3.1.0 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jdeps-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jdeps-plugin + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin JIRA
svn commit: r1806683 - /maven/plugins/trunk/maven-jdeps-plugin/pom.xml
Author: rfscholte Date: Wed Aug 30 10:15:54 2017 New Revision: 1806683 URL: http://svn.apache.org/viewvc?rev=1806683=rev Log: [maven-release-plugin] prepare release maven-jdeps-plugin-3.1.0 Modified: maven/plugins/trunk/maven-jdeps-plugin/pom.xml Modified: maven/plugins/trunk/maven-jdeps-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/pom.xml?rev=1806683=1806682=1806683=diff == --- maven/plugins/trunk/maven-jdeps-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-jdeps-plugin/pom.xml Wed Aug 30 10:15:54 2017 @@ -1,106 +1,106 @@ - - - - -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/xsd/maven-4.0.0.xsd;> - 4.0.0 - - -org.apache.maven.plugins -maven-plugins -28 -../../pom/maven/maven-plugins/pom.xml - - - maven-jdeps-plugin - 3.0.1-SNAPSHOT - maven-plugin - - Apache Maven JDeps Plugin - The JDeps Plugin uses the jdeps tool to analyze classes for internal API calls. - 2015 - - -${mavenVersion} - - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jdeps-plugin - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jdeps-plugin - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin - - -JIRA -https://issues.apache.org/jira/browse/MJDEPS - - - - apache.website - scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path} - - - - -3.0 -7 - - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - - - - org.apache.maven - maven-plugin-api - ${mavenVersion} - - - org.apache.maven - maven-core - ${mavenVersion} - - - org.apache.maven - maven-model - ${mavenVersion} - - - org.codehaus.plexus - plexus-utils - 3.0.24 - - - org.apache.commons - commons-lang3 - 3.5 - - - - - junit - junit - 4.11 - test - - + + + + +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/xsd/maven-4.0.0.xsd;> + 4.0.0 + + +org.apache.maven.plugins +maven-plugins +28 +../../pom/maven/maven-plugins/pom.xml + + + maven-jdeps-plugin + 3.1.0 + maven-plugin + + Apache Maven JDeps Plugin + The JDeps Plugin uses the jdeps tool to analyze classes for internal API calls. + 2015 + + +${mavenVersion} + + + + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-jdeps-plugin-3.1.0 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-jdeps-plugin-3.1.0 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-jdeps-plugin-3.1.0 + + +JIRA +https://issues.apache.org/jira/browse/MJDEPS + + + + apache.website + scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path} + + + + +3.0 +7 + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + org.apache.maven + maven-plugin-api + ${mavenVersion} + + + org.apache.maven + maven-core + ${mavenVersion} + + + org.apache.maven + maven-model + ${mavenVersion} + + + org.codehaus.plexus + plexus-utils + 3.0.24 + + + org.apache.commons + commons-lang3 + 3.5 + + + + + junit + junit + 4.11 + test + + \ No newline at end of file
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/bisect-0 [deleted] 98245bd55 refs/heads/bisect-1 [deleted] aa0270d42 refs/heads/bisect-2 [deleted] ee85cfa75 refs/heads/bisect-3 [deleted] 082722338
maven git commit: [MNG-6275] Maven Embedder compatible fix
Repository: maven Updated Branches: refs/heads/mng-6275 [created] 39004f6ae [MNG-6275] Maven Embedder compatible fix - Embedded sets up a classloader to mimic the boot classpath based on parsing the classworldConf - This 'bootLoader' is then installed as the context classloader in the current thread - By default, a running JVM will start with a thread context classloader of 'null' to indicate the system classloader should be used - This change switches to follow the 'correct' behaviour of following the context classloader and falling back to the system class loader only in the case where the context classloader is null. - For running from the CLI, we expect that the thread context classloader will always be null so this should be as before - For running from embedder, we expect that the thread context classloader will have been correctly configured, so this should behave as intended Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/39004f6a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/39004f6a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/39004f6a Branch: refs/heads/mng-6275 Commit: 39004f6aee634a0ac6daa1f99add299ff439f5ec Parents: e44c39c Author: Stephen ConnollyAuthored: Wed Aug 30 10:23:48 2017 +0100 Committer: Stephen Connolly Committed: Wed Aug 30 10:23:48 2017 +0100 -- .../org/apache/maven/classrealm/DefaultClassRealmManager.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/39004f6a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index d517924..7be615c 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,9 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); +ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); +ClassRealm classRealm = world.newRealm( realmId, contextClassLoader == null +? ClassLoader.getSystemClassLoader() : contextClassLoader ); if ( logger.isDebugEnabled() ) {
maven git commit: Revert "Squashed commit of the following:"
Repository: maven Updated Branches: refs/heads/master e44c39c2e -> 170c1ed82 Revert "Squashed commit of the following:" This reverts commit f047ea143766fd22ae42040e6805bef287f3cc3e. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/170c1ed8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/170c1ed8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/170c1ed8 Branch: refs/heads/master Commit: 170c1ed82cbe124da1736da64af20d660dc3162e Parents: e44c39c Author: rfscholteAuthored: Wed Aug 30 11:12:20 2017 +0200 Committer: rfscholte Committed: Wed Aug 30 11:12:20 2017 +0200 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 --- 2 files changed, 1 insertion(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index d517924..6ce1925 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); +ClassRealm classRealm = world.newRealm( realmId, null ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java deleted file mode 100644 index 726199f..000 --- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.apache.maven.classrealm; - -/* - * 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.ServiceLoader; - -import javax.script.ScriptEngineFactory; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.junit.Test; - -public class DefaultClassRealmManagerTest extends PlexusTestCase -{ -private ClassRealmManager classRealmManager; - -@Override -protected void setUp() -throws Exception -{ -super.setUp(); -this.classRealmManager = lookup( ClassRealmManager.class ); -} - -@Override -protected void customizeContainerConfiguration( ContainerConfiguration configuration ) -{ -configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); -} - -@Test -public void testMNG6275_pluginRealmDefaultParentClassLoader() -{ -Plugin plugin = new Plugin(); -plugin.setVersion( "VERSION" ); - -ClassLoader parent = null; - -ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); -ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); -assertTrue( sef.iterator().hasNext() ); -} - -@Test -public void testMNG6275_extensionRealmDefaultParentClassLoader() -{ -Plugin extension = new Plugin(); -extension.setVersion(
[2/2] maven-surefire git commit: [SUREFIRE-1264] Some tests can be lost when running in parallel with parameterized tests
[SUREFIRE-1264] Some tests can be lost when running in parallel with parameterized tests Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c8724dd2 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c8724dd2 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c8724dd2 Branch: refs/heads/SUREFIRE-1264_2 Commit: c8724dd2f992625c355e4817a6b7995d3e88fdb4 Parents: 99cd4f6 Author: Tibor17Authored: Mon Aug 28 21:41:56 2017 +0200 Committer: Tibor17 Committed: Wed Aug 30 11:05:26 2017 +0200 -- .../util/internal/TestClassMethodNameUtils.java | 2 +- .../surefire/its/jiras/Surefire1264IT.java | 58 + ...refire621TestCountingJunit3InParallelIT.java | 65 +- .../src/test/resources/surefire-1264/pom.xml| 52 + .../core/surefireJunitTests/ATest.java | 33 +++ .../core/surefireJunitTests/BTest.java | 33 +++ .../core/surefireJunitTests/BaseTest.java | 52 + .../core/surefireJunitTests/CTest.java | 33 +++ .../core/surefireJunitTests/DTest.java | 33 +++ .../pom.xml | 225 --- .../src/it/java/mho/JUnit4AdapterSuiteTest.java | 39 .../common/junit4/JUnit4RunListener.java| 57 +++-- .../maven/surefire/junit4/MockReporter.java | 5 +- .../junitcore/ConcurrentRunListener.java| 2 +- .../junitcore/JUnitCoreRunListener.java | 63 +++--- .../maven/surefire/junitcore/TestSet.java | 22 +- .../junitcore/JUnitCoreRunListenerTest.java | 40 +++- .../surefire/junitcore/TestMethodTest.java | 5 +- 18 files changed, 701 insertions(+), 118 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8724dd2/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java -- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java index ed78269..23e72e1 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/TestClassMethodNameUtils.java @@ -51,6 +51,6 @@ public final class TestClassMethodNameUtils public static String extractMethodName( String displayName ) { Matcher m = METHOD_CLASS_PATTERN.matcher( displayName ); -return m.matches() ? m.group( 1 ) : null; +return m.matches() ? m.group( 1 ) : displayName; } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c8724dd2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java -- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java new file mode 100644 index 000..bd9af17 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java @@ -0,0 +1,58 @@ +package org.apache.maven.surefire.its.jiras; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; + +/** + * @author mailto:tibordig...@apache.org;>Tibor Digana (tibor17) + * @see https://issues.apache.org/jira/browse/SUREFIRE-1264;>SUREFIRE-1264 + * @since 2.20.1 + */ +public class Surefire1264IT +extends SurefireJUnit4IntegrationTestCase +{ + +@Test +public void positiveTests() +{ +unpack( "surefire-1264" ) +.setForkJvm() +.parallelAll() +
[1/2] maven-surefire git commit: [SUREFIRE-1396] Provider class path is incorrect for custom provider in Failsafe [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1264_2 eff5a2fe2 -> c8724dd2f (forced update) [SUREFIRE-1396] Provider class path is incorrect for custom provider in Failsafe Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/99cd4f65 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/99cd4f65 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/99cd4f65 Branch: refs/heads/SUREFIRE-1264_2 Commit: 99cd4f65f5f04ed8c98f446850f5f8bd7b98fc64 Parents: 0330f7b Author: Jonathan BellAuthored: Mon Jul 24 23:43:36 2017 -0400 Committer: Jonathan Bell Committed: Mon Aug 28 22:28:21 2017 -0400 -- .../plugin/failsafe/IntegrationTestMojo.java| 9 +++ .../plugin/surefire/AbstractSurefireMojo.java | 6 +- .../maven/plugin/surefire/SurefirePlugin.java | 9 +++ .../Surefire1396CustomProviderClassPathIT.java | 52 + .../pom.xml | 47 .../testprovider/ClassPathTestProvider.java | 63 maven.surefire.providerapi.SurefireProvider | 1 + .../pom.xml | 77 .../test/java/pluggableproviders/EmptyIT.java | 26 +++ .../test/java/pluggableproviders/EmptyTest.java | 26 +++ 10 files changed, 313 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/99cd4f65/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java -- diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java index 723a4a1..3474b16 100644 --- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java +++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java @@ -19,6 +19,7 @@ package org.apache.maven.plugin.failsafe; * under the License. */ +import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.surefire.AbstractSurefireMojo; @@ -36,6 +37,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Locale; +import java.util.Map; import static org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils.writeSummary; @@ -443,6 +445,13 @@ public class IntegrationTestMojo } @Override +protected Artifact getMojoArtifact() +{ +final Map pluginArtifactMap = getPluginArtifactMap(); +return pluginArtifactMap.get( "org.apache.maven.plugins:maven-failsafe-plugin" ); +} + +@Override public boolean isSkipTests() { return skipTests; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/99cd4f65/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 047f7a4..29b4402 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 @@ -790,6 +790,8 @@ public abstract class AbstractSurefireMojo protected abstract String getReportSchemaLocation(); +protected abstract Artifact getMojoArtifact(); + private String getDefaultExcludes() { return "**/*$*"; @@ -2815,9 +2817,7 @@ public abstract class AbstractSurefireMojo public Classpath getProviderClasspath() throws ArtifactResolutionException, ArtifactNotFoundException { -final Map pluginArtifactMap = getPluginArtifactMap(); -Artifact plugin = pluginArtifactMap.get( "org.apache.maven.plugins:maven-surefire-plugin" ); -return dependencyResolver.addProviderToClasspath( pluginArtifactMap, plugin ); +return dependencyResolver.addProviderToClasspath( pluginArtifactMap, getMojoArtifact() ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/99cd4f65/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java -- diff --git