Skip to content

Commit

Permalink
Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-o committed Nov 12, 2016
1 parent 6b0b7a9 commit 0eb1e93
Show file tree
Hide file tree
Showing 113 changed files with 348 additions and 348 deletions.
40 changes: 20 additions & 20 deletions apache-maven/src/conf/toolchains.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,37 +44,37 @@ 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
|
| General example
<toolchain>
<type/>
<provides>
<version>1.0</version>
</provides>
<provides>
<version>1.0</version>
</provides>
<configuration/>
</toolchain>
| JDK examples
<toolchain>
Expand All @@ -97,7 +97,7 @@ under the License.
<jdkHome>/path/to/jdk/1.6</jdkHome>
</configuration>
</toolchain>
-->

</toolchains>
10 changes: 5 additions & 5 deletions apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
## under the License.
##

Apache Maven includes a number of components and libraries with separate
copyright notices and license terms. Your use of those components are
subject to the terms and conditions of the following licenses.
Apache Maven includes a number of components and libraries with separate
copyright notices and license terms. Your use of those components are
subject to the terms and conditions of the following licenses.

#set ( $apacheTxt = "The Apache Software License, Version 2.0" )

#foreach ( $project in $projects )
#foreach ( $license in $project.licenses)
#if ( ! ($apacheTxt == $license.name) )
#if ( ! ($apacheTxt == $license.name) )
#set ( $artId = $project.artifact.artifactId)
#set ( $lf = $locator )
#set ( $url = $license.url )
## glass fish URL is now invalid, use a fixed one
#if ($url == "https://glassfish.dev.java.net/public/CDDLv1.0.html")
#set ( $url = 'https://glassfish.java.net/public/CDDLv1.0.html' )
#end
#if ($url)
#if ($url)
#set ( $licFile = 'lib/' + $artId + '.license' )
#set ( $downloaded = $lf.getResourceAsFile($url, "licenses/${licFile}") )
#end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

/**
* Populates Aether {@link ArtifactDescriptorResult} from Maven project {@link Model}.
*
*
* @since 3.2.4
* @provisional This class is part of work in progress and can be changed or removed without notice.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static DefaultRepositorySystemSession newSession()
session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );

final Properties systemProperties = new Properties();

// MNG-5670 guard against ConcurrentModificationException
// MNG-6053 guard against key without value
Properties sysProp = System.getProperties();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private static class StringItem
{
private static final List<String> QUALIFIERS =
Arrays.asList( "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" );

private static final Properties ALIASES = new Properties();
static
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
import java.util.List;

/**
*
*
* @author Robert Scholte
* @since 3.3.0
*/
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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public void testGetProblems()
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);
Expand All @@ -47,7 +47,7 @@ public void testGetProblems()
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() );
Expand All @@ -60,7 +60,7 @@ public void testGetProblems()
public void testSetSource()
{
DefaultProblemCollector collector = new DefaultProblemCollector( null );

collector.add( null, "PROBLEM1", -1, -1, null );

collector.setSource( "SOURCE_PROBLEM2" );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ public void testGetSeverity()

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()
{
Expand All @@ -52,15 +52,15 @@ public void testGetLineNumber()

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() );

// this case is not specified, might also return -1
problem = new DefaultProblem( null, null, null, Integer.MIN_VALUE, -1, null );
assertEquals( Integer.MIN_VALUE, problem.getLineNumber() );
}

@Test
public void testGetColumnNumber()
{
Expand All @@ -69,21 +69,21 @@ public void testGetColumnNumber()

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() );

// this case is not specified, might also return -1
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() );
Expand All @@ -94,7 +94,7 @@ public void testGetSource()
{
DefaultProblem problem = new DefaultProblem( null, null, null, -1, -1, null );
assertEquals( "", problem.getSource() );

problem = new DefaultProblem( null, null, "", -1, -1, null );
assertEquals( "", problem.getSource() );

Expand All @@ -107,7 +107,7 @@ public void testGetLocation()
{
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() );

Expand All @@ -120,7 +120,7 @@ public void testGetLocation()
problem = new DefaultProblem( null, null, "SOURCE", 42, 127, null );
assertEquals( "SOURCE, line 42, column 127", problem.getLocation() );
}

@Test
public void testGetMessage()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ public void getRemoteFile( ArtifactRepository repository, File destination, Stri
}
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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ boolean checkScopeUpdate( ResolutionNode farthest, ResolutionNode nearest, List<
fireEvent( ResolutionListener.UPDATE_SCOPE, listeners, nearest, farthestArtifact );

// previously we cloned the artifact, but it is more effecient 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() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.

<name>Maven Integration Test :: Dummy Artifact</name>
<description>

</description>

<distributionManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.

<name>Maven Integration Test :: Dummy Artifact</name>
<description>

</description>

<distributionManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>p1</artifactId>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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.
*/
Expand All @@ -40,7 +40,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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private Set<Artifact> resolveImpl( Collection<? extends MavenProject> projects,
if ( ! exclusions.isEmpty() )
{
filter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{
filter = new AndArtifactFilter( Arrays.asList( new ArtifactFilter[]{
new ExcludesArtifactFilter( exclusions ), scopeFilter } ) );
}
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ProjectCycleException( String message )
{
super( message );
}

public ProjectCycleException( String message, CycleDetectedException cause )
{
super( message, cause );
Expand Down
Loading

0 comments on commit 0eb1e93

Please sign in to comment.