Merge pull request #8 from ebarboni/jdk11
support for Apache NetBeans 10 artefacts and jdk > 8
diff --git a/.gitignore b/.gitignore
index d922902..3bb462b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
/archetype/nbm-suite-root/target/
/archetype/netbeans-platform-app-archetype/target/
/parent/target/
-/webskin/target/
\ No newline at end of file
+/webskin/target/
+/netbeansparent/target/
\ No newline at end of file
diff --git a/Jenkinsfile-site.groovy b/Jenkinsfile-site.groovy
index ed63aeb..3b8810a 100644
--- a/Jenkinsfile-site.groovy
+++ b/Jenkinsfile-site.groovy
@@ -31,6 +31,7 @@
sh 'rm -rf stagedsite'
sh 'mkdir stagedsite'
+ sh 'rm -f mavenusite.zip'
}
}
stage('Build Site'){
@@ -57,16 +58,11 @@
}
}
}
-
-
- }
- }
- stage('Publish Site'){
- agent {label 'ubuntu'}
- steps {
zip zipFile:'mavenusite.zip',archive:false,dir:'stagedsite'
archiveArtifacts artifacts:'mavenusite.zip'
- }
- }
+
+
+ }
+ }
}
}
diff --git a/nb-repository-plugin/pom.xml b/nb-repository-plugin/pom.xml
index b6264c0..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>
@@ -15,7 +15,7 @@
<description>Maven plugin for creating Maven Repository out of a NetBeans installation (and other sources) for consumption by the projects using nbm-maven-plugin.
</description>
<inceptionYear>2005</inceptionYear>
- <url>http://netbeans.apache.org/mavenutilities/nb-repository-plugin</url>
+ <url>http://bits.netbeans.org/mavenutilities/nb-repository-plugin</url>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/NETBEANS</url>
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 2d6a90e..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
@@ -69,6 +69,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -218,6 +219,15 @@
@Parameter(defaultValue="temp", property="dependencyRepositoryId")
private String dependencyRepositoryId;
+ /**
+ * Colon separated artefact coordinate groupId:artefactId:version that
+ * represent parent to be used
+ *
+ * @since 1.4
+ */
+ @Parameter(property = "parentGAV", required = false)
+ private String parentGAV;
+
// <editor-fold defaultstate="collapsed" desc="Component parameters">
/**
* Local maven repository.
@@ -265,6 +275,9 @@
private ArtifactRepositoryLayout artifactRepositoryLayout;
// </editor-fold>
+ // parent handler in case we have one
+ private Parent artefactParent = null;
+
@Override
public void execute()
throws MojoExecutionException
@@ -272,6 +285,21 @@
getLog().info( "Populate repository with NetBeans modules" );
Project antProject = antProject();
ArtifactRepository deploymentRepository = null;
+
+ if (parentGAV != null)
+ {
+ // populate artefactParent
+ artefactParent = new Parent();
+ String[] split = parentGAV.split(":");
+ if (split.length != 3) {
+ throw new MojoExecutionException(
+ "parentGAV should respect the following format groupId:artefactId:version" );
+ }
+ artefactParent.setGroupId( split[0] );
+ artefactParent.setArtifactId( split[1] );
+ artefactParent.setVersion( split[2] );
+ }
+
if ( deployUrl != null )
{
ArtifactRepositoryLayout layout = new DefaultRepositoryLayout();
@@ -754,6 +782,9 @@
mavenModel.setVersion( wrapper.getVersion() );
mavenModel.setPackaging( "jar" );
mavenModel.setModelVersion( "4.0.0" );
+ if ( artefactParent != null ) {
+ mavenModel.setParent( artefactParent );
+ }
ExamineManifest man = wrapper.getModuleManifest();
List<Dependency> deps = new ArrayList<Dependency>();
if ( !man.getDependencyTokens().isEmpty() )
@@ -985,6 +1016,9 @@
mavenModel.setVersion( wrapper.getVersion() );
mavenModel.setPackaging( "jar" );
mavenModel.setModelVersion( "4.0.0" );
+ if ( artefactParent != null ) {
+ mavenModel.setParent( artefactParent );
+ }
mavenModel.setName(
"Maven definition for " + wrapper.getFile().getName() + " - external part of NetBeans module." );
mavenModel.setDescription(
@@ -1031,6 +1065,9 @@
// mavenModel.setPackaging("nbm-application");
mavenModel.setPackaging( "pom" );
mavenModel.setModelVersion( "4.0.0" );
+ if ( artefactParent != null ) {
+ mavenModel.setParent( artefactParent );
+ }
List<Dependency> deps = new ArrayList<Dependency>();
for ( ModuleWrapper wr : mods )
{
diff --git a/nbm-maven-harness/pom.xml b/nbm-maven-harness/pom.xml
index e785fc2..69dd510 100644
--- a/nbm-maven-harness/pom.xml
+++ b/nbm-maven-harness/pom.xml
@@ -2,14 +2,14 @@
<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>
<artifactId>nbm-maven-harness</artifactId>
<version>9.0-SNAPSHOT</version>
<name>Apache NetBeans Maven Utilities - NBM Harness for Maven</name>
- <url>http://netbeans.apache.org/mavenutilities/nbm-maven-harness</url>
+ <url>http://bits.netbeans.org/mavenutilities/nbm-maven-harness</url>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/NETBEANS</url>
diff --git a/nbm-maven-plugin/pom.xml b/nbm-maven-plugin/pom.xml
index 930fad3..0999b75 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>
@@ -15,7 +15,7 @@
<description>Maven plugin for creating NetBeans modules. It defines a custom lifecycle called "nbm". During packaging, the module JAR is enhanced with NetBeans-specific manifest entries and, along with other required files, packed into a *.nbm file, ready for distribution. Additionally the plugin provides aggregator goals to create an update site or cluster for your module projects.
</description>
<inceptionYear>2005</inceptionYear>
- <url>http://netbeans.apache.org/mavenutilities/nbm-maven-plugin</url>
+ <url>http://bits.netbeans.org/mavenutilities/nbm-maven-plugin</url>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/NETBEANS</url>
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 92e8713..75ea55d 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
@@ -954,7 +954,7 @@
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;
}
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 @@
<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 @@
<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>
diff --git a/nbm-shared/pom.xml b/nbm-shared/pom.xml
index 53e4875..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>
@@ -15,7 +15,7 @@
<description>Maven plugin for creating Maven Repository out of a Apache NetBeans installation (and other sources) for consumption by the projects using nbm-maven-plugin.
</description>
<inceptionYear>2005</inceptionYear>
- <url>http://netbeans.apache.org/mavenutilities/nb-shared</url>
+ <url>http://bits.netbeans.org/mavenutilities/nb-shared</url>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/NETBEANS</url>
diff --git a/netbeansparent/DISCLAIMER b/netbeansparent/DISCLAIMER
new file mode 100644
index 0000000..d6f7fea
--- /dev/null
+++ b/netbeansparent/DISCLAIMER
@@ -0,0 +1,8 @@
+Apache NetBeans is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of
+all newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized in
+a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the
+ASF.
diff --git a/netbeansparent/LICENSE b/netbeansparent/LICENSE
new file mode 100644
index 0000000..de4b130
--- /dev/null
+++ b/netbeansparent/LICENSE
@@ -0,0 +1,204 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
diff --git a/netbeansparent/NOTICE b/netbeansparent/NOTICE
new file mode 100644
index 0000000..96d9609
--- /dev/null
+++ b/netbeansparent/NOTICE
@@ -0,0 +1,6 @@
+Apache NetBeans
+Copyright 2017-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/netbeansparent/pom.xml b/netbeansparent/pom.xml
new file mode 100644
index 0000000..210ec15
--- /dev/null
+++ b/netbeansparent/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<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.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ </parent>
+
+ <groupId>org.apache.netbeans</groupId>
+ <artifactId>netbeans-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Netbeans</name>
+ <description>Apache NetBeans (incubating) is an integrated development environment, tooling platform, and application framework.</description>
+ <url>https://netbeans.apache.org/</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <id>apachenetbeansdev</id>
+ <name>Apache NetBeans Dev Mailing List</name>
+ <email>dev@netbeans.incubator.apache.org</email>
+ </developer>
+ </developers>
+
+ <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>https://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>https://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>https://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>https://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>https://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>https://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:https://gitbox.apache.org/repos/asf/incubator-netbeans-mavenutils.git</developerConnection>
+ <url>https://github.com/apache/incubator-netbeans-mavenutils</url>
+ <tag>HEAD</tag>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/projects/NETBEANS</url>
+ </issueManagement>
+</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1155772..959c232 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,18 +1,36 @@
<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>
<name>Apache Netbeans Maven Utilities</name>
<description>Apache Netbeans Maven Utilities is a set of artefacts to build and populate Apache NetBeans artefacts using Apache Maven</description>
- <url>http://netbeans.apache.org/mavenutilities/parent</url>
+ <url>http://bits.netbeans.org/mavenutilities/parent</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -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>
@@ -125,4 +95,4 @@
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/webskin/pom.xml b/webskin/pom.xml
index 3b638fa..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>
@@ -15,7 +15,7 @@
<description>Maven site skin for Apache Netbeans Utilities.
</description>
<inceptionYear>2018</inceptionYear>
- <url>http://netbeans.apache.org/mavenutilities/maven-netbeans-skin</url>
+ <url>http://bits.netbeans.org/mavenutilities/maven-netbeans-skin</url>
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/NETBEANS</url>
diff --git a/webskin/src/main/resources/META-INF/maven/site.vm b/webskin/src/main/resources/META-INF/maven/site.vm
index 9c3294f..cbffd58 100644
--- a/webskin/src/main/resources/META-INF/maven/site.vm
+++ b/webskin/src/main/resources/META-INF/maven/site.vm
@@ -27,7 +27,7 @@
<body>
<div class="top-bar" id="responsive-menu">
<div class='top-bar-left'>
- <a class='title' href="http://netbeans.apache.org"><img src='/images/apache-netbeans.svg' style='padding: 8px; height: 48px;'>Apache NetBeans (incubating)</a>
+ <a class="title" href="http://netbeans.apache.org"><img src="./images/apache-netbeans.svg" style="padding: 8px; height: 48px;">Apache NetBeans (incubating)</a>
</div>
<div class="top-bar-right">
<ul class="vertical medium-horizontal menu" style="right: 90px;" data-responsive-menu="drilldown medium-dropdown">
@@ -35,17 +35,17 @@
#* *##if ($project.artifactId == 'nb-repository-plugin')
<li> <strong $stylecompensate >NB Repository Plugin</strong> </li>
#* *##else
- <li> <a href="../nb-repository/index.html">NB Repository Plugin</a> </li>
+ <li> <a href="../nb-repository-plugin/index.html">NB Repository Plugin</a> </li>
#* *##end
#* *##if ($project.artifactId == 'nbm-maven-plugin')
<li> <strong $stylecompensate >NBM Plugin</strong> </li>
#* *##else
<li> <a href="../nbm-maven-plugin/index.html">NBM Plugin</a> </li>
#* *##end
-#* *##if ($project.artifactId == 'nbm-shared')
+#* *##if ($project.artifactId == 'nb-shared')
<li> <strong $stylecompensate>Shared</strong> </li>
#* *##else
- <li> <a href="../shared/index.html">Shared</a> </li>
+ <li> <a href="../nbm-shared/index.html">Shared</a> </li>
#* *##end
#* *##if ($project.artifactId == 'utilities-parent')
<li> <strong $stylecompensate>Parent</strong> </li>
@@ -76,7 +76,7 @@
<div class='grid-x grid-padding-x'>
<div class='large-auto cell text-center'>
<a href="https://www.apache.org/">
- <img style="width: 320px" title="Apache Software Foundation" src="/images/asf_logo_wide.svg" />
+ <img style="width: 320px" title="Apache Software Foundation" src="./images/asf_logo_wide.svg" />
</a>
</div>
<div class='large-auto cell text-center'>
@@ -90,7 +90,7 @@
<div class="footer-disclaimer-content">
<p>Copyright © 2017-2018 <a href="https://www.apache.org">The Apache Software Foundation</a>.</p>
<p>Licensed under the Apache <a href="https://www.apache.org/licenses/">license</a>, version 2.0</p>
- <p><a href="https://incubator.apache.org/" alt="Apache Incubator"><img src='/images/incubator_feather_egg_logo_bw_crop.png' title='Apache Incubator'></img></a></p>
+ <p><a href="https://incubator.apache.org/" alt="Apache Incubator"><img src="./images/incubator_feather_egg_logo_bw_crop.png" title="Apache Incubator" /></a></p>
<div style='max-width: 40em; margin: 0 auto'>
<p>Apache NetBeans is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
<p>Apache Incubator, Apache, the Apache feather logo, the Apache NetBeans logo, and the Apache Incubator project logo are trademarks of <a href="https://www.apache.org">The Apache Software Foundation</a>.</p>
@@ -103,13 +103,13 @@
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/netbeans.js"></script>
+ <script src="./js/vendor/jquery-3.2.1.min.js"></script>
+ <script src="./js/vendor/what-input.js"></script>
+ <script src="./js/vendor/jquery.colorbox-min.js"></script>
+ <script src="./js/vendor/foundation.min.js"></script>
+ <script src="./js/netbeans.js"></script>
<script>
$(function(){ $(document).foundation(); });
</script>
-</body>
\ No newline at end of file
+</body>
