website houskeeping
diff --git a/.asf.yaml b/.asf.yaml
index d80ae49..8ab6791 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,7 +21,7 @@
- netbeans
features:
wiki: false
- issues: false
+ issues: true
projects: false
enabled_merge_buttons:
squash: true
diff --git a/NOTICE b/NOTICE
index 80bd77e..9f0d8ae 100755
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache NetBeans Utilities
-Copyright 2018-2022 The Apache Software Foundation
+Copyright 2018-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index 27d8382..a1481b6 100755
--- a/README.md
+++ b/README.md
@@ -23,7 +23,15 @@
[](https://ci-builds.apache.org/job/Netbeans/job/netbeans-maven-TLP/job/netbeans-mavenutils-nbm-maven-plugin/job/master/)
-[Documentation Site](https://bits.netbeans.org/mavenutilities/parent)
+[](https://search.maven.org/artifact/org.apache.netbeans.utilities/utilities-parent)
+[](https://search.maven.org/artifact/org.apache.netbeans.utilities/nbm-maven-harness)
+[](https://search.maven.org/artifact/org.apache.netbeans.utilities/nb-shared)
+[](https://search.maven.org/artifact/org.apache.netbeans.utilities/nb-repository-plugin)
+[](https://search.maven.org/artifact/org.apache.netbeans.utilities/nbm-maven-plugin)
+
+
+
+[Documentation Site](https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/)
### Get In Touch
@@ -33,5 +41,5 @@
### Reporting Bugs
-Bugs should be reported to https://issues.apache.org/jira/projects/NETBEANS/issues/ using the component **mavenutilities**
+Report issue at [repository issue section](https://github.com/apache/netbeans-mavenutils-nbm-maven-plugin/issues)
diff --git a/nb-repository-plugin/README.md b/nb-repository-plugin/README.md
deleted file mode 100755
index 49eccea..0000000
--- a/nb-repository-plugin/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- 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.
-
--->
-
-# Apache NetBeans Repository plugin
-
-[](https://ci-builds.apache.org/job/Netbeans/job/netbeans-maven-TLP/job/netbeans-mavenutils-nb-repository-plugin/job/master/)
-
-[Documentation Site](https://bits.netbeans.org/mavenutilities/nb-repository-plugin)
-
-### Get In Touch
-
-[Subscribe](mailto:users-subscribe@netbeans.apache.org) or [mail](mailto:users@netbeans.apache.org) the [users@netbeans.apache.org](mailto:users@netbeans.apache.org) list - Ask questions, find answers, and also help other users.
-
-[Subscribe](mailto:dev-subscribe@netbeans.apache.org) or [mail](mailto:dev@netbeans.apache.org) the [dev@netbeans.apache.org](mailto:dev@netbeans.apache.org) list - Join developement discussions, propose new ideas and connect with contributors.
-
-### Reporting Bugs
-
-Bugs should be reported to https://issues.apache.org/jira/projects/NETBEANSINFRA/issues/ using the component **MU - Apache NetBeans repository plugin**
-
diff --git a/nb-repository-plugin/pom.xml b/nb-repository-plugin/pom.xml
index 42b4967..1e6ce4c 100644
--- a/nb-repository-plugin/pom.xml
+++ b/nb-repository-plugin/pom.xml
@@ -221,7 +221,7 @@
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
<configuration>
<requirements>
<!--
diff --git a/nb-repository-plugin/src/site/apt/index.apt b/nb-repository-plugin/src/site/apt/index.apt
index 1d86b64..772e971 100644
--- a/nb-repository-plugin/src/site/apt/index.apt
+++ b/nb-repository-plugin/src/site/apt/index.apt
@@ -31,7 +31,7 @@
{{{https://search.maven.org/}Maven Central}} contains artefacts of Apache NetBeans 9.0 and later.
- Also see: {{{https://netbeans.apache.org/wiki/DevFaqIndex.asciidoc#_mavenized_builds}Maven NBM development FAQs}}
+ Also see: {{{https://netbeans.apache.org/wiki/DevFaqIndex#_mavenized_builds}Maven NBM development FAQs}}
Older NetBeans Version
diff --git a/nb-repository-plugin/src/site/apt/repository.apt b/nb-repository-plugin/src/site/apt/repository.apt
index c7da492..1a6d879 100644
--- a/nb-repository-plugin/src/site/apt/repository.apt
+++ b/nb-repository-plugin/src/site/apt/repository.apt
@@ -31,10 +31,10 @@
and remote repositories. See {{{./populate-mojo.html}<<<populate>>> goal}} description.
For a binary-only upload (jar files and nbm files only), it's possible to download the bits from official sites.
-See this page {{{http://netbeans.apache.org/download/dev/index.html}Building from source}}
+See this page {{{https://netbeans.apache.org/download/dev/index.html}Building from source}}
For the complete upload, you will need to checkout the sources of the IDE/Platform you
-want to upload. See this page {{{http://netbeans.apache.org/download/dev/index.html}Building from source}}
+want to upload. See this page {{{https://netbeans.apache.org/download/dev/index.html}Building from source}}
The goal has multiple input parameters that link the goal to binaries prepared beforehand.
diff --git a/nb-repository-plugin/src/site/site.xml b/nb-repository-plugin/src/site/site.xml
index 5597295..c43b7cc 100644
--- a/nb-repository-plugin/src/site/site.xml
+++ b/nb-repository-plugin/src/site/site.xml
@@ -17,18 +17,23 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd" combine.self="override">
<skin>
- <groupId>org.apache.netbeans.utilities</groupId>
- <artifactId>maven-netbeans-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>${skin.groupId}</groupId>
+ <artifactId>${skin.artifactId}</artifactId>
+ <version>${skin.version}</version>
</skin>
+ <publishDate position="none"/>
+ <version position="none"/>
<body>
- <links>
+ <menu>
+ <item name="Apache NetBeans home" href="https://netbeans.apache.org "/>
+ </menu>
+ <menu name="Apache Netbeans Maven Utilities">
<item name="NB Repository Plugin" />
<item name="NBM Plugin" href="../nbm-maven-plugin/index.html"/>
<item name="Shared" href="../nb-shared/index.html"/>
<item name="Harness" href="../nbm-maven-harness/index.html"/>
<item name="Parent" href="../index.html" />
- </links>
+ </menu>
<menu name="Overview">
<item name="Usage" href="index.html"/>
<item name="Plugin Goals" href="plugin-info.html"/>
@@ -44,11 +49,14 @@
</menu>
</body>
<custom>
- <NetBeanSkin>
+ <fluidoSkin>
+ <skipGenerationDate>true</skipGenerationDate>
<gitHub>
<projectId>apache/netbeans-mavenutils-nbm-maven-plugin</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
</gitHub>
- </NetBeanSkin>
+ </fluidoSkin>
</custom>
</project>
diff --git a/nb-shared/README.md b/nb-shared/README.md
deleted file mode 100755
index c94d6e8..0000000
--- a/nb-shared/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- 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.
-
--->
-
-# Apache NetBeans Maven Utilities Shared lib
-
-[](https://ci-builds.apache.org/job/Netbeans/job/netbeans-maven-TLP/job/netbeans-mavenutils-nbm-shared/job/master/)
-
-[Documentation Site](https://bits.netbeans.org/mavenutilities/nbm-shared)
-
-### Get In Touch
-
-[Subscribe](mailto:users-subscribe@netbeans.apache.org) or [mail](mailto:users@netbeans.apache.org) the [users@netbeans.apache.org](mailto:users@netbeans.apache.org) list - Ask questions, find answers, and also help other users.
-
-[Subscribe](mailto:dev-subscribe@netbeans.apache.org) or [mail](mailto:dev@netbeans.apache.org) the [dev@netbeans.apache.org](mailto:dev@netbeans.apache.org) list - Join developement discussions, propose new ideas and connect with contributors.
-
-### Reporting Bugs
-
-Bugs should be reported to https://issues.apache.org/jira/projects/NETBEANS/issues/ using the component **mavenutilities**
-
diff --git a/nb-shared/src/site/site.xml b/nb-shared/src/site/site.xml
index 5afb11b..ef6fce2 100644
--- a/nb-shared/src/site/site.xml
+++ b/nb-shared/src/site/site.xml
@@ -17,25 +17,33 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd" combine.self="override">
<skin>
- <groupId>org.apache.netbeans.utilities</groupId>
- <artifactId>maven-netbeans-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </skin>
+ <groupId>${skin.groupId}</groupId>
+ <artifactId>${skin.artifactId}</artifactId>
+ <version>${skin.version}</version>
+ </skin>
+ <publishDate position="none"/>
+ <version position="none"/>
<body>
- <links>
+ <menu>
+ <item name="Apache NetBeans home" href="https://netbeans.apache.org "/>
+ </menu>
+ <menu name="Apache Netbeans Maven Utilities">
<item name="NB Repository Plugin" href="../nb-repository-plugin/index.html"/>
<item name="NBM Plugin" href="../nbm-maven-plugin/index.html"/>
<item name="Shared" />
<item name="Harness" href="../nbm-maven-harness/index.html"/>
- <item name="Parent" href="../index.html" />
- </links>
+ <item name="Parent" href="../index.html" />
+ </menu>
</body>
<custom>
- <NetBeanSkin>
+ <fluidoSkin>
+ <skipGenerationDate>true</skipGenerationDate>
<gitHub>
<projectId>apache/netbeans-mavenutils-nbm-maven-plugin</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
</gitHub>
- </NetBeanSkin>
+ </fluidoSkin>
</custom>
</project>
diff --git a/nbm-maven-harness/README.md b/nbm-maven-harness/README.md
deleted file mode 100755
index 3204cb6..0000000
--- a/nbm-maven-harness/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- 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.
-
--->
-
-# Apache NetBeans Maven Utilities NBM Harness
-
-[](https://ci-builds.apache.org/job/Netbeans/job/netbeans-maven-TLP/job/netbeans-mavenutils-nbm-maven-harness/job/master/)
-
-[Documentation Site](https://bits.netbeans.org/mavenutilities/nbm-maven-harness)
-
-### Get In Touch
-
-[Subscribe](mailto:users-subscribe@netbeans.apache.org) or [mail](mailto:users@netbeans.apache.org) the [users@netbeans.apache.org](mailto:users@netbeans.apache.org) list - Ask questions, find answers, and also help other users.
-
-[Subscribe](mailto:dev-subscribe@netbeans.apache.org) or [mail](mailto:dev@netbeans.apache.org) the [dev@netbeans.apache.org](mailto:dev@netbeans.apache.org) list - Join developement discussions, propose new ideas and connect with contributors.
-
-### Reporting Bugs
-
-Bugs should be reported to https://issues.apache.org/jira/projects/NETBEANS/issues/ using the component **mavenutilities**
-
diff --git a/nbm-maven-harness/src/site/site.xml b/nbm-maven-harness/src/site/site.xml
index 2ac6696..96c8b3d 100644
--- a/nbm-maven-harness/src/site/site.xml
+++ b/nbm-maven-harness/src/site/site.xml
@@ -17,25 +17,33 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd" combine.self="override">
<skin>
- <groupId>org.apache.netbeans.utilities</groupId>
- <artifactId>maven-netbeans-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>${skin.groupId}</groupId>
+ <artifactId>${skin.artifactId}</artifactId>
+ <version>${skin.version}</version>
</skin>
+ <publishDate position="none"/>
+ <version position="none"/>
<body>
- <links>
+ <menu>
+ <item name="Apache NetBeans home" href="https://netbeans.apache.org "/>
+ </menu>
+ <menu name="Apache Netbeans Maven Utilities">
<item name="NB Repository Plugin" href="../nb-repository-plugin/index.html"/>
<item name="NBM Plugin" href="../nbm-maven-plugin/index.html"/>
<item name="Shared" href="../nb-shared/index.html"/>
<item name="Harness"/>
- <item name="Parent" href="../index.html"/>
- </links>
+ <item name="Parent" href="../index.html"/>
+ </menu>
</body>
<custom>
- <NetBeanSkin>
+ <fluidoSkin>
+ <skipGenerationDate>true</skipGenerationDate>
<gitHub>
<projectId>apache/netbeans-mavenutils-nbm-maven-plugin</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
</gitHub>
- </NetBeanSkin>
+ </fluidoSkin>
</custom>
</project>
diff --git a/nbm-maven-plugin/README.md b/nbm-maven-plugin/README.md
deleted file mode 100755
index 720c786..0000000
--- a/nbm-maven-plugin/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- 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.
-
--->
-
-# NetBeans Module Maven plugin
-
-[](https://ci-builds.apache.org/job/Netbeans/job/netbeans-maven-TLP/job/netbeans-mavenutils-nbm-maven-plugin/job/master/)
-
-[Documentation Site](https://bits.netbeans.org/mavenutilities/nbm-maven-plugin)
-
-### Get In Touch
-
-[Subscribe](mailto:users-subscribe@netbeans.apache.org) or [mail](mailto:users@netbeans.apache.org) the [users@netbeans.apache.org](mailto:users@netbeans.apache.org) list - Ask questions, find answers, and also help other users.
-
-[Subscribe](mailto:dev-subscribe@netbeans.apache.org) or [mail](mailto:dev@netbeans.apache.org) the [dev@netbeans.apache.org](mailto:dev@netbeans.apache.org) list - Join developement discussions, propose new ideas and connect with contributors.
-
-### Reporting Bugs
-
-Bugs should be reported to https://issues.apache.org/jira/projects/NETBEANSINFRA/issues/ using the component **MU - Apache NetBeans NBM maven plugin**
-
diff --git a/nbm-maven-plugin/pom.xml b/nbm-maven-plugin/pom.xml
index 8695814..12946d2 100644
--- a/nbm-maven-plugin/pom.xml
+++ b/nbm-maven-plugin/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
- <version>1.13.0</version>
+ <version>1.13.1</version>
</dependency>
<!-- maven dependecy analyser version 1.8 will have the correct dependency -->
<dependency>
@@ -252,7 +252,6 @@
<model>src/main/mdo/descriptor.mdo</model>
</models>
<version>1.0.0</version>
- <useJava5>true</useJava5>
</configuration>
</plugin>
<plugin>
@@ -373,7 +372,7 @@
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
<configuration>
<requirements>
<!--
diff --git a/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/BuildInstallersMojo.java b/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/BuildInstallersMojo.java
index 672182f..d337c88 100644
--- a/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/BuildInstallersMojo.java
+++ b/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/BuildInstallersMojo.java
@@ -54,7 +54,7 @@
* Build installers for Mavenized NetBeans application. Creates installers for supported operating systems and packages
* each installer as a deployable artifact.
* <p>
- * See a <a href="http://www.mojohaus.org/nbm-maven-plugin/buildinstexample.html">how-to</a> on customizing the
+ * See a <a href="https://bits.netbeans.org/mavenutilities/nbm-maven-plugin/nbm-maven-plugin/buildinstexample.html">how-to</a> on customizing the
* installer.
*
* @author <a href="mailto:frantisek@mantlik.cz">Frantisek Mantlik</a>
diff --git a/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/NetBeansManifestUpdateMojo.java b/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/NetBeansManifestUpdateMojo.java
index c098a8e..ce6c09e 100644
--- a/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/NetBeansManifestUpdateMojo.java
+++ b/nbm-maven-plugin/src/main/java/org/apache/netbeans/nbm/NetBeansManifestUpdateMojo.java
@@ -73,18 +73,16 @@
* snippet to maven-jar-plugin.
*
* <pre>
- * {@code
- * <plugin>
- * <groupId>org.apache.maven.plugins</groupId>
- * <artifactId>maven-jar-plugin</artifactId>
- * <version>3.0.2</version>
- * <configuration>
- * <archive>
- * <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- * </archive>
- * </configuration>
- * </plugin>
- * }
+ * <plugin>
+ * <groupId>org.apache.maven.plugins</groupId>
+ * <artifactId>maven-jar-plugin</artifactId>
+ * <version>3.3.0</version>
+ * <configuration>
+ * <archive>
+ * <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ * </archive>
+ * </configuration>
+ * </plugin>
* </pre>
*
* @author Milos Kleint
diff --git a/nbm-maven-plugin/src/site/apt/buildinstexample.apt b/nbm-maven-plugin/src/site/apt/buildinstexample.apt
index 7df8d19..f4ed3dd 100644
--- a/nbm-maven-plugin/src/site/apt/buildinstexample.apt
+++ b/nbm-maven-plugin/src/site/apt/buildinstexample.apt
@@ -55,7 +55,7 @@
For example, you would like to register file associations for your application.
First of all, prepare your modified version of the file ConfigurationLogic.java
- according to the instructions at {{{http://wiki.netbeans.org/NBIFileAssosiations}http://wiki.netbeans.org/NBIFileAssosiations}}.
+ according to the instructions at {{{https://web.archive.org/web/20170708104520/http://wiki.netbeans.org/NBIFileAssosiations}archived http://wiki.netbeans.org/NBIFileAssosiations}}.
As a next step add a copy task into <<<prepare-sources>>> target in your templateFile:
@@ -67,7 +67,7 @@
+-----+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<configuration>
<templateFile>${basedir}/installer/template.xml</templateFile>
@@ -114,7 +114,7 @@
+-----+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<configuration>
<templateFile>${basedir}/installer/template.xml</templateFile>
@@ -125,4 +125,4 @@
</plugin>
+-----+
- More information: {{{http://wiki.netbeans.org/NBI}http://wiki.netbeans.org/NBI}}
+~~ More information: {{{https://web.archive.org/web/20201023105554/http://wiki.netbeans.org/NBI}archived http://wiki.netbeans.org/NBI}}
diff --git a/nbm-maven-plugin/src/site/apt/index.apt.vm b/nbm-maven-plugin/src/site/apt/index.apt.vm
index 4dc0d1c..8cde901 100644
--- a/nbm-maven-plugin/src/site/apt/index.apt.vm
+++ b/nbm-maven-plugin/src/site/apt/index.apt.vm
@@ -31,7 +31,7 @@
Note: The <<<nbm:populate-repository>>> goal has been moved to it's own plugin {{{../nb-repository-plugin/index.html}nb-repository-plugin}}.
- Also see: {{{https://netbeans.apache.org/wiki/DevFaqIndex.asciidoc#_mavenized_builds}Maven NBM development FAQs}}
+ Also see: {{{https://netbeans.apache.org/wiki/DevFaqIndex#_mavenized_builds}Maven NBM development FAQs}}
Sample <<<pom.xml>>> excerpts for creation of a NetBeans module:
@@ -188,7 +188,7 @@
+-----+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<executions>
<execution>
@@ -253,7 +253,7 @@
+-----+
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>${project.version}</version>
<extensions>true</extensions>
@@ -277,14 +277,14 @@
one if you are developing a Apache NetBeans IDE module, or a module for a Apache NetBeans Platform-based application.
+-------------------------------------------------------------------------------+
-mvn -DarchetypeGroupId=org.codehaus.mojo.archetypes -DarchetypeArtifactId=nbm-archetype -DarchetypeVersion=... \
+mvn -DarchetypeGroupId=org.apache.netbeans.archetypes -DarchetypeArtifactId=nbm-archetype -DarchetypeVersion=... \
-DgroupId=org.kleint -DartifactId=milos -Dversion=1.0 archetype:generate
+-------------------------------------------------------------------------------+
The second one creates a parent POM project containing configuration and application branding for your Apache NetBeans Platform-based application.
+-------------------------------------------------------------------------------+
-mvn -DarchetypeGroupId=org.codehaus.mojo.archetypes -DarchetypeArtifactId=netbeans-platform-app-archetype \
+mvn -DarchetypeGroupId=org.apache.netbeans.archetypes -DarchetypeArtifactId=netbeans-platform-app-archetype \
-DarchetypeVersion=... -DgroupId=org.kleint -DartifactId=milos -Dversion=1.0 archetype:generate
+-------------------------------------------------------------------------------+
diff --git a/nbm-maven-plugin/src/site/apt/upgrade.apt b/nbm-maven-plugin/src/site/apt/upgrade.apt
index 9207000..3f0c767 100644
--- a/nbm-maven-plugin/src/site/apt/upgrade.apt
+++ b/nbm-maven-plugin/src/site/apt/upgrade.apt
@@ -96,7 +96,7 @@
* The <<<nbm:manifest>>> goal besides generating the manifest, will also check if the runtime dependencies
match the actual classes being used in the project and it's libraries on <<Class-Path>>. That's analogous to
-the {{{http://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html}<<<dependency:analyze>>>}}
+the {{{https://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html}<<<dependency:analyze>>>}}
goal but takes the NetBeans module system constraints into account (non-transitivity of module dependencies,
public vs. private packages constraint etc)
@@ -136,9 +136,9 @@
* The <<2.5>> plugin can pick up and declare more module dependencies than the previous version. Module dependencies are safe.
You either declared them in your <<<module.xml>>> file. Some additional ones can appear if you have them as direct dependencies in your pom.
-Use the {{{http://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html}<<<dependency:analyze>>>}} goal to check for used/unused direct dependencies.
+Use the {{{https://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html}<<<dependency:analyze>>>}} goal to check for used/unused direct dependencies.
* The <<2.5>> plugin can also pick up and declare more module libraries. That's something to watch out for! That happens again only when you declared the jars as direct dependencies.
You could end up with a single jar being added to multiple modules and get runtime classpath issues and of course your download size
-will get higher than necessary. Again the {{{http://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html}<<<dependency:analyze>>>}} goal shall help. If you know the jar is required but is provided by a module you depend on, use the <<<provided>>> scope to prevent inclusion.
+will get higher than necessary. Again the {{{https://maven.apache.org/plugins/maven-dependency-plugin/analyze-mojo.html}<<<dependency:analyze>>>}} goal shall help. If you know the jar is required but is provided by a module you depend on, use the <<<provided>>> scope to prevent inclusion.
diff --git a/nbm-maven-plugin/src/site/site.xml b/nbm-maven-plugin/src/site/site.xml
index 091f1df..b7a603e 100644
--- a/nbm-maven-plugin/src/site/site.xml
+++ b/nbm-maven-plugin/src/site/site.xml
@@ -17,25 +17,30 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd" combine.self="override">
<skin>
- <groupId>org.apache.netbeans.utilities</groupId>
- <artifactId>maven-netbeans-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </skin>
+ <groupId>${skin.groupId}</groupId>
+ <artifactId>${skin.artifactId}</artifactId>
+ <version>${skin.version}</version>
+ </skin>
+ <publishDate position="none"/>
+ <version position="none"/>
<body>
- <links>
+ <menu>
+ <item name="Apache NetBeans home" href="https://netbeans.apache.org "/>
+ </menu>
+ <menu name="Apache Netbeans Maven Utilities">
<item name="NB Repository Plugin" href="../nb-repository-plugin/index.html"/>
<item name="NBM Plugin"/>
<item name="Shared" href="../nb-shared/index.html"/>
<item name="Harness" href="../nbm-maven-harness/index.html"/>
- <item name="Parent" href="../index.html" />
- </links>
+ <item name="Parent" href="../index.html" />
+ </menu>
<menu name="Overview">
<item name="Usage" href="index.html"/>
<item name="Plugin Goals" href="plugin-info.html"/>
<!-- <item name="Javadoc" href="apidocs/index.html"/> -->
<!--item name="FAQ" href="faq.html"/-->
</menu>
- <!--<menu name="Upgrade">
+ <!--<menu name="Upgrade">
<item name="2.4 -> 2.5 upgrade" href="2425upgrade.html"/>
<item name="2.6 -> 3.0 upgrade" href="2630upgrade.html"/>
</menu>-->
@@ -49,11 +54,14 @@
</menu>
</body>
<custom>
- <NetBeanSkin>
+ <fluidoSkin>
+ <skipGenerationDate>true</skipGenerationDate>
<gitHub>
<projectId>apache/netbeans-mavenutils-nbm-maven-plugin</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
</gitHub>
- </NetBeanSkin>
+ </fluidoSkin>
</custom>
</project>
diff --git a/pom.xml b/pom.xml
index f1be983..0cac412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,10 @@
<!-- <mojo.java.target>1.6</mojo.java.target> -->
<maven.version>3.8.6</maven.version>
<maven.minimum.version>3.6.3</maven.minimum.version>
- <maven.plugin.version>3.8.1</maven.plugin.version>
+ <maven.plugin.version>3.8.2</maven.plugin.version>
+ <skin.groupId>org.apache.maven.skins</skin.groupId>
+ <skin.artifactId>maven-fluido-skin</skin.artifactId>
+ <skin.version>2.0.0-M5</skin.version>
</properties>
<dependencyManagement>
@@ -97,7 +100,11 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>4.0.0-M7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -110,7 +117,7 @@
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
<configuration>
<configLocation>config/maven_checks.xml</configLocation>
<headerLocation>config/maven-header.txt</headerLocation>
@@ -159,12 +166,16 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.4.2</version>
+ <version>3.4.3</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven.plugin.version}</version>
- </plugin>
+ </plugin>
+ <plugin>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ <version>${maven.plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/src/site/site.xml b/src/site/site.xml
index 4b02607..23f8db6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -17,24 +17,32 @@
-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd" combine.self="override">
<skin>
- <groupId>org.apache.netbeans.utilities</groupId>
- <artifactId>maven-netbeans-skin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>${skin.groupId}</groupId>
+ <artifactId>${skin.artifactId}</artifactId>
+ <version>${skin.version}</version>
</skin>
+ <publishDate position="none"/>
+ <version position="none"/>
<body>
- <links>
+ <menu>
+ <item name="Apache NetBeans home" href="https://netbeans.apache.org "/>
+ </menu>
+ <menu name="Apache Netbeans Maven Utilities">
<item name="NB Repository Plugin" href="./nb-repository-plugin/index.html"/>
<item name="NBM Plugin" href="./nbm-maven-plugin/index.html"/>
<item name="Shared" href="./nb-shared/index.html"/>
<item name="Harness" href="./nbm-maven-harness/index.html"/>
<item name="Parent" />
- </links>
+ </menu>
</body>
<custom>
- <NetBeanSkin>
+ <fluidoSkin>
+ <skipGenerationDate>true</skipGenerationDate>
<gitHub>
<projectId>apache/netbeans-mavenutils-nbm-maven-plugin</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>black</ribbonColor>
</gitHub>
- </NetBeanSkin>
+ </fluidoSkin>
</custom>
</project>
