Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trim trailing whitespace

This commit is contained in:
Michael Osipov 2020-12-24 19:09:10 +01:00
parent 8c9c303f9c
commit 673a7d1fef
176 changed files with 870 additions and 871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-maven/maven-wrapper.pom
View File

@ -26,10 +26,10 @@ under the License.
<artifactId>maven</artifactId>
<version>4.0.0-alpha-1-SNAPSHOT</version>
</parent>
<artifactId>apache-maven-wrapper</artifactId>
<packaging>pom</packaging>
<name>Apache Maven Wrapper Distribution</name>
<description>The Apache Maven Wrapper distribution in zip and tar.gz formats.</description>
@ -89,7 +89,7 @@ under the License.
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@ -97,7 +97,7 @@ under the License.
<version>${project.version}</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>apache-release</id>

2
apache-maven/src/assembly/maven/component.xml
View File

@ -101,7 +101,7 @@ under the License.
<outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
<sources>

40
apache-maven/src/assembly/maven/conf/toolchains.xml
View File

@ -44,24 +44,24 @@ under the License.
<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
<!--
| With toolchains you can refer to installations on your system. This
| way you don't have to hardcode paths in your pom.xml.
|
| Every toolchain consist of 3 elements:
| * type: the type of tool. An often used value is 'jdk'. Toolchains-aware
| plugins should document which type you must use.
|
| * provides: A list of key/value-pairs.
| Based on the toolchain-configuration in the pom.xml Maven will search for
| matching <provides/> configuration. You can decide for yourself which key-value
| pairs to use. Often used keys are 'version', 'vendor' and 'arch'. By default
| the version has a special meaning. If you configured in the pom.xml '1.5'
<!--
| With toolchains you can refer to installations on your system. This
| way you don't have to hardcode paths in your pom.xml.
|
| Every toolchain consist of 3 elements:
| * type: the type of tool. An often used value is 'jdk'. Toolchains-aware
| plugins should document which type you must use.
|
| * provides: A list of key/value-pairs.
| Based on the toolchain-configuration in the pom.xml Maven will search for
| matching <provides/> configuration. You can decide for yourself which key-value
| pairs to use. Often used keys are 'version', 'vendor' and 'arch'. By default
| the version has a special meaning. If you configured in the pom.xml '1.5'
| Maven will search for 1.5 and above.
|
|
| * configuration: Additional configuration for this tool.
| Look for documentation of the toolchains-aware plugin which configuration elements
| can be used.
| can be used.
|
| See also https://maven.apache.org/guides/mini/guide-using-toolchains.html
|
@ -69,12 +69,12 @@ under the License.
<toolchain>
<type/>
<provides>
<version>1.0</version>
</provides>
<provides>
<version>1.0</version>
</provides>
<configuration/>
</toolchain>
| JDK examples
<toolchain>
@ -97,7 +97,7 @@ under the License.
<jdkHome>/path/to/jdk/1.6</jdkHome>
</configuration>
</toolchain>
-->
</toolchains>

2
apache-maven/src/assembly/wrapper/bin.xml
View File

@ -37,7 +37,7 @@ under the License.
<outputDirectory>.mvn/wrapper</outputDirectory>
<outputFileNameMapping>maven-wrapper.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</dependencySets>
<files>
<file>
<source>src/assembly/shared/mvnwDebug.cmd</source>

4
apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties vendored
View File

@ -5,9 +5,9 @@
# 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

10
apache-maven/src/assembly/wrapper/source/.mvn/wrapper/MavenWrapperDownloader.java vendored
View File

@ -62,7 +62,7 @@ public class MavenWrapperDownloader {
// If the maven-wrapper.properties exists, read it and check if it contains a custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = null;
String repoUrl = System.getenv( "MVNW_REPOURL" );
@ -70,20 +70,20 @@ public class MavenWrapperDownloader {
{
url = repoUrl + DEFAULT_DOWNLOAD_PATH;
}
else if ( mavenWrapperPropertyFile.exists() )
else if ( mavenWrapperPropertyFile.exists() )
{
Properties mavenWrapperProperties = new Properties();
try ( InputStream mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile ) )
try ( InputStream mavenWrapperPropertyFileInputStream = new FileInputStream( mavenWrapperPropertyFile ) )
{
mavenWrapperProperties.load( mavenWrapperPropertyFileInputStream );
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
}
}
catch ( IOException e )
{
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
}
}
if ( url == null )
{
url = "https://repo.maven.apache.org/maven2" + DEFAULT_DOWNLOAD_PATH;

16
apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
View File

@ -47,27 +47,27 @@ about.html in archive lib/org.eclipse.sisu.inject-0.3.4.jar
</head>
<body lang="EN-US">
<h2>About org.eclipse.sisu.inject</h2>
<p>November 5, 2013</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
<h3>Third Party Content</h3>
<p>The Content includes items that have been sourced from third parties as set
out below. If you did not receive this Content directly from the Eclipse Foundation,
the following is provided for informational purposes only, and you should look
<p>The Content includes items that have been sourced from third parties as set
out below. If you did not receive this Content directly from the Eclipse Foundation,
the following is provided for informational purposes only, and you should look
to the Redistributor's license for terms and conditions of use.</p>
<h4>ASM 4.1</h4>

56
apache-maven/src/main/appended-resources/licenses/CDDL-1.0.txt
View File

@ -17,12 +17,12 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modifications, in each case including portions thereof.
1.4. "Executable" means the Covered Software in any form
other than Source Code.
other than Source Code.
1.5. "Initial Developer" means the individual or entity
that first makes Original Software available under this
License.
License.
1.6. "Larger Work" means a work which combines Covered
Software or portions thereof with code not governed by the
terms of this License.
@ -33,29 +33,29 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
maximum extent possible, whether at the time of the initial
grant or subsequently acquired, any and all of the rights
conveyed herein.
1.9. "Modifications" means the Source Code and Executable
form of any of the following:
form of any of the following:
A. Any file that results from an addition to,
deletion from or modification of the contents of a
file containing Original Software or previous
Modifications;
Modifications;
B. Any new file that contains any part of the
Original Software or previous Modification; or
Original Software or previous Modification; or
C. Any new file that is contributed or otherwise made
available under the terms of this License.
1.10. "Original Software" means the Source Code and
Executable form of computer software code that is
originally released under this License.
originally released under this License.
1.11. "Patent Claims" means any patent claim(s), now owned
or hereafter acquired, including without limitation,
method, process, and apparatus claims, in any patent
Licensable by grantor.
Licensable by grantor.
1.12. "Source Code" means (a) the common form of computer
software code in which modifications are made and (b)
@ -72,40 +72,40 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
of more than fifty percent (50%) of the outstanding shares
or beneficial ownership of such entity.
2. License Grants.
2. License Grants.
2.1. The Initial Developer Grant.
Conditioned upon Your compliance with Section 3.1 below and
subject to third party intellectual property claims, the
Initial Developer hereby grants You a world-wide,
royalty-free, non-exclusive license:
royalty-free, non-exclusive license:
(a) under intellectual property rights (other than
patent or trademark) Licensable by Initial Developer,
to use, reproduce, modify, display, perform,
sublicense and distribute the Original Software (or
portions thereof), with or without Modifications,
and/or as part of a Larger Work; and
and/or as part of a Larger Work; and
(b) under Patent Claims infringed by the making,
using or selling of Original Software, to make, have
made, use, practice, sell, and offer for sale, and/or
otherwise dispose of the Original Software (or
portions thereof).
portions thereof).
(c) The licenses granted in Sections 2.1(a) and (b)
are effective on the date Initial Developer first
distributes or otherwise makes the Original Software
available to a third party under the terms of this
License.
License.
(d) Notwithstanding Section 2.1(b) above, no patent
license is granted: (1) for code that You delete from
the Original Software, or (2) for infringements
caused by: (i) the modification of the Original
Software, or (ii) the combination of the Original
Software with other software or devices.
Software with other software or devices.
2.2. Contributor Grant.
@ -121,7 +121,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Contributor (or portions thereof), either on an
unmodified basis, with other Modifications, as
Covered Software and/or as part of a Larger Work; and
(b) under Patent Claims infringed by the making,
using, or selling of Modifications made by that
@ -132,12 +132,12 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modifications made by that Contributor (or portions
thereof); and (2) the combination of Modifications
made by that Contributor with its Contributor Version
(or portions of such combination).
(or portions of such combination).
(c) The licenses granted in Sections 2.2(a) and
2.2(b) are effective on the date Contributor first
distributes or otherwise makes the Modifications
available to a third party.
available to a third party.
(d) Notwithstanding Section 2.2(b) above, no patent
license is granted: (1) for any code that Contributor
@ -148,7 +148,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
with other software (except as part of the
Contributor Version) or other devices; or (3) under
Patent Claims infringed by Covered Software in the
absence of Modifications made by that Contributor.
absence of Modifications made by that Contributor.
3. Distribution Obligations.
@ -199,7 +199,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Developer and every Contributor for any liability incurred
by the Initial Developer or such Contributor as a result of
warranty, support, indemnity or liability terms You offer.
3.5. Distribution of Executable Versions.
@ -226,9 +226,9 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
with other code not governed by the terms of this License
and distribute the Larger Work as a single product. In such
a case, You must make sure the requirements of this License
are fulfilled for the Covered Software.
4. Versions of the License.
are fulfilled for the Covered Software.
4. Versions of the License.
4.1. New Versions.
@ -237,7 +237,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
from time to time. Each version will be given a
distinguishing version number. Except as provided in
Section 4.3, no one other than the license steward has the
right to modify this License.
right to modify this License.
4.2. Effect of New Versions.
@ -253,7 +253,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
the Covered Software. Otherwise, You may also choose to
use, distribute or otherwise make the Covered Software
available under the terms of any subsequent version of the
License published by the license steward.
License published by the license steward.
4.3. Modified Versions.
@ -264,7 +264,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
license steward (except to note that the license differs
from this License); and (b) otherwise make it clear that
the license contains terms which differ from this License.
5. DISCLAIMER OF WARRANTY.
@ -279,9 +279,9 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
DISCLAIMER.
DISCLAIMER.
6. TERMINATION.
6. TERMINATION.
6.1. This License and the rights granted hereunder will
terminate automatically if You fail to comply with terms

4
maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
View File

@ -25,7 +25,7 @@ package org.apache.maven.artifact.handler;
* <li>information on how to use the artifact: whether to add it to the classpath, or to take into account its
* dependencies.</li>
* </ul>
*
*
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
public interface ArtifactHandler
@ -43,7 +43,7 @@ public interface ArtifactHandler
/**
* Get the classifier associated to the dependency type.
*
*
* @return the classifier
*/
String getClassifier();

2
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
View File

@ -238,7 +238,7 @@ public class DefaultArtifactVersion
}
catch ( NumberFormatException e )
{
// should never happen since checked isDigits(s) before
// should never happen since checked isDigits(s) before
return null;
}
}

2
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
View File

@ -64,7 +64,7 @@ public class VersionRange
}
/**
* @deprecated VersionRange is immutable, cloning is not useful and even more an issue against the cache
* @deprecated VersionRange is immutable, cloning is not useful and even more an issue against the cache
* @return a clone
*/
@Deprecated

6
maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
View File

@ -52,10 +52,10 @@ public class ComparableVersionIT
if ( mavenArtifactJar.matcher( filename ).matches() )
{
Process p = Runtime.getRuntime().exec( new String[] {
Paths.get( System.getProperty( "java.home" ), "bin/java" ).toString(),
Paths.get( System.getProperty( "java.home" ), "bin/java" ).toString(),
"-jar",
file.toAbsolutePath().toString(),
"5.32",
file.toAbsolutePath().toString(),
"5.32",
"5.27" } );
try

2
maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java
View File

@ -35,7 +35,7 @@ public class FileSource
{
private final File file;
private final int hashCode;
private final int hashCode;
/**
* Creates a new source backed by the specified file.

8
maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java
View File

@ -41,17 +41,17 @@ public interface ProblemCollector
* @param cause The cause of the problem, may be {@code null}.
*/
void add( Problem.Severity severity, String message, int line, int column, Exception cause );
/**
* The next messages will be bound to this source. When calling this method again, previous messages keep
* their source, but the next messages will use the new source.
*
*
* @param source
*/
void setSource( String source );
/**
*
*
* @return the collected Problems, never {@code null}
*/
List<Problem> getProblems();

6
maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java
View File

@ -22,7 +22,7 @@ package org.apache.maven.building;
import java.util.List;
/**
*
*
* @author Robert Scholte
* @since 3.3.0
*/
@ -30,8 +30,8 @@ public class ProblemCollectorFactory
{
/**
* The default implementation is not visible, create it with this factory
*
* The default implementation is not visible, create it with this factory
*
* @param problems starting set of problems, may be {@code null}
* @return a new instance of a ProblemCollector
*/

2
maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java
View File

@ -99,7 +99,7 @@ public class StringSource
@Override
public boolean equals( Object obj )
{
if ( this == obj )
if ( this == obj )
{
return true;
}

8
maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
View File

@ -35,10 +35,10 @@ public class DefaultProblemCollectorTest
assertEquals( 0, collector.getProblems().size() );
collector.add( null, "MESSAGE1", -1, -1, null );
Exception e2 = new Exception();
collector.add( Severity.WARNING, null, 42, 127, e2 );
assertEquals( 2, collector.getProblems().size() );
Problem p1 = collector.getProblems().get(0);
@ -47,7 +47,7 @@ public class DefaultProblemCollectorTest
assertEquals( -1, p1.getLineNumber() );
assertEquals( -1, p1.getColumnNumber() );
assertEquals( null, p1.getException() );
Problem p2 = collector.getProblems().get(1);
assertEquals( Severity.WARNING, p2.getSeverity() );
assertEquals( "",p2.getMessage() );
@ -60,7 +60,7 @@ public class DefaultProblemCollectorTest
public void testSetSource()
{
DefaultProblemCollector collector = new DefaultProblemCollector( null );
collector.add( null, "PROBLEM1", -1, -1, null );
collector.setSource( "SOURCE_PROBLEM2" );

20
maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
View File

@ -36,14 +36,14 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, Severity.FATAL, null, -1, -1, null );
assertEquals( Severity.FATAL, problem.getSeverity() );
problem = new DefaultProblem( null, Severity.ERROR, null, -1, -1, null );
assertEquals( Severity.ERROR, problem.getSeverity() );
problem = new DefaultProblem( null, Severity.WARNING, null, -1, -1, null );
assertEquals( Severity.WARNING, problem.getSeverity() );
}
@Test
public void testGetLineNumber()
{
@ -52,7 +52,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, 42, -1, null );
assertEquals( 42, problem.getLineNumber() );
problem = new DefaultProblem( null, null, null, Integer.MAX_VALUE, -1, null );
assertEquals( Integer.MAX_VALUE, problem.getLineNumber() );
@ -60,7 +60,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, Integer.MIN_VALUE, -1, null );
assertEquals( Integer.MIN_VALUE, problem.getLineNumber() );
}
@Test
public void testGetColumnNumber()
{
@ -69,7 +69,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, -1, 42, null );
assertEquals( 42, problem.getColumnNumber() );
problem = new DefaultProblem( null, null, null, -1, Integer.MAX_VALUE, null );
assertEquals( Integer.MAX_VALUE, problem.getColumnNumber() );
@ -77,13 +77,13 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, null, -1, Integer.MIN_VALUE, null );
assertEquals( Integer.MIN_VALUE, problem.getColumnNumber() );
}
@Test
public void testGetException()
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( null, problem.getException() );
Exception e = new Exception();
problem = new DefaultProblem( null, null, null, -1, -1, e );
assertSame( e, problem.getException() );
@ -94,7 +94,7 @@ public class DefaultProblemTest
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( "", problem.getSource() );
problem = new DefaultProblem( null, null, "", -1, -1, null );
assertEquals( "", problem.getSource() );
@ -107,7 +107,7 @@ public class DefaultProblemTest
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( "", problem.getLocation() );
problem = new DefaultProblem( null, null, "SOURCE", -1, -1, null );
assertEquals( "SOURCE", problem.getLocation() );
@ -120,7 +120,7 @@ public class DefaultProblemTest
problem = new DefaultProblem( null, null, "SOURCE", 42, 127, null );
assertEquals( "SOURCE, line 42, column 127", problem.getLocation() );
}
@Test
public void testGetMessage()
{

4
maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
View File

@ -33,10 +33,10 @@ public class ProblemCollectorFactoryTest
public void testNewInstance()
{
ProblemCollector collector1 = ProblemCollectorFactory.newInstance( null );
Problem problem = new DefaultProblem( "MESSAGE1", null, null, -1, -1, null );
ProblemCollector collector2 = ProblemCollectorFactory.newInstance( Collections.singletonList( problem ) );
assertNotSame( collector1, collector2 );
assertEquals( 0, collector1.getProblems().size() );
assertEquals( 1, collector2.getProblems().size() );

2
maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
View File

@ -440,7 +440,7 @@ public class DefaultWagonManager
}
catch ( ChecksumFailedException e )
{
// if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the
// if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the
// checksum doesn't match. This could be a problem with the server (ibiblio HTTP-200 error
// page), so we'll try this up to two times. On the second try, we'll handle it as a bona-fide
// error, based on the repository's checksum checking policy.

2
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
View File

@ -695,7 +695,7 @@ public class DefaultLegacyArtifactCollector
fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, nearest, farthestArtifact );
// previously we cloned the artifact, but it is more efficient to just update the artifactScope
// if problems are later discovered that the original object needs its original artifactScope value,
// if problems are later discovered that the original object needs its original artifactScope value,
// cloning may
// again be appropriate
nearestArtifact.setScope( farthestArtifact.getScope() );

2
maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom
View File

@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: Dummy Artifact</name>
<description>
</description>
<distributionManagement>

2
maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom
View File

@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: Dummy Artifact</name>
<description>
</description>
<distributionManagement>

4
maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom
View File

@ -4,13 +4,13 @@
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
<scm>
<connection>scm:svn:http://host/p0</connection>
<developerConnection>scm:svn:https://host/p0</developerConnection>
<url>http://host/viewer?path=/p0</url>
</scm>
<modules>
<module>modules/p1</module>
</modules>

2
maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom
View File

@ -7,5 +7,5 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>p1</artifactId>
</project>

4
maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
View File

@ -30,7 +30,7 @@ public interface ArtifactFilterManager
{
/**
* Returns a filter for core + extension artifacts.
*
*
* @deprecated use {@code META-INF/maven/extension.xml} to define artifacts exported by Maven core and plugin
* extensions.
*/
@ -43,7 +43,7 @@ public interface ArtifactFilterManager
/**
* Exclude an extension artifact (doesn't affect getArtifactFilter's result, only getExtensionArtifactFilter).
*
*
* @deprecated use {@code META-INF/maven/extension.xml} to define artifacts exported by Maven core and plugin
* extensions.
*/

2
maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
View File

@ -135,7 +135,7 @@ public class DefaultProjectDependenciesResolver
if ( ! exclusions.isEmpty() )
{
filter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{
filter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{
new ExcludesArtifactFilter( exclusions ), scopeFilter } ) );
}
else

2
maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
View File

@ -31,7 +31,7 @@ public class ProjectCycleException
{
super( message );
}
public ProjectCycleException( String message, CycleDetectedException cause )
{
super( message, cause );

6
maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
View File

@ -382,7 +382,7 @@ public class RepositoryUtils
{
return false;
}
for ( Iterator<RemoteRepository> it1 = r1.iterator(), it2 = r2.iterator(); it1.hasNext(); )
{
if ( !repositoryEquals( it1.next(), it2.next() ) )
@ -390,7 +390,7 @@ public class RepositoryUtils
return false;
}
}
return true;
}
@ -428,7 +428,7 @@ public class RepositoryUtils
{
return true;
}
return Objects.equals( r1.getId(), r2.getId() ) && Objects.equals( r1.getUrl(), r2.getUrl() )
&& policyEquals( r1.getPolicy( false ), r2.getPolicy( false ) )
&& policyEquals( r1.getPolicy( true ), r2.getPolicy( true ) );

20
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -58,9 +58,9 @@ import org.codehaus.plexus.util.StringUtils;
public class DefaultMavenExecutionRequestPopulator
implements MavenExecutionRequestPopulator
{
private final MavenRepositorySystem repositorySystem;
@Inject
public DefaultMavenExecutionRequestPopulator( MavenRepositorySystem repositorySystem )
{
@ -90,7 +90,7 @@ public class DefaultMavenExecutionRequestPopulator
}
return request;
}
@Override
public MavenExecutionRequest populateDefaults( MavenExecutionRequest request )
throws MavenExecutionRequestPopulationException
@ -107,11 +107,11 @@ public class DefaultMavenExecutionRequestPopulator
return request;
}
//
//
//
private void populateDefaultPluginGroups( MavenExecutionRequest request )
{
request.addPluginGroup( "org.apache.maven.plugins" );
@ -211,10 +211,10 @@ public class DefaultMavenExecutionRequestPopulator
{
request.setBaseDirectory( request.getPom().getAbsoluteFile().getParentFile() );
}
}
}
/*if_not[MAVEN4]*/
@Override
@Deprecated
public MavenExecutionRequest populateFromSettings( MavenExecutionRequest request, Settings settings )
@ -316,8 +316,8 @@ public class DefaultMavenExecutionRequestPopulator
}
return request;
}
}
/*end[MAVEN4]*/
}

2
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java
View File

@ -54,7 +54,7 @@ public interface MavenExecutionRequestPopulator
throws MavenExecutionRequestPopulationException;
/*if_not[MAVEN4]*/
/**
* Copies the values from the given settings into the specified execution request. This method will replace any
* existing values in the execution request that are controlled by the settings. Hence, it is expected that this

28
maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View File

@ -273,7 +273,7 @@ public class MavenSession
{
this.projectMap = projectMap;
}
/** This is a provisional method and may be removed */
public List<MavenProject> getAllProjects()
{
@ -285,24 +285,24 @@ public class MavenSession
{
this.allProjects = allProjects;
}
/*if_not[MAVEN4]*/
//
// Deprecated
// Deprecated
//
private PlexusContainer container;
private PlexusContainer container;
private final Settings settings;
@Deprecated
/** @deprecated This appears not to be used anywhere within Maven itself. */
public Map<String, MavenProject> getProjectMap()
public Map<String, MavenProject> getProjectMap()
{
return projectMap;
}
@Deprecated
public MavenSession( PlexusContainer container, RepositorySystemSession repositorySession,
MavenExecutionRequest request, MavenExecutionResult result )
@ -313,7 +313,7 @@ public class MavenSession
this.settings = new SettingsAdapter( request );
this.repositorySession = repositorySession;
}
@Deprecated
public MavenSession( PlexusContainer container, MavenExecutionRequest request, MavenExecutionResult result,
MavenProject project )
@ -365,7 +365,7 @@ public class MavenSession
{
return getProjects();
}
@Deprecated
//
// Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave
@ -403,7 +403,7 @@ public class MavenSession
return executionProperties;
}
@Deprecated
public PlexusContainer getContainer()
{
@ -436,7 +436,7 @@ public class MavenSession
throws ComponentLookupException
{
return container.lookupMap( role );
}
}
/*end[MAVEN4]*/
}

2
maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
View File

@ -31,7 +31,7 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
/**
* Provides information about artifacts (identified by groupId:artifactId string key) and classpath elements exported by
* Maven core itself and loaded Maven core extensions.
*
*
* @since 3.3.0
*/
public class CoreExports

12
maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java
View File

@ -54,13 +54,13 @@ class ConsumerModelSourceTransformer extends AbstractModelSourceTransformer
return new DefaultConsumerPomXMLFilterFactory( new DefaultBuildPomXMLFilterFactory( context,
lexicalHandlerConsumer, true ) ).get( pomFile );
}
/**
* This transformer will ensure that encoding and version are kept.
* However, it cannot prevent:
* <ul>
* <li>attributes will be on one line</li>
* <li>Unnecessary whitespace before the rootelement will be removed</li>
* <li>Unnecessary whitespace before the rootelement will be removed</li>
* </ul>
*/
@Override
@ -68,9 +68,9 @@ class ConsumerModelSourceTransformer extends AbstractModelSourceTransformer
throws IOException, org.apache.maven.model.building.TransformerException
{
final TransformerHandler transformerHandler;
final SAXTransformerFactory transformerFactory = getTransformerFactory();
// Keep same encoding+version
try ( InputStream input = Files.newInputStream( pomFile ) )
{
@ -81,7 +81,7 @@ class ConsumerModelSourceTransformer extends AbstractModelSourceTransformer
final String encoding = streamReader.getCharacterEncodingScheme();
final String version = streamReader.getVersion();
Transformer transformer = transformerHandler.getTransformer();
transformer.setOutputProperty( OutputKeys.METHOD, "xml" );
if ( encoding == null && version == null )
@ -104,7 +104,7 @@ class ConsumerModelSourceTransformer extends AbstractModelSourceTransformer
}
catch ( XMLStreamException | TransformerConfigurationException e )
{
throw new org.apache.maven.model.building.TransformerException(
throw new org.apache.maven.model.building.TransformerException(
"Failed to detect XML encoding and version", e );
}
return transformerHandler;

16
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
View File

@ -70,7 +70,7 @@ public class DefaultLifecycles
/**
* Get lifecycle based on phase
*
*
* @param phase
* @return
*/
@ -121,22 +121,22 @@ public class DefaultLifecycles
public List<Lifecycle> getLifeCycles()
{
List<String> lifecycleIds = Arrays.asList( STANDARD_LIFECYCLES );
Comparator<String> comparator = ( l, r ) ->
Comparator<String> comparator = ( l, r ) ->
{
int lx = lifecycleIds.indexOf( l );
int rx = lifecycleIds.indexOf( r );
if ( lx < 0 || rx < 0 )
if ( lx < 0 || rx < 0 )
{
return rx - lx;
}
else
else
{
return lx - rx;
}
};
};
// ensure canonical order of standard lifecycles
return lifecyclesMap.values().stream()
.peek( l -> Objects.requireNonNull( l.getId(), "A lifecycle must have an id." ) )
@ -150,5 +150,5 @@ public class DefaultLifecycles
.flatMap( l -> l.getPhases().stream() )
.collect( Collectors.joining( ", " ) );
}
}

2
maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
View File

@ -72,7 +72,7 @@ public class Lifecycle
{
return defaultPhases;
}
@Deprecated
public Map<String, String> getDefaultPhases()
{

2
maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java
View File

@ -36,7 +36,7 @@ public interface MojoExecutionConfigurator
/**
* Create the MojoExecution configuration based on configuration for a Mojo in the MavenProject and the
* default configuration for the Mojo from the containing plugin's plugin.xml descriptor.
*
*
* @param project
* @param mojoExecution
* @param allowPluginLevelConfig

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
View File

@ -32,7 +32,7 @@ import org.apache.maven.project.MavenProject;
/**
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.0
* @author Kristian Rosenvold
*/

4
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
View File

@ -65,7 +65,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.0
* @author Benjamin Bentmann
* @author Kristian Rosenvold (Extract class)
@ -155,7 +155,7 @@ public class DefaultLifecycleExecutionPlanCalculator
LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
{
Set<MojoDescriptor> alreadyPlannedExecutions = fillMojoDescriptors( session, project, mojoExecutions );
for ( MojoExecution mojoExecution : mojoExecutions )
{
setupMojoExecution( session, project, mojoExecution, alreadyPlannedExecutions );

12
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
View File

@ -45,7 +45,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl
@ -153,13 +153,13 @@ public class DefaultLifecyclePluginAnalyzer
List<LifecycleMojo> mojos = goals.getMojos();
if ( mojos != null )
{
for ( int i = 0; i < mojos.size(); i++ )
{
LifecycleMojo mojo = mojos.get( i );
GoalSpec gs = parseGoalSpec( mojo.getGoal() );
if ( gs == null )
{
logger.warn( "Ignored invalid goal specification '" + mojo.getGoal()
@ -176,7 +176,7 @@ public class DefaultLifecyclePluginAnalyzer
plugin.setLocation( "groupId", location );
plugin.setLocation( "artifactId", location );
plugin.setLocation( "version", location );
Plugin existing = plugins.get( plugin );
if ( existing != null )
{
@ -191,7 +191,7 @@ public class DefaultLifecyclePluginAnalyzer
{
plugins.put( plugin, plugin );
}
PluginExecution execution = new PluginExecution();
execution.setId( getExecutionId( plugin, gs.goal ) );
execution.setPhase( phase );

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
View File

@ -31,7 +31,7 @@ import java.util.TreeSet;
* Context of dependency artifacts for a particular project.
* </p>
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.0
* @author Benjamin Bentmann
* @author Kristian Rosenvold (class extract only)

14
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
View File

@ -78,7 +78,7 @@ public class LifecycleDependencyResolver
@Inject
private EventSpyDispatcher eventSpyDispatcher;
@Inject
private ProjectArtifactsCache projectArtifactsCache;
@ -129,13 +129,13 @@ public class LifecycleDependencyResolver
throw new LifecycleExecutionException( e );
}
}
Set<Artifact> resolvedArtifacts;
ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey( project, scopesToCollect,
ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey( project, scopesToCollect,
scopesToResolve, aggregating, session.getRepositorySession() );
ProjectArtifactsCache.CacheRecord recordArtifacts;
recordArtifacts = projectArtifactsCache.get( cacheKey );
if ( recordArtifacts != null )
{
resolvedArtifacts = recordArtifacts.getArtifacts();
@ -167,7 +167,7 @@ public class LifecycleDependencyResolver
for ( Artifact artifact : resolvedArtifacts )
{
/**
* MNG-6300: resolvedArtifacts can be cache result; this ensures reactor files are always up to date
* MNG-6300: resolvedArtifacts can be cache result; this ensures reactor files are always up to date
* During lifecycle the Artifact.getFile() can change from target/classes to the actual jar.
* This clearly shows that target/classes should not be abused as artifactFile just for the classpath
*/
@ -179,9 +179,9 @@ public class LifecycleDependencyResolver
map.put( artifact.getDependencyConflictId(), artifact );
}
project.setResolvedArtifacts( resolvedArtifacts );
for ( Artifact artifact : project.getDependencyArtifacts() )
{
if ( artifact.getFile() == null )

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
View File

@ -42,7 +42,7 @@ import org.apache.maven.session.scope.internal.SessionScope;
* Builds one or more lifecycles for a full module
* </p>
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.0
* @author Benjamin Bentmann
* @author Jason van Zyl

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
View File

@ -68,7 +68,7 @@ public class LifecycleStarter
@Inject
private Map<String, Builder> builders;
@Inject
private SessionScope sessionScope;

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
View File

@ -30,7 +30,7 @@ import org.apache.maven.project.artifact.InvalidDependencyVersionException;
* Component interface responsible for creation of MavenProject#dependencyArtifacts instances.
* </p>
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.2.4
*/
public interface ProjectArtifactFactory

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java
View File

@ -27,7 +27,7 @@ import java.util.List;
* Describes the required task segment as provided on the maven command line; i.e. "clean jetty:run install"
*
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
*
* @since 3.0
* @author Benjamin Bentmann
* @author Kristian Rosenvold (extracted class only)

8
maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
View File

@ -140,18 +140,18 @@ public class BuilderCommon
logger.warn( "*****************************************************************" );
}
}
final String defaulModelId = DefaultLifecyclePluginAnalyzer.DEFAULTLIFECYCLEBINDINGS_MODELID;
List<String> unversionedPlugins = executionPlan.getMojoExecutions().stream()
.map( MojoExecution::getPlugin )
.filter( p -> p.getLocation( "version" ) != null ) // versionless cli goal (?)
.filter( p -> p.getLocation( "version" ).getSource() != null ) // versionless in pom (?)
.filter( p -> defaulModelId.equals( p.getLocation( "version" ).getSource().getModelId() ) )
.distinct()
.map( Plugin::getArtifactId ) // managed by us, groupId is always o.a.m.plugins
.map( Plugin::getArtifactId ) // managed by us, groupId is always o.a.m.plugins
.collect( Collectors.toList() );
if ( !unversionedPlugins.isEmpty() )
{
logger.warn( "Version not locked for default bindings plugins " + unversionedPlugins

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
View File

@ -36,7 +36,7 @@ import org.apache.maven.lifecycle.internal.ProjectSegment;
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
* This class in particular may spontaneously self-combust and be replaced by a plexus-compliant thread aware
* logger implementation at any time.
*
*
* @since 3.0
* @author Kristian Rosenvold
*/

2
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
View File

@ -110,7 +110,7 @@ public class DefaultLifecycleMapping
return null;
}
}
@Deprecated
public Map<String, String> getPhases( String lifecycle )
{

14
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
View File

@ -29,36 +29,36 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
*/
public class LifecycleMojo
{
private String goal;
private Xpp3Dom configuration;
private List<Dependency> dependencies;
public String getGoal()
{
return goal;
}
public Xpp3Dom getConfiguration()
{
return configuration;
}
public List<Dependency> getDependencies()
{
return dependencies;
}
public void setGoal( String goal )
{
this.goal = goal;
}
public void setConfiguration( Xpp3Dom configuration )
{
this.configuration = configuration;
}
public void setDependencies( List<Dependency> dependencies )
{
this.dependencies = dependencies;

26
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
View File

@ -32,36 +32,36 @@ import org.codehaus.plexus.util.StringUtils;
*/
public class LifecyclePhase
{
private List<LifecycleMojo> mojos;
public LifecyclePhase()
{
}
public LifecyclePhase( String goals )
{
set( goals );
}
public List<LifecycleMojo> getMojos()
{
return mojos;
}
public void setMojos( List<LifecycleMojo> mojos )
{
this.mojos = mojos;
}
public void set( String goals )
{
mojos = new ArrayList<>();
if ( StringUtils.isNotEmpty( goals ) )
{
String[] mojoGoals = StringUtils.split( goals, "," );
for ( String mojoGoal: mojoGoals )
{
LifecycleMojo lifecycleMojo = new LifecycleMojo();
@ -70,7 +70,7 @@ public class LifecyclePhase
}
}
}
@Override
public String toString()
{
@ -94,7 +94,7 @@ public class LifecyclePhase
}
return sb.toString();
}
@Deprecated
public static Map<String, String> toLegacyMap( Map<String, LifecyclePhase> lifecyclePhases )
{
@ -102,12 +102,12 @@ public class LifecyclePhase
{
return null;
}
if ( lifecyclePhases.isEmpty() )
{
return Collections.emptyMap();
}
Map<String, String> phases = new LinkedHashMap<>();
for ( Map.Entry<String, LifecyclePhase> e: lifecyclePhases.entrySet() )
{
@ -115,5 +115,5 @@ public class LifecyclePhase
}
return phases;
}
}

4
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
View File

@ -122,9 +122,9 @@ public class DefaultPluginArtifactsCache
CacheKey that = (CacheKey) o;
return CacheUtils.pluginEquals( plugin, that.plugin )
return CacheUtils.pluginEquals( plugin, that.plugin )
&& Objects.equals( workspace, that.workspace )
&& Objects.equals( localRepo, that.localRepo )
&& Objects.equals( localRepo, that.localRepo )
&& RepositoryUtils.repositoriesEquals( repositories, that.repositories )
&& Objects.equals( filter, that.filter );
}

4
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
View File

@ -197,9 +197,9 @@ public class DefaultPluginDescriptorCache
CacheKey that = (CacheKey) obj;
return Objects.equals( this.artifactId, that.artifactId )
return Objects.equals( this.artifactId, that.artifactId )
&& Objects.equals( this.groupId, that.groupId )
&& Objects.equals( this.version, that.version )
&& Objects.equals( this.version, that.version )
&& Objects.equals( this.localRepo, that.localRepo )
&& Objects.equals( this.workspace, that.workspace )
&& RepositoryUtils.repositoriesEquals( this.repositories, that.repositories );

6
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
View File

@ -135,11 +135,11 @@ public class DefaultPluginRealmCache
CacheKey that = (CacheKey) o;
return parentRealm == that.parentRealm
return parentRealm == that.parentRealm
&& CacheUtils.pluginEquals( plugin, that.plugin )
&& Objects.equals( workspace, that.workspace )
&& Objects.equals( workspace, that.workspace )
&& Objects.equals( localRepo, that.localRepo )
&& RepositoryUtils.repositoriesEquals( this.repositories, that.repositories )
&& RepositoryUtils.repositoriesEquals( this.repositories, that.repositories )
&& Objects.equals( filter, that.filter )
&& Objects.equals( foreignImports, that.foreignImports );
}

2
maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
View File

@ -95,7 +95,7 @@ public interface MavenPluginManager
/**
* Sets up class realm for the specified build extensions plugin.
*
*
* @since 3.3.0
*/
ExtensionRealmCache.CacheRecord setupExtensionsRealm( MavenProject project, Plugin plugin,

6
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -54,7 +54,7 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
* <tr><td><code>settings</code></td> <td></td> <td>{@link MavenSession#getSettings()}</td></tr>
* <tr><td><code>settings.*</code></td> <td></td> <td></td></tr>
* <tr><td><code>basedir</code></td> <td></td>
* <td>{@link MavenSession#getExecutionRootDirectory()} or
* <td>{@link MavenSession#getExecutionRootDirectory()} or
* <code>System.getProperty( "user.dir" )</code> if null</td></tr>
* <tr><td><code>mojoExecution</code></td> <td></td> <td>the actual {@link MojoExecution}</td></tr>
* <tr><td><code>mojo</code></td> <td>(since Maven 3)</td><td>same as <code>mojoExecution</code></td></tr>
@ -106,12 +106,12 @@ public class PluginParameterExpressionEvaluator
this.project = session.getCurrentProject();
//
// Maven4: We may want to evaluate how this is used but we add these separate as the
// Maven4: We may want to evaluate how this is used but we add these separate as the
// getExecutionProperties is deprecated in MavenSession.
//
this.properties.putAll( session.getUserProperties() );
this.properties.putAll( session.getSystemProperties() );
String basedir = null;
if ( project != null )

2
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
View File

@ -128,7 +128,7 @@ public class DefaultMavenPluginManager
* same class realm is used to load build extensions and load mojos for extensions=true plugins.
* </p>
* <strong>Note:</strong> This is part of internal implementation and may be changed or removed without notice
*
*
* @since 3.3.0
*/
public static final String KEY_EXTENSIONS_REALMS = DefaultMavenPluginManager.class.getName() + "/extensionsRealms";

2
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -1073,7 +1073,7 @@ public class MavenProject
MavenProject that = (MavenProject) other;
return Objects.equals( getArtifactId(), that.getArtifactId() )
&& Objects.equals( getGroupId(), that.getGroupId() )
&& Objects.equals( getGroupId(), that.getGroupId() )
&& Objects.equals( getVersion(), that.getVersion() );
}

2
maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
View File

@ -273,7 +273,7 @@ public class ProjectModelResolver
}
dependency.setVersion( versionRangeResult.getHighestVersion().toString() );
if ( modelPool != null )
{
Model model =

12
maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
View File

@ -108,13 +108,13 @@ class ReactorModelCache
return hashCode;
}
}
private static final class SourceCacheKey
{
private final Source source;
private final String tag;
private final int hashCode;
SourceCacheKey( Source source, String tag )
@ -133,7 +133,7 @@ class ReactorModelCache
@Override
public boolean equals( Object obj )
{
if ( this == obj )
if ( this == obj )
{
return true;
}
@ -141,13 +141,13 @@ class ReactorModelCache
{
return false;
}
SourceCacheKey other = (SourceCacheKey) obj;
if ( !Objects.equals( this.source, other.source ) )
{
return false;
}
if ( !Objects.equals( this.tag, other.tag ) )
{
return false;

14
maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
View File

@ -45,7 +45,7 @@ class ReactorModelPool
/**
* Get the model by its GAV or (since 4.0.0) by its GA if there is only one.
*
*
* @param groupId, never {@code null}
* @param artifactId, never {@code null}
* @param version, can be {@code null}
@ -56,7 +56,7 @@ class ReactorModelPool
{
return modelsByGa.getOrDefault( new GAKey( groupId, artifactId ), Collections.emptySet() ).stream()
.filter( m -> version == null || version.equals( getVersion( m ) ) )
.reduce( ( a, b ) ->
.reduce( ( a, b ) ->
{
throw new IllegalStateException( "Multiple modules with key "
+ a.getGroupId() + ':' + a.getArtifactId() );
@ -65,7 +65,7 @@ class ReactorModelPool
/**
* Find model by path, useful when location the parent by relativePath
*
*
* @param path
* @return the matching model or {@code null}
* @since 4.0.0
@ -83,7 +83,7 @@ class ReactorModelPool
}
return modelsByPath.get( pomFile );
}
private String getVersion( Model model )
{
String version = model.getVersion();
@ -97,7 +97,7 @@ class ReactorModelPool
static class Builder
{
private ReactorModelPool pool = new ReactorModelPool();
Builder put( Path pomFile, Model model )
{
pool.modelsByPath.put( pomFile, model );
@ -105,8 +105,8 @@ class ReactorModelPool
k -> new HashSet<Model>() ).add( model );
return this;
}
ReactorModelPool build()
ReactorModelPool build()
{
return pool;
}

4
maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java
View File

@ -23,8 +23,8 @@ import org.eclipse.aether.RepositorySystemSession;
/**
* Component interface that allows per-project customization of Aether repository system sessions.
*
* <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice.
*
* <strong>Note:</strong> This interface is part of work in progress and can be changed or removed without notice.
* @since 3.2.4
*/
public interface RepositorySessionDecorator

30
maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
View File

@ -60,11 +60,11 @@ public class DefaultProjectArtifactsCache
{
private final String groupId;
private final String artifactId;
private final String version;
private final Set<String> dependencyArtifacts;
private final WorkspaceRepository workspace;
@ -72,11 +72,11 @@ public class DefaultProjectArtifactsCache
private final LocalRepository localRepo;
private final List<RemoteRepository> repositories;
private final Set<String> collect;
private final Set<String> resolve;
private boolean aggregating;
private final int hashCode;
@ -85,11 +85,11 @@ public class DefaultProjectArtifactsCache
Collection<String> scopesToCollect, Collection<String> scopesToResolve, boolean aggregating,
RepositorySystemSession session )
{
groupId = project.getGroupId();
artifactId = project.getArtifactId();
version = project.getVersion();
Set<String> deps = new LinkedHashSet<>();
if ( project.getDependencyArtifacts() != null )
{
@ -99,7 +99,7 @@ public class DefaultProjectArtifactsCache
}
}
dependencyArtifacts = Collections.unmodifiableSet( deps );
workspace = RepositoryUtils.getWorkspace( session );
this.localRepo = session.getLocalRepository();
this.repositories = new ArrayList<>( repositories.size() );
@ -115,10 +115,10 @@ public class DefaultProjectArtifactsCache
}
}
collect = scopesToCollect == null
? Collections.<String>emptySet()
? Collections.<String>emptySet()
: Collections.unmodifiableSet( new HashSet<>( scopesToCollect ) );
resolve = scopesToResolve == null
? Collections.<String>emptySet()
resolve = scopesToResolve == null
? Collections.<String>emptySet()
: Collections.unmodifiableSet( new HashSet<>( scopesToResolve ) );
this.aggregating = aggregating;
@ -166,10 +166,10 @@ public class DefaultProjectArtifactsCache
return Objects.equals( groupId, that.groupId ) && Objects.equals( artifactId, that.artifactId )
&& Objects.equals( version, that.version )
&& Objects.equals( dependencyArtifacts, that.dependencyArtifacts )
&& Objects.equals( workspace, that.workspace )
&& Objects.equals( workspace, that.workspace )
&& Objects.equals( localRepo, that.localRepo )
&& RepositoryUtils.repositoriesEquals( repositories, that.repositories )
&& Objects.equals( collect, that.collect )
&& Objects.equals( collect, that.collect )
&& Objects.equals( resolve, that.resolve )
&& aggregating == that.aggregating;
}
@ -181,7 +181,7 @@ public class DefaultProjectArtifactsCache
public Key createKey( MavenProject project, Collection<String> scopesToCollect,
Collection<String> scopesToResolve, boolean aggregating, RepositorySystemSession session )
{
return new CacheKey( project, project.getRemoteProjectRepositories(), scopesToCollect, scopesToResolve,
return new CacheKey( project, project.getRemoteProjectRepositories(), scopesToCollect, scopesToResolve,
aggregating, session );
}

2
maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
View File

@ -79,7 +79,7 @@ public interface ProjectArtifactsCache
}
}
Key createKey( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve,
Key createKey( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve,
boolean aggregating, RepositorySystemSession session );
CacheRecord get( Key key ) throws LifecycleExecutionException;

10
maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
View File

@ -50,7 +50,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
private Logger logger;
/**
*
*
* @param model the model, must not be {@code null}
* @param logger the logger, must not be {@code null}
*/
@ -62,7 +62,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
}
/**
*
*
* @param model the model, must not be {@code null}
* @param type the type
* @param logger the logger, must not be {@code null}
@ -160,7 +160,7 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
}
return hashCode;
}
@Override
public String toString()
{
@ -178,9 +178,9 @@ public abstract class DefaultToolchain // should have been AbstractToolchain...
builder.append( ';' );
}
}
builder.append( '}' );
return builder.toString();
}
}

6
maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
View File

@ -48,7 +48,7 @@ public class DefaultToolchainManager
@Inject
Map<String, ToolchainFactory> factories;
@Override
public Toolchain getToolchainFromBuildContext( String type, MavenSession session )
{
@ -59,7 +59,7 @@ public class DefaultToolchainManager
if ( model != null )
{
List<Toolchain> toolchains = selectToolchains( Collections.singletonList( model ), type, null );
if ( !toolchains.isEmpty() )
{
return toolchains.get( 0 );
@ -112,7 +112,7 @@ public class DefaultToolchainManager
}
return toolchains;
}
Map<String, Object> retrieveContext( MavenSession session )
{
Map<String, Object> context = null;

2
maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
View File

@ -63,7 +63,7 @@ public class DefaultToolchainManagerPrivate
toRet.add( fact.createToolchain( toolchainModel ) );
}
}
// add default toolchain
ToolchainPrivate tool = fact.createDefaultToolchain();
if ( tool != null )

4
maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
View File

@ -59,7 +59,7 @@ public final class RequirementMatcherFactory
{
return provides.equalsIgnoreCase( requirement );
}
@Override
public String toString()
{
@ -99,7 +99,7 @@ public final class RequirementMatcherFactory
return false;
}
}
@Override
public String toString()
{

2
maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
View File

@ -37,7 +37,7 @@ public interface ToolchainManagerPrivate
/**
* Retrieves every toolchains of given type available in user settings.
*
*
* @param type the type, must not be {@code null}
* @param context the Maven session, must not be {@code null}
* @since 3.0 (addition of the <code>MavenSession</code> parameter)

2
maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
View File

@ -40,7 +40,7 @@ public interface ToolchainPrivate
boolean matchesRequirements( Map<String, String> requirements );
/**
*
*
* @return the original model wrapped by this interface
*/
ToolchainModel getModel();

8
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
View File

@ -44,7 +44,7 @@ import java.util.List;
import java.util.Map;
/**
*
*
* @author Robert Scholte
* @since 3.3.0
*/
@ -66,13 +66,13 @@ public class DefaultToolchainsBuilder
throws ToolchainsBuildingException
{
ProblemCollector problems = ProblemCollectorFactory.newInstance( null );
PersistedToolchains globalToolchains = readToolchains( request.getGlobalToolchainsSource(), request, problems );
PersistedToolchains userToolchains = readToolchains( request.getUserToolchainsSource(), request, problems );
toolchainsMerger.merge( userToolchains, globalToolchains, TrackableBase.GLOBAL_LEVEL );
problems.setSource( "" );
userToolchains = interpolate( userToolchains, problems );
@ -193,7 +193,7 @@ public class DefaultToolchainsBuilder
return toolchains;
}
private boolean hasErrors( List<Problem> problems )
{
if ( problems != null )

2
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
View File

@ -33,7 +33,7 @@ public class DefaultToolchainsBuildingRequest
private Source globalToolchainsSource;
private Source userToolchainsSource;
@Override
public Source getGlobalToolchainsSource()
{

10
maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
View File

@ -27,7 +27,7 @@ import org.apache.maven.toolchain.model.PersistedToolchains;
/**
* Holds the result of the merged toolchains and holds the problems during this build, if any.
*
*
* @author Robert Scholte
* @since 3.3.0
*/
@ -36,12 +36,12 @@ public class DefaultToolchainsBuildingResult
{
private PersistedToolchains effectiveToolchains;
private List<Problem> problems;
/**
* Default constructor
*
*
* @param effectiveToolchains the merged toolchains, may not be {@code null}
* @param problems the problems while building the effectiveToolchains, if any.
*/
@ -56,7 +56,7 @@ public class DefaultToolchainsBuildingResult
{
return effectiveToolchains;
}
@Override
public List<Problem> getProblems()
{

2
maven-core/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
View File

@ -42,7 +42,7 @@ public interface ToolchainsBuildingResult
/**
* Return a list of problems, if any.
*
*
* @return a list of problems, never {@code null}.
*/
List<Problem> getProblems();

2
maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
View File

@ -26,7 +26,7 @@ import org.codehaus.plexus.logging.Logger;
* Provides backwards compatibility with Maven 3.2.3 and earlier. Clients that do not require compatibility with Maven
* 3.2.3 and earlier are encouraged to use {@link JavaToolchainImpl}.
* <strong>Note:</strong> This is an internal component whose interface can change without prior notice.
*
*
* @deprecated clients that do not require compatibility with Maven 3.2.3 and earlier should link to
* {@link JavaToolchainImpl} instead.
*/

6
maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
View File

@ -28,7 +28,7 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
*
*
* @author Robert Scholte
* @since 3.2.4
*/
@ -55,14 +55,14 @@ public class MavenToolchainMerger
for ( ToolchainModel dominantModel : dominant )
{
Object key = getToolchainModelKey( dominantModel );
merged.put( key, dominantModel );
}
for ( ToolchainModel recessiveModel : recessive )
{
Object key = getToolchainModelKey( recessiveModel );
ToolchainModel dominantModel = merged.get( key );
if ( dominantModel == null )
{

2
maven-core/src/main/java/org/apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java
View File

@ -25,7 +25,7 @@ import org.apache.maven.xml.sax.filter.ConsumerPomXMLFilterFactory;
/**
* The default implementation of the {@link ConsumerPomXMLFilterFactory}
* It will provide several values for the consumer pom based on its context.
*
*
* @author Robert Scholte
* @since 4.0.0
*/

8
maven-core/src/main/mdo/toolchains.mdo
View File

@ -182,7 +182,7 @@
<![CDATA[
/**
* Method hashCode.
*
*
* @return int
*/
public int hashCode()
@ -194,10 +194,10 @@
return result;
} //-- int hashCode()
/**
* Method equals.
*
*
* @param other
* @return boolean
*/
@ -220,7 +220,7 @@
result = result && ( getProvides() == null ? that.getProvides() == null : getProvides().equals( that.getProvides() ) );
return result;
} //-- boolean equals( Object )
} //-- boolean equals( Object )
]]>
</code>
</codeSegment>

6
maven-core/src/main/resources/META-INF/maven/extension.xml
View File

@ -106,7 +106,7 @@ under the License.
<exportedPackage>javax.annotation.*</exportedPackage>
<exportedPackage>javax.annotation.security.*</exportedPackage>
<!--
<!--
| We may potentially want to export these, but right now I'm not sure that anything Guice specific needs
| to be made available to plugin authors. If we find people are getting fancy and want to take advantage of
| Guice specifics we can expose that later. Really some testing needs to be done to see full hiding
@ -175,7 +175,7 @@ under the License.
<exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact>
<!--
| We must also filter out the old Aether or NoClassDefFoundErrors will surface
| We must also filter out the old Aether or NoClassDefFoundErrors will surface
-->
<exportedArtifact>org.sonatype.aether:aether-api</exportedArtifact>
<exportedArtifact>org.sonatype.aether:aether-spi</exportedArtifact>
@ -188,7 +188,7 @@ under the License.
| NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise
| provoke linkage errors for wagons contributed by build extensions. We also don't need to exclude the wagons
| from plugins. Plugins that use wagons directly and declare the corresponding dependency will simply use a
| wagon from their plugin realm.
| wagon from their plugin realm.
-->
</exportedArtifacts>
</extension>

4
maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
View File

@ -138,7 +138,7 @@ public abstract class AbstractCoreMavenComponentTestCase
{
return createMavenSession( pom, executionProperties, false );
}
protected MavenSession createMavenSession( File pom, Properties executionProperties, boolean includeModules )
throws Exception
{
@ -155,7 +155,7 @@ public abstract class AbstractCoreMavenComponentTestCase
if ( pom != null )
{
MavenProject project = projectBuilder.build( pom, configuration ).getProject();
projects.add( project );
if ( includeModules )
{

16
maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
View File

@ -121,36 +121,36 @@ public class ExclusionArtifactFilterTest
assertThat( filter.include( artifact ), is( false ) );
}
@Test
public void testMultipleExclusionsExcludeArtifactIdWildcard()
{
Exclusion exclusion1 = new Exclusion();
exclusion1.setGroupId( "org.apache.groovy" );
exclusion1.setArtifactId( "*" );
Exclusion exclusion2 = new Exclusion();
exclusion2.setGroupId( "org.apache.maven" );
exclusion2.setArtifactId( "maven-core" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Arrays.asList( exclusion1, exclusion2 ) );
assertThat( filter.include( artifact ), is( false ) );
}
@Test
public void testMultipleExclusionsExcludeGroupIdWildcard()
{
Exclusion exclusion1 = new Exclusion();
exclusion1.setGroupId( "*" );
exclusion1.setArtifactId( "maven-model" );
Exclusion exclusion2 = new Exclusion();
exclusion2.setGroupId( "org.apache.maven" );
exclusion2.setArtifactId( "maven-core" );
ExclusionArtifactFilter filter = new ExclusionArtifactFilter( Arrays.asList( exclusion1, exclusion2 ) );
assertThat( filter.include( artifact ), is( false ) );
}
}

2
maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
View File

@ -34,7 +34,7 @@ public class DefaultMavenExecutionRequestPopulatorTest
{
@Inject
MavenExecutionRequestPopulator testee;
public void testPluginRepositoryInjection()
throws Exception
{

6
maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
View File

@ -39,7 +39,7 @@ public class ConsumerModelSourceTransformerTest
Path beforePomFile = Paths.get( "src/test/resources/projects/transform/before.pom").toAbsolutePath();
Path afterPomFile = Paths.get( "src/test/resources/projects/transform/after.pom").toAbsolutePath();
try( InputStream expected = Files.newInputStream( afterPomFile );
try( InputStream expected = Files.newInputStream( afterPomFile );
InputStream result = transformer.transform( beforePomFile, new NoTransformerContext() ) )
{
XmlAssert.assertThat( result ).and( expected ).areIdentical();
@ -53,14 +53,14 @@ public class ConsumerModelSourceTransformerTest
{
return null;
}
@Override
public Model getRawModel( String groupId, String artifactId )
throws IllegalStateException
{
return null;
}
@Override
public Model getRawModel( Path p )
{

12
maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
View File

@ -98,27 +98,27 @@ public class DefaultLifecyclesTest
assertThat( lifecycle.getId(), is( "wrapper" ) );
assertThat( lifecycle.getPhases(), hasSize( 1 ) );
}
public void testCustomLifecycle()
{
List<Lifecycle> myLifecycles = new ArrayList<>();
Lifecycle myLifecycle = new Lifecycle( "etl",
Lifecycle myLifecycle = new Lifecycle( "etl",
Arrays.asList( "extract", "transform", "load" ),
Collections.emptyMap() );
myLifecycles.add( myLifecycle );
myLifecycles.addAll( defaultLifeCycles.getLifeCycles() );
DefaultLifecycles dl = new DefaultLifecycles( myLifecycles.stream()
.collect( Collectors.toMap( l -> l.getId(), l -> l ) ),
.collect( Collectors.toMap( l -> l.getId(), l -> l ) ),
null );
assertThat( dl.getLifeCycles().get( 0 ).getId(), is( "default" ) );
assertThat( dl.getLifeCycles().get( 1 ).getId(), is( "clean" ) );
assertThat( dl.getLifeCycles().get( 2 ).getId(), is( "site" ) );
assertThat( dl.getLifeCycles().get( 3 ).getId(), is( "wrapper" ) );
assertThat( dl.getLifeCycles().get( 4 ).getId(), is( "etl" ) );
}
private Lifecycle getLifeCycleById( String id )
{
return defaultLifeCycles.getLifeCycles().stream()

8
maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuilderCommonTest.java
View File

@ -36,7 +36,7 @@ import java.util.HashSet;
public class BuilderCommonTest
{
private Logger logger = mock( Logger.class );
@Test
public void testResolveBuildPlan()
throws Exception
@ -53,7 +53,7 @@ public class BuilderCommonTest
new HashSet<>() );
assertEquals( LifecycleExecutionPlanCalculatorStub.getProjectAExceutionPlan().size(), plan.size() );
}
@Test
public void testDefaultBindingPluginsWarning()
throws Exception
@ -65,7 +65,7 @@ public class BuilderCommonTest
session1.setCurrentProject( ProjectDependencyGraphStub.A );
getBuilderCommon().resolveBuildPlan( session1, ProjectDependencyGraphStub.A, taskSegment1, new HashSet<>() );
verify( logger ).warn("Version not locked for default bindings plugins ["
+ "stub-plugin-initialize, "
+ "stub-plugin-process-resources, "
@ -77,7 +77,7 @@ public class BuilderCommonTest
+ "stub-plugin-install], "
+ "you should define versions in pluginManagement section of your pom.xml or parent");
}
public void testHandleBuildError()
throws Exception
{

2
maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
View File

@ -36,7 +36,7 @@ public class ProjectBuildListTest
final MavenSession session = ProjectDependencyGraphStub.getMavenSession();
ProjectBuildList projectBuildList = ProjectDependencyGraphStub.getProjectBuildList( session );
TaskSegment taskSegment = projectBuildList.get( 0 ).getTaskSegment();
assertThat( "This test assumes there are at least 6 elements in projectBuilds",
assertThat( "This test assumes there are at least 6 elements in projectBuilds",
projectBuildList.size(), is( greaterThanOrEqualTo( 6 ) ) );
final ProjectBuildList byTaskSegment = projectBuildList.getByTaskSegment( taskSegment );

2
maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
View File

@ -212,7 +212,7 @@ public class LifecycleExecutionPlanCalculatorStub
{
InputSource defaultBindings = new InputSource();
defaultBindings.setModelId( DefaultLifecyclePluginAnalyzer.DEFAULTLIFECYCLEBINDINGS_MODELID );
final Plugin plugin = mojoDescriptor.getPluginDescriptor().getPlugin();
plugin.setLocation( "version", new InputLocation( 12, 34, defaultBindings ) );
MojoExecution result = new MojoExecution( plugin, goal, executionId );

16
maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java
View File

@ -33,38 +33,38 @@ public class LifecyclePhaseTest
{
LifecyclePhase phase = new LifecyclePhase();
assertEquals( "", phase.toString() );
LifecycleMojo mojo1 = new LifecycleMojo();
mojo1.setGoal( "jar:jar" );
phase.setMojos( Arrays.asList( mojo1 ) );
assertEquals( "jar:jar", phase.toString() );
LifecycleMojo mojo2 = new LifecycleMojo();
mojo2.setGoal( "war:war" );
phase.setMojos( Arrays.asList( mojo1, mojo2 ) );
assertEquals( "jar:jar,war:war", phase.toString() );
}
@Test
public void testSet()
{
LifecyclePhase phase = new LifecyclePhase();
assertNull( phase.getMojos() );
phase.set( "" );
assertNotNull( phase.getMojos() );
assertEquals( 0, phase.getMojos().size() );
phase.set( "jar:jar, war:war" );
List<LifecycleMojo> mojos = phase.getMojos();
assertNotNull( mojos );
assertEquals( 2, mojos.size() );
LifecycleMojo mojo1 = mojos.get(0);
assertNotNull( mojo1 );
assertEquals( "jar:jar", mojo1.getGoal() );
LifecycleMojo mojo2 = mojos.get(1);
assertNotNull( mojo2 );
assertEquals( "war:war", mojo2.getGoal() );

2
maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
View File

@ -314,7 +314,7 @@ public class PluginManagerTest
pluginManager.loadPlugin( plugin, session.getCurrentProject().getRemotePluginRepositories(),
session.getRepositorySession() );
ClassRealm pluginRealm = pluginManager.getPluginRealm( session, pluginDescriptor );
assertEquals(pluginRealm, pluginDescriptor.getComponents().get(0).getRealm());
}
}

2
maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
View File

@ -209,7 +209,7 @@ public class ProjectSorterTest
projects.add( project1 );
MavenProject project2 = createProject( "groupId", "artifactId", "1.0" );
projects.add( project2 );
expectedException.expect( DuplicateProjectException.class );
expectedException.reportMissingExceptionWithMessage( "Duplicate projects should fail" );

18
maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java
View File

@ -31,7 +31,7 @@ import junit.framework.TestCase;
public class DefaultProjectArtifactsCacheTest extends TestCase
{
private ProjectArtifactsCache cache;
@Override
@ -41,32 +41,32 @@ public class DefaultProjectArtifactsCacheTest extends TestCase
super.setUp();
cache = new DefaultProjectArtifactsCache();
}
public void testProjectDependencyOrder() throws Exception
{
ProjectArtifactsCache.Key project1 = new ProjectArtifactsCache.Key(){};
Set<Artifact> artifacts = new LinkedHashSet<>( 4 );
artifacts.add( new DefaultArtifact( "g", "a1", "v", "compile", "jar", "", null ) );
artifacts.add( new DefaultArtifact( "g", "a2", "v", "compile", "jar", "", null ) );
artifacts.add( new DefaultArtifact( "g", "a3", "v", "compile", "jar", "", null ) );
artifacts.add( new DefaultArtifact( "g", "a4", "v", "compile", "jar", "", null ) );
cache.put( project1, artifacts );
assertArrayEquals( artifacts.toArray( new Artifact[0] ),
cache.get( project1 ).getArtifacts().toArray( new Artifact[0] ) );
ProjectArtifactsCache.Key project2 = new ProjectArtifactsCache.Key(){};
Set<Artifact> reversedArtifacts = new LinkedHashSet<>( 4 );
artifacts.add( new DefaultArtifact( "g", "a4", "v", "compile", "jar", "", null ) );
artifacts.add( new DefaultArtifact( "g", "a3", "v", "compile", "jar", "", null ) );
artifacts.add( new DefaultArtifact( "g", "a2", "v", "compile", "jar", "", null ) );
artifacts.add( new DefaultArtifact( "g", "a1", "v", "compile", "jar", "", null ) );
cache.put( project2, reversedArtifacts );
assertArrayEquals( reversedArtifacts.toArray( new Artifact[0] ),
cache.get( project2 ).getArtifacts().toArray( new Artifact[0] ) );
}

4
maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java
View File

@ -53,7 +53,7 @@ public class DefaultToolchainManagerPrivateTest
@Mock
private ToolchainFactory toolchainFactory_basicType;
@Mock
private ToolchainFactory toolchainFactory_rareType;
@ -112,7 +112,7 @@ public class DefaultToolchainManagerPrivateTest
verify( logger ).error( "Missing toolchain factory for type: unknown. Possibly caused by misconfigured project." );
assertEquals( 0, toolchains.length );
}
@Test
public void testToolchainsForConfiguredType()
throws Exception

4
maven-core/src/test/projects/lifecycle-dependency-resolver/pom.xml
View File

@ -31,7 +31,7 @@ under the License.
<description>
Check that war packages the jar instead of a directory
</description>
<reporting>
<plugins>
<plugin>
@ -50,7 +50,7 @@ under the License.
</plugin>
</plugins>
</reporting>
<modules>
<module>lib</module>
<module>war</module>

4
maven-core/src/test/projects/lifecycle-dependency-resolver/war/pom.xml
View File

@ -29,7 +29,7 @@ under the License.
</parent>
<artifactId>mng6300-war</artifactId>
<packaging>war</packaging>
<build>
<plugins>
<plugin>
@ -41,7 +41,7 @@ under the License.
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.maven.its.mng6300</groupId>

2
maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom
View File

@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: Dummy Artifact</name>
<description>
</description>
<distributionManagement>

2
maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom
View File

@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: Dummy Artifact</name>
<description>
</description>
<distributionManagement>

52
maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom
View File

@ -31,11 +31,11 @@ under the License.
<artifactId>maven-artifact</artifactId>
<version>3.0-SNAPSHOT</version>
<name>Maven Artifact</name>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/artifact/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/artifact/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/artifact/trunk</url>
</scm>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/artifact/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/artifact/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/artifact/trunk</url>
</scm>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@ -56,7 +56,7 @@ under the License.
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>1.0-beta-2</version>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
@ -68,7 +68,7 @@ under the License.
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>
<build>
<plugins>
@ -80,25 +80,25 @@ under the License.
<version>1.0.0</version>
<model>src/main/mdo/metadata.mdo</model>
</configuration>
<executions>
<execution>
<id>site-docs</id>
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
<goal>xsd</goal>
</goals>
</execution>
<execution>
<id>standard</id>
<goals>
<goal>java</goal>
<goal>xpp3-reader</goal>
<goal>xpp3-writer</goal>
</goals>
</execution>
</executions>
</plugin>
<executions>
<execution>
<id>site-docs</id>
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
<goal>xsd</goal>
</goals>
</execution>
<execution>
<id>standard</id>
<goals>
<goal>java</goal>
<goal>xpp3-reader</goal>
<goal>xpp3-writer</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>

6
maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom
View File

@ -35,7 +35,7 @@
<version>1.0-alpha-16</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
@ -62,12 +62,12 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>dummy</id>
<url>file:///tmp/dummy-repo</url>
</repository>
</distributionManagement>
</project>

4
maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom
View File

@ -33,12 +33,12 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>dummy</id>
<url>file:///tmp/dummy-repo</url>
</repository>
</distributionManagement>
</project>

10
maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom
View File

@ -291,9 +291,9 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-4</version>
<version>2.0-beta-4</version>
<configuration>
<!-- This element will be overridden by children -->
<tagBase>https://svn.apache.org/repos/asf/maven/pom/tags</tagBase>
@ -379,7 +379,7 @@ under the License.
</plugin>
</plugins>
</reporting>
</profile>
</profile>
<profile>
<id>release</id>
<build>
@ -451,10 +451,10 @@ under the License.
</goals>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>
</profile>
</profile>
</profiles>
<scm>

Some files were not shown because too many files have changed in this diff Show More