Author: brett
Date: Fri Jul 4 11:24:30 2014
New Revision: 1607835
URL: http://svn.apache.org/r1607835
Log:
[NPANDAY-570] make npanday-settings.xml optional
fallback to the PATH and other pre-configured settings when not present
Modified:
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ListDependenciesMojo.java
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java?rev=1607835&r1=1607834&r2=1607835&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java
(original)
+++
incubator/npanday/trunk/components/dotnet-vendor/src/main/java/npanday/vendor/SettingsUtil.java
Fri Jul 4 11:24:30 2014
@@ -119,25 +119,7 @@ public class SettingsUtil
log,
repositoryRegistry,
settingsPathOrFile,
- /* throw error, if file doesn't exist on windows */
- Os.isFamily( Os.FAMILY_WINDOWS ) );
- }
-
- /**
- * Applies the custom settings provided in settingsPathOrFile, if the file
does exist.
- *
- * @param settingsPathOrFile If a path, 'npanday-settings.xml' is added.
- * @throws MojoExecutionException If anything goes wrong
reddddddddddddddddddading or initializing the settings
- */
- public static boolean applyCustomSettingsIfAvailable( Log log,
RepositoryRegistry repositoryRegistry,
- String settingsPathOrFile)
- throws MojoExecutionException
- {
- return overrideDefaultSettings(
- log,
- repositoryRegistry,
- settingsPathOrFile,
- /*throw error, if file doesn exist*/ false );
+ false );
}
Modified:
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java?rev=1607835&r1=1607834&r2=1607835&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
Fri Jul 4 11:24:30 2014
@@ -151,7 +151,7 @@ public class CopyDependenciesMojo
return;
}
- SettingsUtil.applyCustomSettingsIfAvailable( getLog(),
repositoryRegistry, settingsPath );
+ SettingsUtil.applyCustomSettings( getLog(), repositoryRegistry,
settingsPath );
AndArtifactFilter includeFilter = new AndArtifactFilter();
Modified:
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ListDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ListDependenciesMojo.java?rev=1607835&r1=1607834&r2=1607835&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ListDependenciesMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ListDependenciesMojo.java
Fri Jul 4 11:24:30 2014
@@ -20,14 +20,9 @@
package npanday.plugin.resolver;
import com.google.common.base.Strings;
-import npanday.ArtifactType;
import npanday.LocalRepositoryUtil;
-import npanday.PathUtil;
import npanday.registry.RepositoryRegistry;
import npanday.resolver.NPandayDependencyResolution;
-import npanday.resolver.filter.DotnetExecutableArtifactFilter;
-import npanday.resolver.filter.DotnetLibraryArtifactFilter;
-import npanday.resolver.filter.OrArtifactFilter;
import npanday.vendor.SettingsUtil;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -39,11 +34,8 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.FileUtils;
-import org.reflections.vfs.SystemDir;
import java.io.File;
-import java.io.IOException;
import java.util.List;
import java.util.Set;
@@ -130,7 +122,7 @@ public class ListDependenciesMojo
return;
}
- SettingsUtil.applyCustomSettingsIfAvailable( getLog(),
repositoryRegistry, settingsPath );
+ SettingsUtil.applyCustomSettings( getLog(), repositoryRegistry,
settingsPath );
AndArtifactFilter includeFilter = new AndArtifactFilter();
Modified:
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java?rev=1607835&r1=1607834&r2=1607835&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/ResolveMojo.java
Fri Jul 4 11:24:30 2014
@@ -18,34 +18,21 @@
*/
package npanday.plugin.resolver;
-import com.google.common.collect.Sets;
import npanday.LocalRepositoryUtil;
import npanday.registry.RepositoryRegistry;
-import npanday.resolver.NPandayArtifactResolver;
import npanday.resolver.NPandayDependencyResolution;
-import npanday.resolver.filter.DotnetAssemblyArtifactFilter;
import npanday.resolver.filter.DotnetSymbolsArtifactFilter;
-import npanday.resolver.filter.OrArtifactFilter;
import npanday.vendor.SettingsUtil;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import java.io.File;
-import java.util.Set;
/**
* Resolves .NET assemblies from special locations, as for example the GAC.
@@ -114,7 +101,7 @@ public class ResolveMojo
return;
}
- SettingsUtil.applyCustomSettingsIfAvailable( getLog(),
repositoryRegistry, settingsPath );
+ SettingsUtil.applyCustomSettings( getLog(), repositoryRegistry,
settingsPath );
getLog().warn(
"NPANDAY-149-002: Mojo for resolving dependencies beforehand is
executed! It should only be run, "
