-
Notifications
You must be signed in to change notification settings - Fork 541
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SUREFIRE-1564] Can't override platform version through project/plugi…
…n dependencies
- Loading branch information
Showing
24 changed files
with
786 additions
and
521 deletions.
There are no files selected for viewing
220 changes: 91 additions & 129 deletions
220
...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package org.apache.maven.plugin.surefire; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.apache.maven.artifact.Artifact; | ||
| import org.apache.maven.surefire.booter.Classpath; | ||
| import org.codehaus.plexus.logging.Logger; | ||
|
|
||
| import java.io.File; | ||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import static java.util.Collections.addAll; | ||
| import static org.apache.maven.shared.utils.StringUtils.split; | ||
|
|
||
| final class TestClassPath | ||
| { | ||
| private final Iterable<Artifact> artifacts; | ||
| private final File classesDirectory; | ||
| private final File testClassesDirectory; | ||
| private final String[] additionalClasspathElements; | ||
| private final Logger logger; | ||
|
|
||
| TestClassPath( Iterable<Artifact> artifacts, | ||
| File classesDirectory, | ||
| File testClassesDirectory, | ||
| String[] additionalClasspathElements, | ||
| Logger logger ) | ||
| { | ||
| this.artifacts = artifacts; | ||
| this.classesDirectory = classesDirectory; | ||
| this.testClassesDirectory = testClassesDirectory; | ||
| this.additionalClasspathElements = additionalClasspathElements; | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| void avoidArtifactDuplicates( Set<Artifact> providerArtifacts ) | ||
| { | ||
| for ( Artifact artifact : artifacts ) | ||
| { | ||
| Iterator<Artifact> it = providerArtifacts.iterator(); | ||
| while ( it.hasNext() ) | ||
| { | ||
| Artifact providerArtifact = it.next(); | ||
| String classifier1 = providerArtifact.getClassifier(); | ||
| String classifier2 = artifact.getClassifier(); | ||
| if ( providerArtifact.getGroupId().equals( artifact.getGroupId() ) | ||
| && providerArtifact.getArtifactId().equals( artifact.getArtifactId() ) | ||
| && providerArtifact.getType().equals( artifact.getType() ) | ||
| && ( classifier1 == null ? classifier2 == null : classifier1.equals( classifier2 ) ) ) | ||
| { | ||
| it.remove(); | ||
| if ( logger.isDebugEnabled() ) | ||
| { | ||
| logger.debug( "Removed artifact " + providerArtifact + " from provider. " | ||
| + "Already appears in test classpath." ); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Classpath toClasspath() | ||
| { | ||
| List<String> classpath = new ArrayList<String>(); | ||
| classpath.add( testClassesDirectory.getAbsolutePath() ); | ||
| classpath.add( classesDirectory.getAbsolutePath() ); | ||
| for ( Artifact artifact : artifacts ) | ||
| { | ||
| if ( artifact.getArtifactHandler().isAddedToClasspath() ) | ||
| { | ||
| File file = artifact.getFile(); | ||
| if ( file != null ) | ||
| { | ||
| classpath.add( file.getAbsolutePath() ); | ||
| } | ||
| } | ||
| } | ||
| if ( additionalClasspathElements != null ) | ||
| { | ||
| for ( String additionalClasspathElement : additionalClasspathElements ) | ||
| { | ||
| if ( additionalClasspathElement != null ) | ||
| { | ||
| addAll( classpath, split( additionalClasspathElement, "," ) ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return new Classpath( classpath ); | ||
| } | ||
| } |
Oops, something went wrong.