maven-integration-testing git commit: [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon
Repository: maven-integration-testing Updated Branches: refs/heads/mng-3599 [created] c530dd828 [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/c530dd82 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/c530dd82 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/c530dd82 Branch: refs/heads/mng-3599 Commit: c530dd828e010d0fb0d401d655c2cf7ebab5b760 Parents: f31241a Author: Stephen Connolly Authored: Wed Jan 11 09:50:08 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 09:50:08 2017 + -- ...enITmng3599useHttpProxyForWebDAVMk2Test.java | 212 +++ ...MavenITmng3599useHttpProxyForWebDAVTest.java | 4 +- .../test/resources/bootstrap/group-7/pom.xml| 50 + .../src/test/resources/bootstrap/pom.xml| 1 + .../src/test/resources/mng-3599-mk2/pom.xml | 23 ++ .../mng-3599-mk2/settings-template.xml | 18 ++ 6 files changed, 306 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c530dd82/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java new file mode 100644 index 000..d77a78f --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -0,0 +1,212 @@ +package org.apache.maven.it; + +/* + * 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.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.io.FileUtils; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.Request; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-3599";>MNG-3599. + * + * @author Brett Porter + * @author John Casey + * @version $Id$ + */ +public class MavenITmng3599useHttpProxyForWebDAVMk2Test +extends AbstractMavenIntegrationTestCase +{ +private static final String LS = System.getProperty( "line.separator" ); + +private Server server; + +private int port; + +private static final String content = "http://maven.apache.org/POM/4.0.0\"; xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; + +" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\";>\n" + +" 4.0.0\n" + +" org.apache.maven.its.mng3599\n" + +" test\n" + +" 1.0-SNAPSHOT\n" + +" MNG-3599\n" + +""; + +public MavenITmng3599useHttpProxyForWebDAVMk2Test() +{ +super( "[3.3.9)" ); +} + +public void setUp() +throws Exception +{ +Handler handler = new AbstractHandler() +{ +public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) +throws IOException, ServletException +{ +System.out.println( "Got request for URL: '" + request.getRequestURL() + "'" ); +System.out.flush(); + +response.setContentType( "text/plain" ); + +System.out.println( "Checking for 'Proxy-Connection' header..." ); +
maven git commit: [MNG-3599] Test the new version of the integration tests
Repository: maven Updated Branches: refs/heads/mng-3599 [created] c41459950 [MNG-3599] Test the new version of the integration tests Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c4145995 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c4145995 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c4145995 Branch: refs/heads/mng-3599 Commit: c4145995049cc51928216c7253b01bb8731ba270 Parents: e51fc87 Author: Stephen Connolly Authored: Wed Jan 11 09:51:14 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 09:51:14 2017 + -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/c4145995/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 755ecb5..4800896 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))]) -def itBranch='master' +def itBranch='mng-3599' try { node('ubuntu') {
maven-integration-testing git commit: [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/mng-3599 c530dd828 -> 050461304 (forced update) [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/05046130 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/05046130 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/05046130 Branch: refs/heads/mng-3599 Commit: 0504613046e27323d9ebec325d0c05ca5c082183 Parents: f31241a Author: Stephen Connolly Authored: Wed Jan 11 09:50:08 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 10:23:07 2017 + -- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...enITmng3599useHttpProxyForWebDAVMk2Test.java | 212 +++ ...MavenITmng3599useHttpProxyForWebDAVTest.java | 4 +- .../test/resources/bootstrap/group-7/pom.xml| 50 + .../src/test/resources/bootstrap/pom.xml| 1 + .../src/test/resources/mng-3599-mk2/pom.xml | 23 ++ .../mng-3599-mk2/settings-template.xml | 18 ++ 7 files changed, 307 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/05046130/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 48051c9..5536620 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -461,6 +461,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3607ClassLoadersUseValidUrlsTest.class ); suite.addTestSuite( MavenITmng3600DeploymentModeDefaultsTest.class ); suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVTest.class ); +suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVMk2Test.class ); suite.addTestSuite( MavenITmng3586SystemScopePluginDependencyTest.class ); suite.addTestSuite( MavenITmng3581PluginUsesWagonDependencyTest.class ); suite.addTestSuite( MavenITmng3575HexadecimalOctalPluginParameterConfigTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/05046130/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java new file mode 100644 index 000..d77a78f --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -0,0 +1,212 @@ +package org.apache.maven.it; + +/* + * 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.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.io.FileUtils; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.Request; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-3599";>MNG-3599. + * + * @author Brett Porter + * @author John Casey + * @version $Id$ + */ +public class MavenITmng3599useHttpProxyForWebDAVMk2Test +extends AbstractMavenIntegrationTestCase +{ +private static final String LS = System.getProperty( "line.separator" ); + +private Server server; + +
maven-integration-testing git commit: [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon [Forced Update!]
Repository: maven-integration-testing Updated Branches: refs/heads/mng-3599 050461304 -> 03c07e10b (forced update) [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/03c07e10 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/03c07e10 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/03c07e10 Branch: refs/heads/mng-3599 Commit: 03c07e10b70e1acaa8bb5e61dbd52f2d965f60b8 Parents: f31241a Author: Stephen Connolly Authored: Wed Jan 11 09:50:08 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 11:25:31 2017 + -- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...enITmng3599useHttpProxyForWebDAVMk2Test.java | 212 +++ ...MavenITmng3599useHttpProxyForWebDAVTest.java | 4 +- .../test/resources/bootstrap/group-7/pom.xml| 50 + .../src/test/resources/bootstrap/pom.xml| 1 + .../src/test/resources/mng-3599-mk2/pom.xml | 23 ++ .../mng-3599-mk2/settings-template.xml | 18 ++ 7 files changed, 307 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/03c07e10/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 48051c9..5536620 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -461,6 +461,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3607ClassLoadersUseValidUrlsTest.class ); suite.addTestSuite( MavenITmng3600DeploymentModeDefaultsTest.class ); suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVTest.class ); +suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVMk2Test.class ); suite.addTestSuite( MavenITmng3586SystemScopePluginDependencyTest.class ); suite.addTestSuite( MavenITmng3581PluginUsesWagonDependencyTest.class ); suite.addTestSuite( MavenITmng3575HexadecimalOctalPluginParameterConfigTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/03c07e10/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java new file mode 100644 index 000..6e9954b --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -0,0 +1,212 @@ +package org.apache.maven.it; + +/* + * 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.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.io.FileUtils; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.Request; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-3599";>MNG-3599. + * + * @author Brett Porter + * @author John Casey + * @version $Id$ + */ +public class MavenITmng3599useHttpProxyForWebDAVMk2Test +extends AbstractMavenIntegrationTestCase +{ +private static final String LS = System.getProperty( "line.separator" ); + +private Server server; + +
maven-integration-testing git commit: [MNG-3599] Need to use --legacy-local-repository on newer maven versions
Repository: maven-integration-testing Updated Branches: refs/heads/mng-3599 03c07e10b -> a27d19f88 [MNG-3599] Need to use --legacy-local-repository on newer maven versions Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/a27d19f8 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a27d19f8 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a27d19f8 Branch: refs/heads/mng-3599 Commit: a27d19f88684cd5cf66f39df7c2f87ab9606d70e Parents: 03c07e1 Author: Stephen Connolly Authored: Wed Jan 11 13:57:02 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 13:57:02 2017 + -- .../maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a27d19f8/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index 6e9954b..45f9647 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -152,6 +152,7 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test verifier = newVerifier( testDir.getAbsolutePath() ); +verifier.addCliOption( "--legacy-local-repository" ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.addCliOption( "-X" ); @@ -194,6 +195,7 @@ public class MavenITmng3599useHttpProxyForWebDAVMk2Test verifier = newVerifier( testDir.getAbsolutePath() ); +verifier.addCliOption("--legacy-local-repository"); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.addCliOption( "-X" );
maven-integration-testing git commit: [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon
Repository: maven-integration-testing Updated Branches: refs/heads/master f31241ad6 -> ad98af7e7 [MNG-3599] The upgrade of Wagon to 2.10 breaks the test using older versions of wagon - Need to use `--legacy-local-repository` on newer maven versions (noting workaround as MNG-6155) Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/ad98af7e Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ad98af7e Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ad98af7e Branch: refs/heads/master Commit: ad98af7e77d4d392f9c3f96656959f1957923082 Parents: f31241a Author: Stephen Connolly Authored: Wed Jan 11 09:50:08 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 20:10:26 2017 + -- .../apache/maven/it/IntegrationTestSuite.java | 1 + ...enITmng3599useHttpProxyForWebDAVMk2Test.java | 214 +++ ...MavenITmng3599useHttpProxyForWebDAVTest.java | 4 +- .../test/resources/bootstrap/group-7/pom.xml| 50 + .../src/test/resources/bootstrap/pom.xml| 1 + .../src/test/resources/mng-3599-mk2/pom.xml | 23 ++ .../mng-3599-mk2/settings-template.xml | 18 ++ 7 files changed, 309 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ad98af7e/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 48051c9..5536620 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -461,6 +461,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3607ClassLoadersUseValidUrlsTest.class ); suite.addTestSuite( MavenITmng3600DeploymentModeDefaultsTest.class ); suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVTest.class ); +suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVMk2Test.class ); suite.addTestSuite( MavenITmng3586SystemScopePluginDependencyTest.class ); suite.addTestSuite( MavenITmng3581PluginUsesWagonDependencyTest.class ); suite.addTestSuite( MavenITmng3575HexadecimalOctalPluginParameterConfigTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ad98af7e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java new file mode 100644 index 000..0377348 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -0,0 +1,214 @@ +package org.apache.maven.it; + +/* + * 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.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.io.FileUtils; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.Request; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-3599";>MNG-3599. + * + * @author Brett Porter + * @author John Casey + * @version $Id$ + */ +public class MavenITmng3599useHttpProxyForWebDAVMk2Test +extends AbstractMavenIntegrationTestCase +{ +private static final String LS
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/mng-3599 [deleted] c41459950
[maven-integration-testing] Git Push Summary
Repository: maven-integration-testing Updated Branches: refs/heads/mng-3599 [deleted] a27d19f88
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/post-reset-master [deleted] b7da2374e
maven git commit: help infra test win-2012-2
Repository: maven Updated Branches: refs/heads/win2012-2 [created] b0ad0737b help infra test win-2012-2 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b0ad0737 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b0ad0737 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b0ad0737 Branch: refs/heads/win2012-2 Commit: b0ad0737b26c49cb18300709284fc42ed614365b Parents: e51fc87 Author: Stephen Connolly Authored: Wed Jan 11 20:36:52 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 20:36:52 2017 + -- Jenkinsfile | 61 1 file changed, 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/b0ad0737/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 755ecb5..e16fb38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,41 +44,6 @@ node('ubuntu') { } stage 'Integration Test' -parallel linuxJava7:{ -node('ubuntu') { -def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', 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" -dir('test') { -def WORK_DIR=pwd() - git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', branch: itBranch) -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" -} -junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' -} -} -},linuxJava8: { -node('ubuntu') { -def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', 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" -dir('test') { -def WORK_DIR=pwd() - git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', branch: itBranch) -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" -} -junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' -} -} -}, winJava7: { node('windows-2012-1') { def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J7) { @@ -103,32 +68,6 @@ parallel linuxJava7:{ junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' } } -}, winJava8: { -node('windows-2012-1') { -def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', 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 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK' -dir(JAVA_WIN_J8) { -JAVA_WIN_J8=pwd() -} -echo "Running integration tests with Java $JAVA_WIN_J8" -dir('test') { -def WORK_DIR=pwd() - git(url:'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', branch: itBranch) -bat "if exist it-local-repo rmdir /s /q it-local-repo" -bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip" - withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin","JAVA_HOME=$JAVA_WIN_J8"]) { -bat "set" -unstash 'dist' -bat "
maven git commit: help infra test win-2012-2
Repository: maven Updated Branches: refs/heads/win2012-2 b0ad0737b -> 5e452d020 help infra test win-2012-2 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5e452d02 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5e452d02 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5e452d02 Branch: refs/heads/win2012-2 Commit: 5e452d02070e2c2d38a886dc0a88e8eb8bf1af1c Parents: b0ad073 Author: Stephen Connolly Authored: Wed Jan 11 20:41:10 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 20:41:10 2017 + -- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/5e452d02/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index e16fb38..ae693aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ node('ubuntu') { } stage 'Integration Test' -node('windows-2012-1') { +node('windows-2012-2') { def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J7) { MAVEN_WIN_J7=pwd() @@ -63,7 +63,6 @@ stage 'Integration Test' 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" } junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml' }
svn commit: r1778347 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/main/java/org/apache/maven/plugin/compiler/ src/test/java/org/apache/maven/plugin/compiler/
Author: rfscholte Date: Wed Jan 11 20:47:29 2017 New Revision: 1778347 URL: http://svn.apache.org/viewvc?rev=1778347&view=rev Log: MCOMPILER-285: Support test-compile for JDK 9 build b148+ Introduce QDoxModuleInfoParser to have a fallback if ASM fails Added: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java.bak maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/QDoxModuleInfoParser.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1778347&r1=1778346&r2=1778347&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Wed Jan 11 20:47:29 2017 @@ -114,6 +114,11 @@ under the License. asm 6.0_ALPHA + + com.thoughtworks.qdox + qdox + 2.0-M5 + org.codehaus.plexus @@ -216,6 +221,21 @@ under the License. + + +org.codehaus.plexus +plexus-component-metadata +1.7 + + +descriptors + + generate-metadata + + + + + Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java?rev=1778347&r1=1778346&r2=1778347&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java Wed Jan 11 20:47:29 2017 @@ -27,17 +27,25 @@ import java.io.InputStream; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import org.codehaus.plexus.component.annotations.Component; import org.objectweb.asm.ClassReader; /** * Extract information from module with ASM * * @author Robert Scholte - * @since 3.5 + * @since 3.6 */ +@Component( role = ModuleInfoParser.class, hint = "asm" ) public class AsmModuleInfoParser implements ModuleInfoParser { @Override +public Type getType() +{ +return Type.CLASS; +} + +@Override public String getModuleName( File modulePath ) throws IOException { Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java?rev=1778347&r1=1778346&r2=1778347&view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java Wed Jan 11 20:47:29 2017 @@ -23,14 +23,35 @@ import java.io.File; import java.io.IOException; /** - * Extract information from module + * Extract information from the module-info file * * @author Robert Scholte - * @since 3.5 + * @since 3.6.0 */ public interface ModuleInfoParser { +/** + * Defines the type of parser, i.e. using the source or the class files + */ +public enum Type +{ +SOURCE, CLASS +} +/** + * What kind of file does the parser use + * + * @return the type + */ +Type getType(); + +/** + * Extracts the name from the module-info file + * + * @param modulePath + * @return + * @throws IOException + */ String getModuleName( File modulePath ) throws IOException; Added: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java.bak URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java.bak?rev=1778347&view=auto =
maven git commit: [INFRA-13307] Now we can build on either Windows node
Repository: maven Updated Branches: refs/heads/master e51fc8727 -> a83296d79 [INFRA-13307] Now we can build on either Windows node Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a83296d7 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a83296d7 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a83296d7 Branch: refs/heads/master Commit: a83296d795536f43fe38fa277752003ca15ada53 Parents: e51fc87 Author: Stephen Connolly Authored: Wed Jan 11 23:11:15 2017 + Committer: Stephen Connolly Committed: Wed Jan 11 23:11:15 2017 + -- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/a83296d7/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 755ecb5..07ce2e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,7 +79,7 @@ parallel linuxJava7:{ } } }, winJava7: { -node('windows-2012-1') { +node('Windows') { def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J7) { MAVEN_WIN_J7=pwd() @@ -104,7 +104,7 @@ parallel linuxJava7:{ } } }, winJava8: { -node('windows-2012-1') { +node('Windows') { def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation' dir(MAVEN_WIN_J8) { MAVEN_WIN_J8=pwd()
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/win2012-2 [deleted] 5e452d020
svn commit: r1778362 - in /maven/plugin-tools/trunk: ./ maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/ maven-plugin-tools-java/src/test/resources/MPLUGIN-314/ m
Author: gboue Date: Thu Jan 12 00:07:08 2017 New Revision: 1778362 URL: http://svn.apache.org/viewvc?rev=1778362&view=rev Log: [MPLUGIN-314] invalid requirement role generated in plugin.xml [MPLUGIN-320] JavaJavadocMojoDescriptorExtractor fails with Java 8 lambdas. Updating QDox to 2.0-M5, containing the fixes for both of those issues (see QDOX-13 and QDOX-15). Added: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/ maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java (with props) maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/plugin-expected.xml (with props) maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/ maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/Exceptions.java (with props) maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/plugin-expected.xml (with props) Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java?rev=1778362&r1=1778361&r2=1778362&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java Thu Jan 12 00:07:08 2017 @@ -233,4 +233,20 @@ public class JavaMojoDescriptorExtractor assertEquals( 1, results.size() ); } +public void testSingleTypeImportWithFullyQualifiedClassName() +throws Exception +{ +List results = extract( "MPLUGIN-314" ); + +assertEquals( 1, results.size() ); +} + +public void testMethodReferenceInEnumConstructor() +throws Exception +{ +List results = extract( "MPLUGIN-320" ); + +assertNull( results ); +} + } Added: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java?rev=1778362&view=auto == --- maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java (added) +++ maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java Thu Jan 12 00:07:08 2017 @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.artifact.resolver.ArtifactResolver; +import org.apache.maven.plugin.AbstractMojo; + +/** + * Tests that using an import and the same fully qualified class name results in a correct requirement role generated. + * + * @goal test + */ +public class MyMojo +extends AbstractMojo +{ + +/** + * @component + */ +private org.apache.maven.artifact.resolver.ArtifactResolver resolver; + +public void execute() +{ +} + +} Propchange: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java -- svn:eol-style = native Propchange: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java -- svn:keywords = Author Date Id Revision Added: maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/plugin-expected.xml URL: http://svn.apache.org/viewvc/mave
svn commit: r1778360 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties
Author: gboue Date: Thu Jan 12 00:06:37 2017 New Revision: 1778360 URL: http://svn.apache.org/viewvc?rev=1778360&view=rev Log: [MPLUGIN-319] @since values ignored in report The IT relies on reading the generated HTML site for the test mojo in English, but the report is written in the default locale of the JVM. As such, it fails when run on machines with a locale different than English. Therefore, the locale needs to be forced to English in the MAVEN_OPTS. Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties?rev=1778360&r1=1778359&r2=1778360&view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties Thu Jan 12 00:06:37 2017 @@ -16,3 +16,4 @@ # under the License. invoker.goals = clean plugin:report +invoker.mavenOpts = -Duser.language=en -Duser.country=US -Duser.variant=US
svn commit: r1778361 - in /maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations: TestAnnotationsReader.java scanner/DefaultMojoAnno
Author: gboue Date: Thu Jan 12 00:06:50 2017 New Revision: 1778361 URL: http://svn.apache.org/viewvc?rev=1778361&view=rev Log: Updating the unit tests so that they can be run successfully directly inside Eclipse: this means fixing the location of the basedir by extending from PlexusTestCase and using the getBasedir() method. Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java?rev=1778361&r1=1778360&r2=1778361&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java Thu Jan 12 00:06:50 2017 @@ -50,7 +50,7 @@ public class TestAnnotationsReader MojoAnnotationsScanner mojoAnnotationsScanner = (MojoAnnotationsScanner) lookup( MojoAnnotationsScanner.ROLE ); MojoAnnotationsScannerRequest request = new MojoAnnotationsScannerRequest(); -request.setClassesDirectories( Collections.singletonList( new File( "target/test-classes" ) ) ); +request.setClassesDirectories( Collections.singletonList( new File( getBasedir(), "target/test-classes" ) ) ); request.setIncludePatterns( Arrays.asList( "**/FooMojo.class" ) ); request.setProject( new MavenProject() ); Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java?rev=1778361&r1=1778360&r2=1778361&view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java Thu Jan 12 00:06:50 2017 @@ -23,17 +23,17 @@ import static org.easymock.EasyMock.*; import java.io.File; +import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; -import junit.framework.TestCase; public class DefaultMojoAnnotationsScannerTest -extends TestCase +extends PlexusTestCase { private DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner(); public void testSkipModuleInfoClassInArchive() throws Exception { -scanner.scanArchive( new File( "src/test/resources/java9-module.jar"), null, false ); +scanner.scanArchive( new File( getBasedir(), "target/test-classes/java9-module.jar"), null, false ); } public void testJava8Annotations() throws Exception @@ -42,7 +42,7 @@ public class DefaultMojoAnnotationsScann expect( logger.isDebugEnabled() ).andReturn( false ); replay( logger ); scanner.enableLogging( logger ); -scanner.scanArchive( new File( "src/test/resources/java8-annotations.jar"), null, false ); +scanner.scanArchive( new File( getBasedir(), "target/test-classes/java8-annotations.jar"), null, false ); } }