/[Apache-SVN]
ViewVC logotype

Revision 190517


Jump to revision: Previous Next
Author: jdcasey
Date: Mon Jun 13 21:56:00 2005 UTC (19 years, 3 months ago)
Changed paths: 31
Log Message:
o Re-adding support for user-level settings which are not assumed to be in ~ (for continuum and other server-style apps' convenience)

o Adding support for global (installation-level) settings.xml file which is identical to the one in ~/.m2, and which will be overridden by user-level settings. The default location for this is ${maven.home}/settings.xml.

o Adding IT to test merging of global- and user-level settings.xml files

o Moved DefaultMavenSettingsBuilder/MavenSettingsBuilder to maven-settings project, to make them more generally available (to ant, for instance)

Resolves issue: MNG-294



Changed paths

Path Details
Directorymaven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java modified , text changed
Directorymaven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java deleted
Directorymaven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java deleted
Directorymaven/components/trunk/maven-core-it/README.txt modified , text changed
Directorymaven/components/trunk/maven-core-it/integration-tests.txt modified , text changed
Directorymaven/components/trunk/maven-core-it/it0023/system.properties modified , text changed
Directorymaven/components/trunk/maven-core-it/it0026/ added
Directorymaven/components/trunk/maven-core-it/it0026/expected-results.txt added
Directorymaven/components/trunk/maven-core-it/it0026/global-settings.xml added
Directorymaven/components/trunk/maven-core-it/it0026/goals.txt added
Directorymaven/components/trunk/maven-core-it/it0026/pom.xml added
Directorymaven/components/trunk/maven-core-it/it0026/src/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/java/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/java/org/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/java/org/apache/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/java/org/apache/maven/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/java/org/apache/maven/it0023/ added
Directorymaven/components/trunk/maven-core-it/it0026/src/main/java/org/apache/maven/it0023/Person.java added
Directorymaven/components/trunk/maven-core-it/it0026/system.properties added
Directorymaven/components/trunk/maven-core-it/it0026/user-settings.xml added
Directorymaven/components/trunk/maven-settings/pom.xml modified , text changed
Directorymaven/components/trunk/maven-settings/settings.mdo modified , text changed
Directorymaven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(Copied from maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java, r190399)
added , text changed
Directorymaven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
(Copied from maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java, r190399)
added , text changed
Directorymaven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConversionUtils.java deleted
Directorymaven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
(Copied from maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConversionUtils.java, r190399)
added , text changed
Directorymaven/components/trunk/maven-settings/src/main/resources/ added
Directorymaven/components/trunk/maven-settings/src/main/resources/META-INF/ added
Directorymaven/components/trunk/maven-settings/src/main/resources/META-INF/plexus/ added
Directorymaven/components/trunk/maven-settings/src/main/resources/META-INF/plexus/components.xml added

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26