You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2011/12/20 07:06:41 UTC
svn commit: r1221125 - in /incubator/npanday/branches/npanday-1.4.x: ./
components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
dotnet/pom.xml
Author: brett
Date: Tue Dec 20 07:06:41 2011
New Revision: 1221125
URL: http://svn.apache.org/viewvc?rev=1221125&view=rev
Log:
merge fix for plugin resolution from trunk
Modified:
incubator/npanday/branches/npanday-1.4.x/ (props changed)
incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml
Propchange: incubator/npanday/branches/npanday-1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 07:06:41 2011
@@ -1,4 +1,4 @@
/incubator/npanday/branches/NPANDAY-410:1210743-1210765
/incubator/npanday/branches/npanday-uac-removed:1002005-1024539
/incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
-/incubator/npanday/trunk:1221087,1221092,1221101,1221116
+/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117
Modified: incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1221125&r1=1221124&r2=1221125&view=diff
==============================================================================
--- incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java (original)
+++ incubator/npanday/branches/npanday-1.4.x/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java Tue Dec 20 07:06:41 2011
@@ -162,7 +162,7 @@ public abstract class AbstractMojo
artifactContext.init( project, project.getRemoteArtifactRepositories(), new File( localRepository ) );
Artifact artifact = getNetExecutableFactory().getArtifactFor(getMojoGroupId(), getMojoArtifactId());
- resolveArtifact(artifact, targetDir );
+ resolveArtifact(project, artifact, targetDir);
getNetExecutableFactory().getPluginLoaderFor( artifact, vendorInfo, localRepository, paramFile,
getClassName(), targetDir ).execute();
}
@@ -184,7 +184,9 @@ public abstract class AbstractMojo
postExecute();
}
- private void resolveArtifact( Artifact artifact, File targetDir ) throws ComponentLookupException, MojoExecutionException {
+ private void resolveArtifact( MavenProject project, Artifact artifact, File targetDir )
+ throws ComponentLookupException, MojoExecutionException
+ {
File localRepository = new File(getLocalRepository());
if (PathUtil.getPrivateApplicationBaseFileFor(artifact, localRepository, targetDir ).exists())
@@ -205,8 +207,9 @@ public abstract class AbstractMojo
try
{
- assemblyResolver.resolveTransitivelyFor(new MavenProject(), Collections.singletonList(dependency), getMavenProject().getRemoteArtifactRepositories(),
- localRepository, false);
+ assemblyResolver.resolveTransitivelyFor( project, Collections.singletonList( dependency ),
+ project.getRemoteArtifactRepositories(), localRepository,
+ false );
}
catch( NPandayArtifactResolutionException e )
{
Modified: incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml?rev=1221125&r1=1221124&r2=1221125&view=diff
==============================================================================
--- incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml (original)
+++ incubator/npanday/branches/npanday-1.4.x/dotnet/pom.xml Tue Dec 20 07:06:41 2011
@@ -104,9 +104,6 @@ under the License.
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.Settings.JavaBinding</artifactId>
<version>${bootstrap.npanday.version}</version>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
</plugins>
</pluginManagement>