Author: jdcasey Date: Fri Jun 17 07:34:18 2005 New Revision: 191163 URL: http://svn.apache.org/viewcvs?rev=191163&view=rev Log: Resolving issue: MNG-480
o Added support for -Dmaven.repo.local command line override of the local repo o Propagating local repository location (either maven.repo.local, or from settings.xml) to ITs in Verifier o Re-enabled it0023 and it0026 o Removed warning in README.txt for maven-core-it. Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java maven/components/trunk/maven-core-it/README.txt maven/components/trunk/maven-core-it/integration-tests.txt maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java Modified: maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=191163&r1=191162&r2=191163&view=diff ============================================================================== --- maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java (original) +++ maven/components/trunk/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java Fri Jun 17 07:34:18 2005 @@ -499,6 +499,8 @@ String key = (String) i.next(); cli.createArgument().setLine( "-D" + key + "=" + properties.getProperty( key ) ); } + + cli.createArgument().setLine( "-Dmaven.repo.local=" + localRepo ); for ( Iterator i = allGoals.iterator(); i.hasNext(); ) { Modified: maven/components/trunk/maven-core-it/README.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=191163&r1=191162&r2=191163&view=diff ============================================================================== --- maven/components/trunk/maven-core-it/README.txt (original) +++ maven/components/trunk/maven-core-it/README.txt Fri Jun 17 07:34:18 2005 @@ -85,17 +85,6 @@ ------------------------------------------------------------------------------- -============================== -NOTE: About it0023 and it0026 -============================== -I am disabling these for now, because they depend on locally-supplied settings -files, and need to know the location of the local repository where the plugin -builds were deposited in order to work. This is why they will result in -ArtifactResolutionException's...they literally cannot find the plugins in the -local repository, because they wind up using the default local repository. -============================= - - - generated sources - generated resources from sources - generated resources from generated sources Modified: maven/components/trunk/maven-core-it/integration-tests.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=191163&r1=191162&r2=191163&view=diff ============================================================================== --- maven/components/trunk/maven-core-it/integration-tests.txt (original) +++ maven/components/trunk/maven-core-it/integration-tests.txt Fri Jun 17 07:34:18 2005 @@ -21,7 +21,7 @@ it0020 it0021 it0022 -#it0023 +it0023 it0024 it0025 -#it0026 +it0026 Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=191163&r1=191162&r2=191163&view=diff ============================================================================== --- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original) +++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Fri Jun 17 07:34:18 2005 @@ -115,7 +115,17 @@ SettingsUtils.merge( userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL ); - if ( userSettings.getLocalRepository() == null || userSettings.getLocalRepository().length() < 1 ) + // try using the local repository specified on the command line... + String localRepository = System.getProperty( MavenSettingsBuilder.ALT_LOCAL_REPOSITORY_LOCATION ); + + // otherwise, use the one in settings.xml + if ( localRepository == null || localRepository.length() < 1 ) + { + localRepository = userSettings.getLocalRepository(); + } + + // if both are missing, default to ~/.m2/repository. + if ( localRepository == null || localRepository.length() < 1 ) { File mavenUserConfigurationDirectory = new File( userHome, ".m2" ); if ( !mavenUserConfigurationDirectory.exists() ) @@ -126,10 +136,10 @@ } } - String localRepository = new File( mavenUserConfigurationDirectory, "repository" ).getAbsolutePath(); - - userSettings.setLocalRepository( localRepository ); + localRepository = new File( mavenUserConfigurationDirectory, "repository" ).getAbsolutePath(); } + + userSettings.setLocalRepository( localRepository ); return userSettings; } Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java?rev=191163&r1=191162&r2=191163&view=diff ============================================================================== --- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (original) +++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java Fri Jun 17 07:34:18 2005 @@ -31,6 +31,7 @@ String ALT_USER_SETTINGS_XML_LOCATION = "org.apache.maven.user-settings"; String ALT_GLOBAL_SETTINGS_XML_LOCATION = "org.apache.maven.global-settings"; + String ALT_LOCAL_REPOSITORY_LOCATION = "maven.repo.local"; Settings buildSettings() throws IOException, XmlPullParserException; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]