You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/03 13:16:19 UTC
svn commit: r682128 - in
/maven/release/trunk/maven-release-manager/src/main/java/org:
apache/maven/shared/release/phase/ apache/maven/shared/release/versions/
codehaus/plexus/util/xml/
Author: bentmann
Date: Sun Aug 3 04:16:18 2008
New Revision: 682128
URL: http://svn.apache.org/viewvc?rev=682128&view=rev
Log:
o Fixed case-insensitive string comparisons
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java
maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=682128&r1=682127&r2=682128&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Sun Aug 3 04:16:18 2008
@@ -42,6 +42,7 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -178,7 +179,7 @@
result = "yes";
}
- if ( result.toLowerCase().startsWith( "y" ) )
+ if ( result.toLowerCase( Locale.ENGLISH ).startsWith( "y" ) )
{
addToFailures = false;
releaseDescriptor.setSnapshotReleasePluginAllowed( true );
@@ -319,7 +320,7 @@
String result =
prompter.prompt( RESOLVE_SNAPSHOT_PROMPT, Arrays.asList( new String[]{"yes", "no"} ), "no" );
- if ( result.toLowerCase().startsWith( "y" ) )
+ if ( result.toLowerCase( Locale.ENGLISH ).startsWith( "y" ) )
{
Set snapshotSet = new HashSet();
Map resolvedSnapshots = null;
@@ -327,7 +328,7 @@
result = prompter.prompt( RESOLVE_SNAPSHOT_TYPE_PROMPT,
Arrays.asList( new String[]{"0", "1", "2", "3"} ), "1" );
- switch ( Integer.parseInt( result.toLowerCase() ) )
+ switch ( Integer.parseInt( result.toLowerCase( Locale.ENGLISH ) ) )
{
// all
case 0:
@@ -391,7 +392,7 @@
String result = prompter.prompt( "'" + versionlessKey + "' set to release?",
Arrays.asList( new String[] { "yes", "no" } ), "yes" );
- if ( result.toLowerCase().startsWith( "y" ) )
+ if ( result.toLowerCase( Locale.ENGLISH ).startsWith( "y" ) )
{
iterator.remove();
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java?rev=682128&r1=682127&r2=682128&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java Sun Aug 3 04:16:18 2008
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -233,8 +234,8 @@
else
{
// TODO: this is a workaround for a bug in DefaultArtifactVersion - fix there - it should not consider case in comparing the qualifier
- String thisVersion = strVersion.toLowerCase();
- String thatVersion = that.strVersion.toLowerCase();
+ String thisVersion = strVersion.toUpperCase( Locale.ENGLISH ).toLowerCase( Locale.ENGLISH );
+ String thatVersion = that.strVersion.toUpperCase( Locale.ENGLISH ).toLowerCase( Locale.ENGLISH );
result = new DefaultArtifactVersion( thisVersion ).compareTo( new DefaultArtifactVersion( thatVersion ) );
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java?rev=682128&r1=682127&r2=682128&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlReader.java Sun Aug 3 04:16:18 2008
@@ -28,6 +28,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.HttpURLConnection;
+import java.util.Locale;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.text.MessageFormat;
@@ -619,7 +620,7 @@
String postMime = httpContentType.substring( i + 1 );
Matcher m = CHARSET_PATTERN.matcher( postMime );
encoding = ( m.find() ) ? m.group( 1 ) : null;
- encoding = ( encoding != null ) ? encoding.toUpperCase() : null;
+ encoding = ( encoding != null ) ? encoding.toUpperCase( Locale.ENGLISH ) : null;
}
}
return encoding;
@@ -742,7 +743,7 @@
Matcher m = ENCODING_PATTERN.matcher( prolog );
if ( m.find() )
{
- encoding = m.group( 1 ).toUpperCase();
+ encoding = m.group( 1 ).toUpperCase( Locale.ENGLISH );
encoding = encoding.substring( 1, encoding.length() - 1 );
}
}
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java?rev=682128&r1=682127&r2=682128&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/codehaus/plexus/util/xml/XmlStreamWriter.java Sun Aug 3 04:16:18 2008
@@ -8,6 +8,7 @@
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -112,7 +113,7 @@
Matcher m = ENCODING_PATTERN.matcher( xmlProlog.substring( 0, xmlPrologEnd ) );
if ( m.find() )
{
- encoding = m.group( 1 ).toUpperCase();
+ encoding = m.group( 1 ).toUpperCase( Locale.ENGLISH );
encoding = encoding.substring( 1, encoding.length() - 1 );
}
else