You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/21 11:26:19 UTC
[GitHub] geertjanw closed pull request #732: Fix build after changes for
cluster reorganisation (PR #536)
geertjanw closed pull request #732: Fix build after changes for cluster reorganisation (PR #536)
URL: https://github.com/apache/incubator-netbeans/pull/732
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
index 9c393f241c..0454471a58 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/VerifyLibsAndLicenses.java
@@ -89,9 +89,18 @@ public void setHaltonfailure(boolean haltonfailure) {
public @Override void execute() throws BuildException {
try { // XXX workaround for http://issues.apache.org/bugzilla/show_bug.cgi?id=43398
pseudoTests = new LinkedHashMap<>();
- modules = new TreeSet<>();
- for (String cluster : getProject().getProperty("nb.clusters.list").split("[, ]+")) {
- modules.addAll(Arrays.asList(getProject().getProperty(cluster).split("[, ]+")));
+ if(getProject().getProperty("allmodules") != null) {
+ modules = new TreeSet<>(Arrays.asList(getProject().getProperty("allmodules").split("[, ]+")));
+ modules.add("nbbuild");
+ } else {
+ Path nbAllPath = nball.toPath();
+ modules = new TreeSet<>(
+ Files.walk(nbAllPath)
+ .filter(p -> Files.exists(p.resolve("external/binaries-list")))
+ .map(p -> nbAllPath.relativize(p))
+ .map(p -> p.toString())
+ .collect(Collectors.toSet())
+ );
}
try {
testNoStrayThirdPartyBinaries();
@@ -108,7 +117,7 @@ public void setHaltonfailure(boolean haltonfailure) {
pseudoTests.values().stream().filter(err -> err != null).collect(Collectors.joining("\n")),
getLocation());
}
- } catch (NullPointerException x) {x.printStackTrace(); throw x;}
+ } catch (NullPointerException | IOException x) {x.printStackTrace(); throw new BuildException(x);}
}
private void testBinaryUniqueness() throws IOException {
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 40016bb6b2..f89fbe11a2 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -30,3 +30,6 @@ db.sql.visualeditor/external/javacc-3.2.jar performance/external/javacc-3.2.jar
# These are used independently, different functional goals
maven.embedder/external/apache-maven-3.3.9-bin.zip o.apache.commons.lang/external/commons-lang-2.6.jar
+# Contains test data (badPackageFileInJar.jar is packaged twice) - this is an
+# upstream problem
+nbbuild/external/langtools-9.zip nbbuild/external/langtools-9.zip
\ No newline at end of file
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 5701f4cfbd..5d8e006a6d 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -54,7 +54,7 @@ resolve.clean.dependencies=false
stop.when.clean.error=true
test.unit.cp=\
- ../libs.junit4/external/junit-4.12.jar:\
+ ../platform/libs.junit4/external/junit-4.12.jar:\
netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
netbeans/harness/modules/org-netbeans-insane.jar:\
${ant.home}/lib/ant-junit.jar:\
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index fb093eeaa9..82161fc5f1 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -107,9 +107,7 @@
<echo>Downloading external binaries (*/external/ directories)...</echo>
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
<manifest dir="${nb_all}">
- <include name="*/external/binaries-list"/>
- <include name="contrib/*/external/binaries-list"/>
- <include name="otherlicenses/*/external/binaries-list"/>
+ <include name="**/external/binaries-list"/>
</manifest>
</downloadbinaries>
<property name="ext.binaries.downloaded" value="true"/>
@@ -328,7 +326,7 @@
</target>
<target name="finish-build" depends="finish-build-platform,finish-build-nb"/>
<target name="finish-build-platform" depends="init,-check-nb-cluster" unless="has.nb.cluster">
- <copy file="../o.n.bootstrap/readme/README-bin.txt" tofile="${netbeans.dest.dir}/README.txt" overwrite="true"/>
+ <copy file="../platform/o.n.bootstrap/readme/README-bin.txt" tofile="${netbeans.dest.dir}/README.txt" overwrite="true"/>
<fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
<include name="${nb.cluster.platform.dir}/lib/nbexec" />
</fixcrlf>
diff --git a/nbbuild/external/apache-rat-0.12-license.txt b/nbbuild/external/apache-rat-0.12-license.txt
new file mode 100644
index 0000000000..810fbf66ae
--- /dev/null
+++ b/nbbuild/external/apache-rat-0.12-license.txt
@@ -0,0 +1,208 @@
+Name: Apache Rat
+Origin: Apache Software Foundation
+Version: 0.12
+License: Apache-2.0
+Description: Apache Rat is a release audit tool, focused on licenses.
+URL: https://creadur.apache.org/rat/
+
+ 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/nbbuild/external/apitest-license.txt b/nbbuild/external/apitest-70-license.txt
similarity index 100%
rename from nbbuild/external/apitest-license.txt
rename to nbbuild/external/apitest-70-license.txt
diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
index 0bdc51654c..0eeb8452b3 100644
--- a/nbbuild/external/binaries-list
+++ b/nbbuild/external/binaries-list
@@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
+A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest-70.jar
16398550402B27F81CD0D508CEF54B3E47A4A6DA org.apache.rat:apache-rat:0.12
AB396EE119BFAD809CC9F09950CC22E2BCE2FE35 langtools-9.zip
diff --git a/nbbuild/nbproject/project.xml b/nbbuild/nbproject/project.xml
index 638eed9401..68cb8e39d8 100644
--- a/nbbuild/nbproject/project.xml
+++ b/nbbuild/nbproject/project.xml
@@ -205,7 +205,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
<compilation-unit>
<package-root>antsrc</package-root>
- <classpath mode="compile">${ant.core.lib}:${nb_all}/javahelp/external/jhall-2.0_05.jar</classpath>
+ <classpath mode="compile">${ant.core.lib}:${nb_all}/platform/javahelp/external/jhall-2.0_05.jar</classpath>
<classpath mode="boot">${nbjdk.bootclasspath}</classpath>
<built-to>${nb.build.dir}/antclasses</built-to>
<built-to>${nbantext.jar}</built-to>
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index fa0da292eb..2899d869bb 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -700,7 +700,7 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
<property name="sigtest.public.packages" value="${public.packages}"/>
<property name="sigtest.fail.on.error" value="true"/>
<taskdef name="sigtest" classname="org.netbeans.nbbuild.Sigtest" classpath="${nbantext.jar}"/>
- <property name="sigtest.jar" location="${nb_all}/nbbuild/external/apitest.jar"/>
+ <property name="sigtest.jar" location="${nb_all}/nbbuild/external/apitest-70.jar"/>
<loadproperties srcFile="${manifest.mf}" prefix="mf.">
<filterchain>
<replaceregex pattern="[\n\r]+ ([^ ][^\n\r]*)"
diff --git a/platform/o.n.bootstrap/external/external/platform-launchers-9.0-license.txt b/platform/o.n.bootstrap/external/platform-launchers-9.0-license.txt
similarity index 100%
rename from platform/o.n.bootstrap/external/external/platform-launchers-9.0-license.txt
rename to platform/o.n.bootstrap/external/platform-launchers-9.0-license.txt
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists