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:31 UTC
[netbeans-mavenutils-nbm-maven-harness] branch master created (now
fa573f4)
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-harness.git.
at fa573f4 try a parameter to allow different groupID prefix
This branch includes the following new commits:
new f90a284 Upgrade Dependencies for dependencies scan
new aa8c27a Hack for maven-embedder adding his lib as wrapper
new 4fceb70 [maven-release-plugin] prepare for next development iteration
new 7690cae Apache Header reformat
new 0b20ff6 use Apache NetBeans (incubating) parent pom 1, use groupid starting with org.apache.netbeans + utilities
new 08d583a artefact parent group id must be set
new f4d1713 groupid change
new 8712ae3 Use groupid for plexuscomplentfile
new 09f6358 Look for bootstrap in org.apache.netbeans groupId
new decc0ef Merge pull request #8 from ebarboni/jdk11
new 93bc4e9 typo
new 57840ad Change groupid to org.apache.netbeans
new fa573f4 try a parameter to allow different groupID prefix
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 06/13: artefact parent
group id must be set
Posted by sk...@apache.org.
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-harness.git
commit 08d583af7d355f3309f2f0d32596bedac504b77a
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Mar 15 14:21:11 2019 +0100
artefact parent group id must be set
---
.../java/org/netbeans/nbm/repository/PopulateRepositoryMojo.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nb-repository-plugin/src/main/java/org/netbeans/nbm/repository/PopulateRepositoryMojo.java b/nb-repository-plugin/src/main/java/org/netbeans/nbm/repository/PopulateRepositoryMojo.java
index 08cca3b..1cbdb17 100644
--- a/nb-repository-plugin/src/main/java/org/netbeans/nbm/repository/PopulateRepositoryMojo.java
+++ b/nb-repository-plugin/src/main/java/org/netbeans/nbm/repository/PopulateRepositoryMojo.java
@@ -277,7 +277,7 @@ public class PopulateRepositoryMojo
// parent handler in case we have one
private Parent artefactParent = null;
-
+
@Override
public void execute()
throws MojoExecutionException
@@ -285,7 +285,7 @@ public class PopulateRepositoryMojo
getLog().info( "Populate repository with NetBeans modules" );
Project antProject = antProject();
ArtifactRepository deploymentRepository = null;
-
+
if (parentGAV != null)
{
// populate artefactParent
@@ -295,11 +295,11 @@ public class PopulateRepositoryMojo
throw new MojoExecutionException(
"parentGAV should respect the following format groupId:artefactId:version" );
}
- artefactParent.setArtifactId( split[0] );
+ artefactParent.setGroupId( split[0] );
artefactParent.setArtifactId( split[1] );
artefactParent.setVersion( split[2] );
}
-
+
if ( deployUrl != null )
{
ArtifactRepositoryLayout layout = new DefaultRepositoryLayout();
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 07/13: groupid change
Posted by sk...@apache.org.
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-harness.git
commit f4d1713ea3692707d8dbcbb0f552ca1a4e7f3a76
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 16 14:54:55 2019 +0100
groupid change
---
.../src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 7 +++++--
1 file changed, 5 insertions(+), 2 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 ecfd060..92e8713 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,10 +398,13 @@ public class CreateClusterAppMojo
//ex.setPopulateDependencies( true );
ex.checkFile();
if (ex.isOsgiBundle()) {
- if (art.getId().contains("org.netbeans.modules:org-netbeans-modules-maven-embedder")) {
+ if ( (art.getId().contains("org.netbeans.modules:org-netbeans-modules-maven-embedder") ||
+ (art.getId().contains("org.apache.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 {
+ } 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
[netbeans-mavenutils-nbm-maven-harness] 05/13: use Apache NetBeans
(incubating) parent pom 1,
use groupid starting with org.apache.netbeans + utilities
Posted by sk...@apache.org.
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-harness.git
commit 0b20ff6dd0ac0474b2004b78f623f059c597be6a
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Mar 15 11:53:57 2019 +0100
use Apache NetBeans (incubating) parent pom 1, use groupid starting with org.apache.netbeans + utilities
---
nb-repository-plugin/pom.xml | 2 +-
nbm-maven-harness/pom.xml | 2 +-
nbm-maven-plugin/pom.xml | 2 +-
nbm-shared/pom.xml | 2 +-
parent/pom.xml | 74 +++++++++++++-------------------------------
webskin/pom.xml | 2 +-
6 files changed, 27 insertions(+), 57 deletions(-)
diff --git a/nb-repository-plugin/pom.xml b/nb-repository-plugin/pom.xml
index e4a5871..7d9ac8c 100644
--- a/nb-repository-plugin/pom.xml
+++ b/nb-repository-plugin/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>utilities-parent</artifactId>
<version>1-SNAPSHOT</version>
</parent>
diff --git a/nbm-maven-harness/pom.xml b/nbm-maven-harness/pom.xml
index db3def4..69dd510 100644
--- a/nbm-maven-harness/pom.xml
+++ b/nbm-maven-harness/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>utilities-parent</artifactId>
<version>1-SNAPSHOT</version>
</parent>
diff --git a/nbm-maven-plugin/pom.xml b/nbm-maven-plugin/pom.xml
index 4bcdb17..59043f6 100644
--- a/nbm-maven-plugin/pom.xml
+++ b/nbm-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>utilities-parent</artifactId>
<version>1-SNAPSHOT</version>
</parent>
diff --git a/nbm-shared/pom.xml b/nbm-shared/pom.xml
index c1aac41..4530256 100644
--- a/nbm-shared/pom.xml
+++ b/nbm-shared/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>utilities-parent</artifactId>
<version>1-SNAPSHOT</version>
</parent>
diff --git a/parent/pom.xml b/parent/pom.xml
index 259fbb5..959c232 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,12 +1,30 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <groupId>org.apache.netbeans</groupId>
+ <artifactId>netbeans-parent</artifactId>
+ <version>1</version>
</parent>
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>utilities-parent</artifactId>
<version>1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -20,54 +38,6 @@
<distribution>repo</distribution>
</license>
</licenses>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/projects/NETBEANS</url>
- </issueManagement>
- <mailingLists>
- <mailingList>
- <name>Apache Netbeans (incubating) Users List</name>
- <subscribe>users-subscribe@netbeans.incubator.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@netbeans.incubator.apache.org</unsubscribe>
- <post>mailto:users@netbeans.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/netbeans-users/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Netbeans (incubating) Dev List</name>
- <subscribe>dev-subscribe@netbeans.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@netbeans.incubator.apache.org</unsubscribe>
- <post>mailto:dev@netbeans.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/netbeans-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Netbeans (incubating) NetCAT List</name>
- <subscribe>netcat-subscribe@netbeans.incubator.apache.org</subscribe>
- <unsubscribe>netcat-unsubscribe@netbeans.incubator.apache.org</unsubscribe>
- <post>mailto:netcat@netbeans.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/netbeans-netcat/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Netbeans (incubating) Announcements List</name>
- <subscribe>announce-subscribe@netbeans.incubator.apache.org</subscribe>
- <unsubscribe>announce-unsubscribe@netbeans.incubator.apache.org</unsubscribe>
- <post>mailto:announce@netbeans.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/netbeans-announce/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Netbeans (incubating) Commits List</name>
- <subscribe>commits-subscribe@netbeans.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@netbeans.incubator.apache.org</unsubscribe>
- <post>mailto:commits@netbeans.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/netbeans-commits/</archive>
- </mailingList>
- <mailingList>
- <name>Apache Netbeans (incubating) Notifications List</name>
- <subscribe>notifications-subscribe@netbeans.incubator.apache.org</subscribe>
- <unsubscribe>notifications-unsubscribe@netbeans.incubator.apache.org</unsubscribe>
- <post>mailto:notifications@netbeans.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/netbeans-notifications/</archive>
- </mailingList>
- </mailingLists>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-netbeans-mavenutils.git</connection>
<developerConnection>scm:git:gitbox.apache.org/repos/asf/incubator-netbeans-mavenutils.git</developerConnection>
diff --git a/webskin/pom.xml b/webskin/pom.xml
index 949e8dd..0139885 100644
--- a/webskin/pom.xml
+++ b/webskin/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.netbeans.maven</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>utilities-parent</artifactId>
<version>1-SNAPSHOT</version>
</parent>
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 01/13: Upgrade Dependencies
for dependencies scan
Posted by sk...@apache.org.
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-harness.git
commit f90a2844294681a1cbefcd67a034fc7fed289ebe
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Jan 11 14:01:10 2019 +0100
Upgrade Dependencies for dependencies scan
---
nbm-maven-plugin/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nbm-maven-plugin/pom.xml b/nbm-maven-plugin/pom.xml
index c7ddb3e..4196c54 100644
--- a/nbm-maven-plugin/pom.xml
+++ b/nbm-maven-plugin/pom.xml
@@ -448,7 +448,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
- <version>1.10</version>
+ <version>1.11.1</version>
</dependency>
<!-- maven dependecy analyser version 1.8 will have the correct dependency -->
<dependency>
@@ -479,9 +479,9 @@
</dependency>
<dependency>
<!-- use harness from NetBeans 8.2 -->
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.netbeans.maven</groupId>
<artifactId>nbm-maven-harness</artifactId>
- <version>8.2</version>
+ <version>9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 04/13: Apache Header
reformat
Posted by sk...@apache.org.
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-harness.git
commit 7690cae978a5badfb96f37fcc0d66cee5c5cf821
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Mar 15 11:31:24 2019 +0100
Apache Header reformat
---
netbeansparent/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/netbeansparent/pom.xml b/netbeansparent/pom.xml
index 9200d17..210ec15 100644
--- a/netbeansparent/pom.xml
+++ b/netbeansparent/pom.xml
@@ -8,7 +8,9 @@ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 02/13: Hack for
maven-embedder adding his lib as wrapper
Posted by sk...@apache.org.
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-harness.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
[netbeans-mavenutils-nbm-maven-harness] 10/13: Merge pull request
#8 from ebarboni/jdk11
Posted by sk...@apache.org.
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-harness.git
commit decc0ef313106cd76e84db465c56f63080262ae7
Merge: 09f6358 f4d1713
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 16 16:10:27 2019 +0100
Merge pull request #8 from ebarboni/jdk11
support for Apache NetBeans 10 artefacts and jdk > 8
nbm-maven-plugin/pom.xml | 2 +-
.../src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 08/13: Use groupid for
plexuscomplentfile
Posted by sk...@apache.org.
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-harness.git
commit 8712ae308a8732e679201540a305ec2ebe4adb0c
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 16 16:08:45 2019 +0100
Use groupid for plexuscomplentfile
---
.../src/main/resources/META-INF/plexus/components.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nbm-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/nbm-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index e7355a2..2e489fb 100644
--- a/nbm-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/nbm-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -73,13 +73,13 @@ under the License.
<phases>
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
- <process-classes>org.netbeans.maven:nbm-maven-plugin:manifest</process-classes>
+ <process-classes>org.apache.netbeans.utilities:nbm-maven-plugin:manifest</process-classes>
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
<package>org.apache.maven.plugins:maven-jar-plugin:jar,
- org.netbeans.maven:nbm-maven-plugin:branding,
- org.netbeans.maven:nbm-maven-plugin:nbm
+ org.apache.netbeans.utilities:nbm-maven-plugin:branding,
+ org.apache.netbeans.utilities:nbm-maven-plugin:nbm
</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
@@ -95,7 +95,7 @@ under the License.
<phases>
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
- <package>org.netbeans.maven:nbm-maven-plugin:cluster-app,org.netbeans.maven:nbm-maven-plugin:standalone-zip</package>
+ <package>org.apache.netbeans.utilities:nbm-maven-plugin:cluster-app,org.apache.netbeans.utilities:nbm-maven-plugin:standalone-zip</package>
<integration-test>org.apache.maven.plugins:maven-surefire-plugin:test</integration-test>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 09/13: Look for bootstrap
in org.apache.netbeans groupId
Posted by sk...@apache.org.
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-harness.git
commit 09f63584ff2c94454dec657ca1424cdd91ed2061
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 16 16:09:26 2019 +0100
Look for bootstrap in org.apache.netbeans groupId
---
.../src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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..e4e39c5 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
@@ -945,7 +945,7 @@ public class CreateClusterAppMojo
Set<Artifact> artifacts = project.getArtifacts();
String version = null;
for (Artifact a : artifacts) {
- if ("org.netbeans.modules".equals(a.getGroupId()) && "org-netbeans-bootstrap".equals(a.getArtifactId())) {
+ if (( "org.apache.netbeans.modules".equals(a.getGroupId()) || "org.netbeans.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;
}
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 12/13: Change groupid to
org.apache.netbeans
Posted by sk...@apache.org.
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-harness.git
commit 57840ad4fc6832e5f6f41fc081b32d0d51c697d7
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 16 17:17:31 2019 +0100
Change groupid to org.apache.netbeans
---
.../src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 76e1a3f..9dae78e 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
@@ -963,7 +963,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.netbeans.modules",
+ "org.apache.netbeans.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
[netbeans-mavenutils-nbm-maven-harness] 03/13:
[maven-release-plugin] prepare for next development iteration
Posted by sk...@apache.org.
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-harness.git
commit 4fceb70882afe4e859eed25ba88592ac46db0d2d
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Wed Feb 20 17:53:56 2019 +0100
[maven-release-plugin] prepare for next development iteration
---
netbeansparent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/netbeansparent/pom.xml b/netbeansparent/pom.xml
index 3d83451..9200d17 100644
--- a/netbeansparent/pom.xml
+++ b/netbeansparent/pom.xml
@@ -28,7 +28,7 @@ under the License.
<groupId>org.apache.netbeans</groupId>
<artifactId>netbeans-parent</artifactId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Netbeans</name>
@@ -99,7 +99,7 @@ under the License.
<connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-netbeans-mavenutils.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-netbeans-mavenutils.git</developerConnection>
<url>https://github.com/apache/incubator-netbeans-mavenutils</url>
- <tag>org-apache-netbeans-parent-1-vc1</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
<system>jira</system>
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 11/13: typo
Posted by sk...@apache.org.
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-harness.git
commit 93bc4e9866a279eaf08d8a065145e96feca7a38a
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 16 16:15:58 2019 +0100
typo
---
.../src/main/java/org/netbeans/nbm/CreateClusterAppMojo.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 75ea55d..76e1a3f 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,8 +398,8 @@ 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("org.netbeans.modules:org-netbeans-modules-maven-embedder") ||
+ art.getId().contains("org.apache.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
---------------------------------------------------------------------
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
[netbeans-mavenutils-nbm-maven-harness] 13/13: try a parameter to
allow different groupID prefix
Posted by sk...@apache.org.
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-harness.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