Author: brett
Date: Tue Dec 20 06:39:21 2011
New Revision: 1221117
URL: http://svn.apache.org/viewvc?rev=1221117&view=rev
Log:
generate settings as part of an NPanday build as well, so that it works out of
the box. Adjust location that plugins are copied to relative to the project
generating the settings
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
incubator/npanday/trunk/dotnet/pom.xml
Modified:
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java?rev=1221117&r1=1221116&r2=1221117&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
(original)
+++
incubator/npanday/trunk/components/dotnet-plugin/src/main/java/npanday/plugin/AbstractMojo.java
Tue Dec 20 06:39:21 2011
@@ -155,7 +155,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,
vendorRequirement,
getLocalRepository(), paramFile,
getClassName(),
targetDir ).execute();
@@ -178,7 +178,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())
@@ -199,8 +201,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/trunk/dotnet/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/pom.xml?rev=1221117&r1=1221116&r2=1221117&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/pom.xml Tue Dec 20 06:39:21 2011
@@ -105,10 +105,6 @@ under the License.
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.Settings.JavaBinding</artifactId>
<version>${bootstrap.npanday.version}</version>
- <configuration>
- <!-- TODO: why was that skipped??? -->
- <skip>true</skip>
- </configuration>
</plugin>
</plugins>
</pluginManagement>
