mirror of https://github.com/apache/maven.git
fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813615 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b82977a18c
commit
af5b761568
|
@ -1,5 +1,24 @@
|
||||||
package org.apache.maven.cli;
|
package org.apache.maven.cli;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
|
@ -60,8 +79,8 @@ public final class CLIReportingUtils
|
||||||
System.out.println( "Default locale: " + Locale.getDefault() + ", platform encoding: "
|
System.out.println( "Default locale: " + Locale.getDefault() + ", platform encoding: "
|
||||||
+ System.getProperty( "file.encoding", "<unknown encoding>" ) );
|
+ System.getProperty( "file.encoding", "<unknown encoding>" ) );
|
||||||
|
|
||||||
System.out.println( "OS name: \"" + Os.OS_NAME + "\" version: \"" + Os.OS_VERSION +
|
System.out.println( "OS name: \"" + Os.OS_NAME + "\" version: \"" + Os.OS_VERSION
|
||||||
"\" arch: \"" + Os.OS_ARCH + "\" Family: \"" + Os.OS_FAMILY + "\"" );
|
+ "\" arch: \"" + Os.OS_ARCH + "\" Family: \"" + Os.OS_FAMILY + "\"" );
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String reduce( String s )
|
private static String reduce( String s )
|
||||||
|
|
|
@ -68,8 +68,8 @@ final class CLIRequestUtils
|
||||||
|
|
||||||
boolean pluginUpdateOverride = false;
|
boolean pluginUpdateOverride = false;
|
||||||
|
|
||||||
if ( commandLine.hasOption( CLIManager.FORCE_PLUGIN_UPDATES ) ||
|
if ( commandLine.hasOption( CLIManager.FORCE_PLUGIN_UPDATES )
|
||||||
commandLine.hasOption( CLIManager.FORCE_PLUGIN_UPDATES2 ) )
|
|| commandLine.hasOption( CLIManager.FORCE_PLUGIN_UPDATES2 ) )
|
||||||
{
|
{
|
||||||
pluginUpdateOverride = true;
|
pluginUpdateOverride = true;
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ final class CLIRequestUtils
|
||||||
String [] profileOptionValues = commandLine.getOptionValues( CLIManager.ACTIVATE_PROFILES );
|
String [] profileOptionValues = commandLine.getOptionValues( CLIManager.ACTIVATE_PROFILES );
|
||||||
if ( profileOptionValues != null )
|
if ( profileOptionValues != null )
|
||||||
{
|
{
|
||||||
for ( int i=0; i < profileOptionValues.length; ++i )
|
for ( int i = 0; i < profileOptionValues.length; ++i )
|
||||||
{
|
{
|
||||||
StringTokenizer profileTokens = new StringTokenizer( profileOptionValues[i] , "," );
|
StringTokenizer profileTokens = new StringTokenizer( profileOptionValues[i] , "," );
|
||||||
|
|
||||||
|
|
|
@ -53,8 +53,8 @@ public class ConsoleDownloadMonitor
|
||||||
if ( total >= 1024 )
|
if ( total >= 1024 )
|
||||||
{
|
{
|
||||||
System.out.print(
|
System.out.print(
|
||||||
( complete / 1024 ) + "/" + ( total == WagonConstants.UNKNOWN_LENGTH ? "?" : ( total / 1024 ) + "K" ) +
|
( complete / 1024 ) + "/" + ( total == WagonConstants.UNKNOWN_LENGTH ? "?" : ( total / 1024 ) + "K" )
|
||||||
"\r" );
|
+ "\r" );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,18 +1,22 @@
|
||||||
package org.apache.maven.embedder.execution;
|
package org.apache.maven.embedder.execution;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
* agreements. See the NOTICE file distributed with this work for additional information regarding
|
* or more contributor license agreements. See the NOTICE file
|
||||||
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
|
* distributed with this work for additional information
|
||||||
* "License"); you may not use this file except in compliance with the License. You may obtain a
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
* copy of the License at
|
* 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
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software distributed under the License
|
* Unless required by applicable law or agreed to in writing,
|
||||||
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
|
* software distributed under the License is distributed on an
|
||||||
* or implied. See the License for the specific language governing permissions and limitations under
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
* the License.
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
|
@ -206,7 +206,7 @@ public abstract class AbstractCoreMavenComponentTestCase
|
||||||
//
|
//
|
||||||
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope )
|
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope )
|
||||||
{
|
{
|
||||||
return addDependency( groupId, artifactId, version, scope, (Exclusion)null );
|
return addDependency( groupId, artifactId, version, scope, (Exclusion) null );
|
||||||
}
|
}
|
||||||
|
|
||||||
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion )
|
public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion )
|
||||||
|
|
|
@ -86,7 +86,7 @@ public class MavenEmbedderTest
|
||||||
}
|
}
|
||||||
|
|
||||||
System.err.println( "Encountered " + exceptions.size() + " exception(s)." );
|
System.err.println( "Encountered " + exceptions.size() + " exception(s)." );
|
||||||
for (Exception exception : exceptions)
|
for ( Exception exception : exceptions )
|
||||||
{
|
{
|
||||||
exception.printStackTrace( System.err );
|
exception.printStackTrace( System.err );
|
||||||
}
|
}
|
||||||
|
@ -109,11 +109,11 @@ public class MavenEmbedderTest
|
||||||
|
|
||||||
MavenExecutionResult result = mavenEmbedder.execute( request );
|
MavenExecutionResult result = mavenEmbedder.execute( request );
|
||||||
List<Exception> exceptions = result.getExceptions();
|
List<Exception> exceptions = result.getExceptions();
|
||||||
assertEquals("Incorrect number of exceptions", 1, exceptions.size());
|
assertEquals( "Incorrect number of exceptions", 1, exceptions.size() );
|
||||||
|
|
||||||
if ( ( exceptions.get( 0 ) instanceof NullPointerException ) )
|
if ( ( exceptions.get( 0 ) instanceof NullPointerException ) )
|
||||||
{
|
{
|
||||||
fail("Null Pointer on Exception");
|
fail( "Null Pointer on Exception" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue