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:00 UTC
[netbeans-mavenutils-archetype-nbm-archetype] 13/13: try a
parameter to allow different groupID prefix
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-archetype-nbm-archetype.git
commit fa573f4d4fc02dae5c0ce00f8fd7cf093741b103
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Mar 21 15:27:33 2019 +0100
try a parameter to allow different groupID prefix
---
.../main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
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 9dae78e..1bdf9bb 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
@@ -141,6 +141,12 @@ public class CreateClusterAppMojo
@Parameter(defaultValue = "true", property = "netbeans.verify.integrity")
private boolean verifyIntegrity;
+ /**
+ * @since 4.12
+ */
+ @Parameter(defaultValue ="org.netbeans", property = "groupIdPrefix")
+ private String groupIdPrefix;
+
private final Collection<String> defaultPlatformTokens = Arrays.asList( new String[] {
"org.openide.modules.os.Windows",
"org.openide.modules.os.Unix",
@@ -398,8 +404,7 @@ public class CreateClusterAppMojo
//ex.setPopulateDependencies( true );
ex.checkFile();
if (ex.isOsgiBundle()) {
- if ( art.getId().contains("org.netbeans.modules:org-netbeans-modules-maven-embedder") ||
- art.getId().contains("org.apache.netbeans.modules:org-netbeans-modules-maven-embedder") )
+ if ( art.getId().contains( groupIdPrefix + ".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
@@ -954,7 +959,7 @@ public class CreateClusterAppMojo
Set<Artifact> artifacts = project.getArtifacts();
String version = null;
for (Artifact a : artifacts) {
- if (( "org.apache.netbeans.modules".equals(a.getGroupId()) || "org.netbeans.modules".equals(a.getGroupId())) && "org-netbeans-bootstrap".equals(a.getArtifactId())) {
+ if ( (groupIdPrefix + ".modules").equals(a.getGroupId()) && "org-netbeans-bootstrap".equals(a.getArtifactId())) {
version = a.getBaseVersion(); //base version in non-snapshot should equals version, in snapshots to X-SNAPSHOT, not timestamp
break;
}
@@ -963,7 +968,7 @@ public class CreateClusterAppMojo
throw new MojoExecutionException( "We could not find org-netbeans-bootstrap among the modules in the application. Launchers could not be found.");
}
Artifact nbmArt = artifactFactory.createArtifact(
- "org.apache.netbeans.modules",
+ groupIdPrefix + ".modules",
"org-netbeans-modules-apisupport-harness",
version,
"compile",
---------------------------------------------------------------------
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