You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2019/05/23 09:01:48 UTC
[netbeans-mavenutils-nbm-maven-plugin] branch master updated:
[NETBEANS-2553] Let nbm:autoupdate find the same output dir that
nbm:build-installers does.
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 2396e1f [NETBEANS-2553] Let nbm:autoupdate find the same output dir that nbm:build-installers does.
new 06da7b9 Merge pull request #1 from phipma/NETBEANS-2553
2396e1f is described below
commit 2396e1f780073dd7c59f78a89ea255192426c74a
Author: Mark Phipps <mw...@gmail.com>
AuthorDate: Wed May 15 17:26:38 2019 +0100
[NETBEANS-2553] Let nbm:autoupdate find the same output dir that nbm:build-installers does.
---
src/main/java/org/apache/netbeans/nbm/CreateUpdateSiteMojo.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/netbeans/nbm/CreateUpdateSiteMojo.java b/src/main/java/org/apache/netbeans/nbm/CreateUpdateSiteMojo.java
index 3fef630..7dcdf37 100644
--- a/src/main/java/org/apache/netbeans/nbm/CreateUpdateSiteMojo.java
+++ b/src/main/java/org/apache/netbeans/nbm/CreateUpdateSiteMojo.java
@@ -236,15 +236,13 @@ public class CreateUpdateSiteMojo
while ( it.hasNext() )
{
MavenProject proj = (MavenProject) it.next();
- //TODO how to figure where the the buildDir/nbm directory is
- File moduleDir = proj.getFile().getParentFile();
- if ( moduleDir != null && moduleDir.exists() )
+ File projOutputDirectory = new File( proj.getBuild().getDirectory() );
+ if ( projOutputDirectory != null && projOutputDirectory.exists() )
{
Copy copyTask = (Copy) antProject.createTask( "copy" );
if ( !isRepository )
{
FileSet fs = new FileSet();
- File projOutputDirectory = new File( proj.getBuild().getDirectory() );
fs.setDir( projOutputDirectory );
fs.createInclude().setName( "*.nbm" );
copyTask.addFileset( fs );
@@ -254,9 +252,8 @@ public class CreateUpdateSiteMojo
}
else
{
- File target = new File( proj.getBuild().getDirectory() );
boolean has = false;
- File[] fls = target.listFiles();
+ File[] fls = projOutputDirectory.listFiles();
if ( fls != null )
{
for ( File fl : fls )
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists