Author: olamy
Date: Sat Jan 1 09:45:44 2011
New Revision: 1054215
URL: http://svn.apache.org/viewvc?rev=1054215&view=rev
Log:
[SCM-591] move to Java 1.5
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepositoryException.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
maven/scm/trunk/maven-scm-plugin/pom.xml
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java
Sat Jan 1 09:45:44 2011
@@ -27,6 +27,7 @@ import java.util.Map;
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class CommandParameters
@@ -34,7 +35,7 @@ public class CommandParameters
{
private static final long serialVersionUID = -7346070735958137283L;
- private Map parameters = new HashMap();
+ private Map<String, Object> parameters = new HashMap<String,Object>();
// ----------------------------------------------------------------------
// String
@@ -317,7 +318,7 @@ public class CommandParameters
* @return The parameter value
* @throws ScmException if the parameter doesn't exist
*/
- private Object getObject( Class clazz, CommandParameter parameter )
+ private Object getObject( Class<?> clazz, CommandParameter parameter )
throws ScmException
{
Object object = getObject( clazz, parameter, null );
@@ -339,7 +340,7 @@ public class CommandParameters
* @return The parameter value
* @throws ScmException if the defaultValue is in the wrong type
*/
- private Object getObject( Class clazz, CommandParameter parameter, Object
defaultValue )
+ private Object getObject( Class<?> clazz, CommandParameter parameter,
Object defaultValue )
throws ScmException
{
Object object = parameters.get( parameter.getName() );
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
Sat Jan 1 09:45:44 2011
@@ -52,6 +52,7 @@ import java.util.List;
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public interface ScmManager
@@ -82,7 +83,7 @@ public interface ScmManager
* @param scmUrl the SCM URL to validate
* @return <code>List</code> of <code>String</code> objects with the
messages returned by the SCM provider
*/
- List validateScmRepository( String scmUrl );
+ List<String> validateScmRepository( String scmUrl );
ScmProvider getProviderByUrl( String scmUrl )
throws ScmRepositoryException, NoSuchScmProviderException;
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
Sat Jan 1 09:45:44 2011
@@ -61,6 +61,7 @@ import java.util.List;
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public abstract class AbstractScmProvider
@@ -93,9 +94,9 @@ public abstract class AbstractScmProvide
}
/** {...@inheritdoc} */
- public List validateScmUrl( String scmSpecificUrl, char delimiter )
+ public List<String> validateScmUrl( String scmSpecificUrl, char delimiter )
{
- List messages = new ArrayList();
+ List<String> messages = new ArrayList<String>();
try
{
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepositoryException.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepositoryException.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepositoryException.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepositoryException.java
Sat Jan 1 09:45:44 2011
@@ -26,6 +26,7 @@ import java.util.List;
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ScmRepositoryException
@@ -33,7 +34,7 @@ public class ScmRepositoryException
{
static final long serialVersionUID = -2191549774722212492L;
- private List validationMessages = Collections.EMPTY_LIST;
+ private List<String> validationMessages = Collections.emptyList();
public ScmRepositoryException( String msg )
{
@@ -45,14 +46,14 @@ public class ScmRepositoryException
super( msg, cause );
}
- public ScmRepositoryException( String msg, List validationMessages )
+ public ScmRepositoryException( String msg, List<String> validationMessages
)
{
super( msg );
this.validationMessages = validationMessages;
}
- public List getValidationMessages()
+ public List<String> getValidationMessages()
{
return validationMessages;
}
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
Sat Jan 1 09:45:44 2011
@@ -29,6 +29,7 @@ import java.util.Date;
/**
* Thread-safe version of java.text.DateFormat.
* You can declare it as a static final variable:
+ * @author Olivier Lamy
* <code>
* private static final ThreadSafeDateFormat DATE_FORMAT = new
ThreadSafeDateFormat( DATE_PATTERN );
* </code>
@@ -44,14 +45,14 @@ public class ThreadSafeDateFormat extend
m_sDateFormat = sDateFormat;
}
- private final ThreadLocal m_formatCache = new ThreadLocal()
+ private final ThreadLocal<SoftReference<SimpleDateFormat>> m_formatCache =
new ThreadLocal<SoftReference<SimpleDateFormat>>()
{
- public Object get()
+ public SoftReference<SimpleDateFormat> get()
{
- SoftReference softRef = (SoftReference) super.get();
+ SoftReference<SimpleDateFormat> softRef = super.get();
if (softRef == null || softRef.get() == null)
{
- softRef = new SoftReference( new
SimpleDateFormat(m_sDateFormat) );
+ softRef = new SoftReference<SimpleDateFormat>( new
SimpleDateFormat(m_sDateFormat) );
super.set(softRef);
}
return softRef;
@@ -60,7 +61,7 @@ public class ThreadSafeDateFormat extend
private DateFormat getDateFormat()
{
- return (DateFormat) ((SoftReference)m_formatCache.get()).get();
+ return m_formatCache.get().get();
}
public StringBuffer format(Date date, StringBuffer toAppendTo,
Modified:
maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
(original)
+++
maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
Sat Jan 1 09:45:44 2011
@@ -21,6 +21,7 @@ package org.apache.maven.scm.manager.ple
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.manager.AbstractScmManager;
+import org.apache.maven.scm.provider.ScmProvider;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -32,6 +33,7 @@ import java.util.Map;
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
* @plexus.component role="org.apache.maven.scm.manager.ScmManager"
*/
@@ -42,7 +44,7 @@ public class DefaultScmManager
/**
* @plexus.requirement role="org.apache.maven.scm.provider.ScmProvider"
*/
- private Map scmProviders;
+ private Map<String,ScmProvider> scmProviders;
private Logger logger;
@@ -94,7 +96,7 @@ public class DefaultScmManager
{
if ( scmProviders == null )
{
- scmProviders = new HashMap();
+ scmProviders = new HashMap<String,ScmProvider>( 0 );
}
if ( getLogger().isWarnEnabled() && scmProviders.size() == 0 )
Modified: maven/scm/trunk/maven-scm-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/pom.xml (original)
+++ maven/scm/trunk/maven-scm-plugin/pom.xml Sat Jan 1 09:45:44 2011
@@ -146,6 +146,15 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>http://svn.apache.org/repos/asf/maven/scm/tags</tagBase>
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Sat Jan 1 09:45:44 2011
@@ -19,6 +19,15 @@ package org.apache.maven.scm.plugin;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.scm.ScmBranch;
@@ -40,16 +49,9 @@ import org.apache.maven.shared.model.fil
import org.apache.maven.shared.model.fileset.util.FileSetManager;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
/**
* @author <a href="eveni...@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public abstract class AbstractScmMojo
@@ -166,7 +168,7 @@ public abstract class AbstractScmMojo
*
* @parameter
*/
- private Map providerImplementations;
+ private Map<String,String> providerImplementations;
/**
* Should distributed changes be pushed to the central repository?
@@ -186,7 +188,7 @@ public abstract class AbstractScmMojo
if ( systemProperties != null )
{
// Add all system properties configured by the user
- Iterator iter = systemProperties.keySet().iterator();
+ Iterator<Object> iter = systemProperties.keySet().iterator();
while ( iter.hasNext() )
{
@@ -198,12 +200,12 @@ public abstract class AbstractScmMojo
}
}
- if ( providerImplementations != null )
+ if ( providerImplementations != null &&
!providerImplementations.isEmpty() )
{
- for ( Iterator i = providerImplementations.keySet().iterator();
i.hasNext(); )
+ for ( Entry<String,String> entry :
providerImplementations.entrySet() )
{
- String providerType = (String) i.next();
- String providerImplementation = (String)
providerImplementations.get( providerType );
+ String providerType = entry.getKey();
+ String providerImplementation = entry.getValue();
getLog().info(
"Change the default '" + providerType + "'
provider implementation to '"
+ providerImplementation + "'." );
@@ -337,9 +339,8 @@ public abstract class AbstractScmMojo
{
if ( !e.getValidationMessages().isEmpty() )
{
- for ( Iterator i = e.getValidationMessages().iterator();
i.hasNext(); )
+ for ( String message : e.getValidationMessages() )
{
- String message = (String) i.next();
getLog().error( message );
}
}
@@ -471,7 +472,7 @@ public abstract class AbstractScmMojo
protected void handleExcludesIncludesAfterCheckoutAndExport( File
checkoutDirectory )
throws MojoExecutionException
{
- List includes = new ArrayList();
+ List<String> includes = new ArrayList<String>();
if ( ! StringUtils.isBlank( this.getIncludes() ) )
{
@@ -482,7 +483,7 @@ public abstract class AbstractScmMojo
}
}
- List excludes = new ArrayList();
+ List<String> excludes = new ArrayList<String>();
if ( ! StringUtils.isBlank( this.getExcludes() ) )
{
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
Sat Jan 1 09:45:44 2011
@@ -19,6 +19,11 @@ package org.apache.maven.scm.plugin;
* under the License.
*/
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
@@ -28,16 +33,11 @@ import org.apache.maven.scm.command.chan
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-
/**
* Dump changelog contents to console. It is mainly used to test
maven-scm-api's changelog command.
*
* @author <a href="dant...@gmail.com">Dan Tran</a>
+ * @author Olivier Lamy
* @version $Id$
* @goal changelog
* @aggregator
@@ -112,11 +112,9 @@ public class ChangeLogMojo
ChangeLogSet changeLogSet = result.getChangeLog();
- for ( Iterator i = changeLogSet.getChangeSets().iterator();
i.hasNext(); )
+ for ( ChangeSet changeSet : changeLogSet.getChangeSets() )
{
- ChangeSet changeSet = (ChangeSet) i.next();
-
- System.out.println( changeSet.toString() );
+ getLog().info( changeSet.toString() );
}
}
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java
Sat Jan 1 09:45:44 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.plugin;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -26,14 +29,11 @@ import org.apache.maven.scm.command.stat
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-
/**
* Display the modification status of the files in the configured scm url.
*
* @author <a href="eveni...@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
* @goal status
* @aggregator
@@ -60,16 +60,13 @@ public class StatusMojo
// Determine the maximum length of the status column
int maxLen = 0;
- for ( Iterator iter = result.getChangedFiles().iterator();
iter.hasNext(); )
+ for ( ScmFile file : result.getChangedFiles() )
{
- ScmFile file = (ScmFile) iter.next();
maxLen = Math.max( maxLen,
file.getStatus().toString().length() );
}
- for ( Iterator iter = result.getChangedFiles().iterator();
iter.hasNext(); )
+ for ( ScmFile file : result.getChangedFiles() )
{
- ScmFile file = (ScmFile) iter.next();
-
// right align all of the statuses
getLog().info(
StringUtils.leftPad(
file.getStatus().toString(), maxLen ) + " status for "
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java?rev=1054215&r1=1054214&r2=1054215&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
Sat Jan 1 09:45:44 2011
@@ -28,6 +28,7 @@ import java.util.List;
* Validate scm connection string.
*
* @author <a href="eveni...@apache.org">Emmanuel Venisse</a>
+ * @author Olivier Lamy
* @version $Id$
* @goal validate
* @execute phase="validate"
@@ -83,13 +84,13 @@ public class ValidateMojo
private void validateConnection( String connectionString, String type )
throws MojoExecutionException
{
- List messages = getScmManager().validateScmRepository(
connectionString );
+ List<String> messages = getScmManager().validateScmRepository(
connectionString );
if ( !messages.isEmpty() )
{
getLog().error( "Validation of scm url connection (" + type + ")
failed :" );
- Iterator iter = messages.iterator();
+ Iterator<String> iter = messages.iterator();
while ( iter.hasNext() )
{
