[jira] [Assigned] (NPANDAY-247) exe.config handling is hardcoded and will not deploy to the repository
Brett Porter assigned NPANDAY-247 to Unassigned exe.config handling is hardcoded and will not deploy to the repository Change By: Brett Porter (15/May/12 11:18) Assignee: Brett Porter This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1338574 - /incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
Author: lcorneliussen
Date: Tue May 15 07:40:30 2012
New Revision: 1338574
URL: http://svn.apache.org/viewvc?rev=1338574&view=rev
Log:
[NPANDAY-566] Custom NPanday-aware copy-dependencies plugin
o added parameter for excluding reactor projects
Modified:
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
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=1338574&r1=1338573&r2=1338574&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
Tue May 15 07:40:30 2012
@@ -33,6 +33,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.InversionArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.AbstractMojo;
@@ -43,6 +44,7 @@ import org.codehaus.plexus.util.FileUtil
import java.io.File;
import java.io.IOException;
+import java.util.List;
import java.util.Set;
/**
@@ -104,6 +106,21 @@ public class CopyDependenciesMojo
*/
private boolean skip;
+/**
+ * The reactor projects.
+ *
+ * @parameter expression="${reactorProjects}"
+ */
+protected List reactorProjects;
+
+/**
+ * If specified, Artifacts that are part of the same reactor will not be
copied.
+ * Transitive dependencies of these artifacts will still get copied,
though.
+ *
+ * @parameter default-value="false"
+ */
+private boolean skipReactorArtifacts;
+
public void execute() throws MojoExecutionException, MojoFailureException
{
String skipReason = "";
@@ -163,6 +180,22 @@ public class CopyDependenciesMojo
includeFilter.add( new InversionArtifactFilter( new
ScopeArtifactFilter( excludeScope ) ) );
}
+if ( skipReactorArtifacts ){
+getLog().info( "NPANDAY-158-008: " + reactorProjects );
+
+includeFilter.add( new InversionArtifactFilter( new
ArtifactFilter()
+{
+public boolean include( Artifact artifact )
+{
+for (MavenProject project : reactorProjects){
+if (project.getArtifact().getId().equals(
artifact.getId() ))
+return true;
+}
+return false;
+}
+} ));
+}
+
for ( Artifact dependency : artifacts )
{
if ( !includeFilter.include( dependency ) )
svn commit: r1338569 - /incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
Author: lcorneliussen
Date: Tue May 15 07:13:41 2012
New Revision: 1338569
URL: http://svn.apache.org/viewvc?rev=1338569&view=rev
Log:
[NPANDAY-231] Remove RDF
o skip next resolver contributors, if artifact got resolved
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java?rev=1338569&r1=1338568&r2=1338569&view=diff
==
---
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
Tue May 15 07:13:41 2012
@@ -137,7 +137,6 @@ public class DefaultNPandayArtifactResol
for ( ArtifactResolvingContributor contributor : contributors )
{
-
Set additionalDependenciesCollector = Sets.newHashSet();
contributor.contribute( artifact, additionalDependenciesCollector
);
@@ -157,6 +156,8 @@ public class DefaultNPandayArtifactResol
"NPANDAY-147-001: " + contributor.getClass().getName() + "
resolved " + artifact.getId() + " to "
+ artifact.getFile()
);
+
+return;
}
}
svn commit: r1338565 - /incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
Author: lcorneliussen
Date: Tue May 15 07:02:31 2012
New Revision: 1338565
URL: http://svn.apache.org/viewvc?rev=1338565&view=rev
Log:
[NPANDAY-566] Custom copy dependencies plugin
o fixed typo
Modified:
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
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=1338565&r1=1338564&r2=1338565&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
Tue May 15 07:02:31 2012
@@ -117,7 +117,7 @@ public class CopyDependenciesMojo
{
skip = true;
skipReason =
-", because the current project (type:" +
project.getPackaging() + ") is not build with NPanday";
+", because the current project (type:" +
project.getPackaging() + ") is not built with NPanday";
}
}
svn commit: r1338563 - in /incubator/npanday/trunk: components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java plugins/maven-resolver-plugin/src/main/java/npanday/plugin
Author: lcorneliussen
Date: Tue May 15 07:01:08 2012
New Revision: 1338563
URL: http://svn.apache.org/viewvc?rev=1338563&view=rev
Log:
[NPANDAY-566] Custom copy dependencies plugin
o some more logging
o skip copy-dependencies on non-npanday projects
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/CopyDependenciesMojo.java
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java?rev=1338563&r1=1338562&r2=1338563&view=diff
==
---
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/DefaultNPandayArtifactResolver.java
Tue May 15 07:01:08 2012
@@ -126,36 +126,40 @@ public class DefaultNPandayArtifactResol
protected void runCustomResolvers( Artifact artifact ) throws
ArtifactNotFoundException
{
-if ( contributors == null || contributors.length == 0 )
+if ( artifact.isResolved() )
{
-contributors = new ArtifactResolvingContributor[]{ new
GacResolver() };
+return;
}
+getLogger().debug(
+"NPANDAY-147-007: trying to resolve " + artifact.getId() + " using
resolving contributors"
+);
+
for ( ArtifactResolvingContributor contributor : contributors )
{
-if ( !artifact.isResolved() )
+
+Set additionalDependenciesCollector = Sets.newHashSet();
+contributor.contribute( artifact, additionalDependenciesCollector
);
+
+if ( additionalDependenciesCollector.size() > 0 )
{
-Set additionalDependenciesCollector =
Sets.newHashSet();
-contributor.contribute( artifact,
additionalDependenciesCollector);
+getLogger().error(
+"NPANDAY-147-006: " + artifact.getId()
++ " required additional dependencies to be added, but
we do not support that yet."
+);
+}
-if (additionalDependenciesCollector.size() > 0){
-getLogger().error(
-"NPANDAY-147-006: " + artifact.getId()
-+ " required additional dependencies to be added,
but we do not support that yet."
-);
-}
-
-if ( artifact.isResolved() )
-{
-customResolveCache.add( artifact );
-
-getLogger().info(
-"NPANDAY-147-001: " + contributor.getClass().getName()
+ " resolved " + artifact.getId()
-+ " to " + artifact.getFile()
-);
-}
+if ( artifact.isResolved() )
+{
+customResolveCache.add( artifact );
+
+getLogger().info(
+"NPANDAY-147-001: " + contributor.getClass().getName() + "
resolved " + artifact.getId() + " to "
++ artifact.getFile()
+);
}
}
+
}
public void initialize() throws InitializationException
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=1338563&r1=1338562&r2=1338563&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
Tue May 15 07:01:08 2012
@@ -113,7 +113,7 @@ public class CopyDependenciesMojo
project.getPackaging()
);
-if ( knownType == null )
+if ( knownType.equals( ArtifactType.NULL ))
{
skip = true;
skipReason =
