You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2014/12/23 17:21:40 UTC
maven git commit: Replace usage of deprecated classes with their
alternatives from maven-builder-support
Repository: maven
Updated Branches:
refs/heads/master df2150931 -> 207ccc952
Replace usage of deprecated classes with their alternatives from maven-builder-support
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/207ccc95
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/207ccc95
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/207ccc95
Branch: refs/heads/master
Commit: 207ccc9529523762702aa7920c0fb4bbbd46402a
Parents: df21509
Author: Robert Scholte <rf...@codehaus.org>
Authored: Tue Dec 23 17:21:07 2014 +0100
Committer: Robert Scholte <rf...@codehaus.org>
Committed: Tue Dec 23 17:21:07 2014 +0100
----------------------------------------------------------------------
.../maven/settings/building/DefaultSettingsBuilder.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/207ccc95/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
index 29a4318..359b2c7 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
@@ -27,6 +27,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.apache.maven.building.FileSource;
+import org.apache.maven.building.Source;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.TrackableBase;
import org.apache.maven.settings.io.SettingsParseException;
@@ -86,11 +88,11 @@ public class DefaultSettingsBuilder
{
DefaultSettingsProblemCollector problems = new DefaultSettingsProblemCollector( null );
- SettingsSource globalSettingsSource =
+ Source globalSettingsSource =
getSettingsSource( request.getGlobalSettingsFile(), request.getGlobalSettingsSource() );
Settings globalSettings = readSettings( globalSettingsSource, request, problems );
- SettingsSource userSettingsSource =
+ Source userSettingsSource =
getSettingsSource( request.getUserSettingsFile(), request.getUserSettingsSource() );
Settings userSettings = readSettings( userSettingsSource, request, problems );
@@ -135,7 +137,7 @@ public class DefaultSettingsBuilder
return false;
}
- private SettingsSource getSettingsSource( File settingsFile, SettingsSource settingsSource )
+ private Source getSettingsSource( File settingsFile, Source settingsSource )
{
if ( settingsSource != null )
{
@@ -143,12 +145,12 @@ public class DefaultSettingsBuilder
}
else if ( settingsFile != null && settingsFile.exists() )
{
- return new FileSettingsSource( settingsFile );
+ return new FileSource( settingsFile );
}
return null;
}
- private Settings readSettings( SettingsSource settingsSource, SettingsBuildingRequest request,
+ private Settings readSettings( Source settingsSource, SettingsBuildingRequest request,
DefaultSettingsProblemCollector problems )
{
if ( settingsSource == null )