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/09 12:58:18 UTC
[netbeans-mavenutils-nb-repository-plugin] 02/13: Hack for
maven-embedder adding his lib as wrapper
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-nb-repository-plugin.git
commit aa8c27aae1a251f9dfd61e31935d9231e183f689
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Jan 11 14:02:37 2019 +0100
Hack for maven-embedder adding his lib as wrapper
---
nbm-maven-plugin/pom.xml | 4 ++--
.../src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/nbm-maven-plugin/pom.xml b/nbm-maven-plugin/pom.xml
index 4196c54..930fad3 100644
--- a/nbm-maven-plugin/pom.xml
+++ b/nbm-maven-plugin/pom.xml
@@ -479,9 +479,9 @@
</dependency>
<dependency>
<!-- use harness from NetBeans 8.2 -->
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-harness</artifactId>
- <version>9.0-SNAPSHOT</version>
+ <version>8.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/nbm-maven-plugin/src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java b/nbm-maven-plugin/src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java
index 1c7f1ed..ecfd060 100644
--- a/nbm-maven-plugin/src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java
+++ b/nbm-maven-plugin/src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java
@@ -398,7 +398,13 @@ public class CreateClusterAppMojo
//ex.setPopulateDependencies( true );
ex.checkFile();
if (ex.isOsgiBundle()) {
- wrappedBundleCNBs.add( ex.getModule() );
+ if (art.getId().contains("org.netbeans.modules:org-netbeans-modules-maven-embedder")) {
+ // in this case we dont want module-maven-embedder to be considered as wrapper for his libs
+ // guava is provided but ide have it also
+ } else {
+ getLog().info(ex.getModule() + " added by " + art.getId() + "" + classpathFile);
+ wrappedBundleCNBs.add(ex.getModule());
+ }
}
}
}
---------------------------------------------------------------------
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