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 2010/01/02 21:01:21 UTC
svn commit: r895277 - in /maven/maven-3/trunk:
maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Author: bentmann
Date: Sat Jan 2 20:01:19 2010
New Revision: 895277
URL: http://svn.apache.org/viewvc?rev=895277&view=rev
Log:
o Preferred JRE API
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=895277&r1=895276&r2=895277&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Sat Jan 2 20:01:19 2010
@@ -16,7 +16,6 @@
*/
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -25,10 +24,10 @@
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.Map.Entry;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@@ -70,7 +69,7 @@
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.Os;
/**
* @author Jason van Zyl
@@ -704,17 +703,11 @@
if ( envVars == null )
{
Properties tmp = new Properties();
- try
- {
- Properties env = CommandLineUtils.getSystemEnvVars();
- for ( Entry<Object, Object> e : env.entrySet() )
- {
- tmp.setProperty( "env." + e.getKey().toString(), e.getValue().toString() );
- }
- }
- catch ( IOException e )
+ boolean caseSensitive = !Os.isFamily( Os.FAMILY_WINDOWS );
+ for ( Map.Entry<String, String> entry : System.getenv().entrySet() )
{
- logger.debug( "Error getting environment variables: " + e );
+ String key = "env." + ( caseSensitive ? entry.getKey() : entry.getKey().toUpperCase( Locale.ENGLISH ) );
+ tmp.setProperty( key, entry.getValue() );
}
envVars = tmp;
}
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=895277&r1=895276&r2=895277&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Sat Jan 2 20:01:19 2010
@@ -17,16 +17,15 @@
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-import java.util.Map.Entry;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
@@ -53,8 +52,8 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
@@ -907,17 +906,11 @@
{
// add the env vars to the property set, with the "env." prefix
// XXX support for env vars should probably be removed from the ModelInterpolator
- try
- {
- Properties envVars = CommandLineUtils.getSystemEnvVars();
- for ( Entry<Object, Object> e : envVars.entrySet() )
- {
- systemProperties.setProperty( "env." + e.getKey().toString(), e.getValue().toString() );
- }
- }
- catch ( IOException e )
+ boolean caseSensitive = !Os.isFamily( Os.FAMILY_WINDOWS );
+ for ( Map.Entry<String, String> entry : System.getenv().entrySet() )
{
- System.err.println( "Error getting environment vars for profile activation: " + e );
+ String key = "env." + ( caseSensitive ? entry.getKey() : entry.getKey().toUpperCase( Locale.ENGLISH ) );
+ systemProperties.setProperty( key, entry.getValue() );
}
// ----------------------------------------------------------------------