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/05/11 18:28:26 UTC
[GitHub] geertjanw closed pull request #520: [NETBEANS-317] Ensuring that jars that are augmented with OSGi metada…
geertjanw closed pull request #520: [NETBEANS-317] Ensuring that jars that are augmented with OSGi metada…
URL: https://github.com/apache/incubator-netbeans/pull/520
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/c.jcraft.jsch/build.xml b/c.jcraft.jsch/build.xml
index 36e13e9a0..e8ba5b9e4 100644
--- a/c.jcraft.jsch/build.xml
+++ b/c.jcraft.jsch/build.xml
@@ -21,7 +21,8 @@
-->
<project name="c.jcraft.jsch" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/jsch-0.1.54.jar" property="c.jcraft.jsch.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/jsch-0.1.54.jar"/>
<manifest>
@@ -30,6 +31,7 @@
<attribute name="Export-Package" value="com.jcraft.jsch"/>
<attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss"/>
<attribute name="Require-Bundle" value="com.jcraft.jzlib"/>
+ <attribute name="NB-Original-CRC" value="${c.jcraft.jsch.crc32}"/>
</manifest>
</jar>
</target>
diff --git a/c.jcraft.jzlib/build.xml b/c.jcraft.jzlib/build.xml
index 7d2348a74..16347ee42 100644
--- a/c.jcraft.jzlib/build.xml
+++ b/c.jcraft.jzlib/build.xml
@@ -21,13 +21,15 @@
-->
<project name="c.jcraft.jzlib" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/jzlib-1.0.7.jar" property="c.jcraft.jzlib.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/jzlib-1.0.7.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="com.jcraft.jzlib"/>
<attribute name="Bundle-Version" value="1.0.7"/>
<attribute name="Export-Package" value="com.jcraft.jzlib"/>
+ <attribute name="NB-Original-CRC" value="${c.jcraft.jzlib.crc32}"/>
</manifest>
</jar>
</target>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/FileCRC32Calculator.java b/nbbuild/antsrc/org/netbeans/nbbuild/FileCRC32Calculator.java
new file mode 100644
index 000000000..ef5deffc5
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/FileCRC32Calculator.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+package org.netbeans.nbbuild;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.StandardOpenOption;
+import java.util.zip.CRC32;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * Calculate the CRC32 checksum for the given file. The resulting long value
+ * is converted to a string and placed in the property denoted with the name
+ * of {@code property}.
+ */
+public class FileCRC32Calculator extends Task {
+
+ private File file;
+ public void setFile(File file) {
+ this.file = file;
+ }
+
+ private String property;
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public @Override void execute() throws BuildException {
+
+ try {
+ CRC32 crc32 = new CRC32();
+ try(FileChannel channel = FileChannel.open(file.toPath(), StandardOpenOption.READ)) {
+ MappedByteBuffer mbb = channel.map(FileChannel.MapMode.READ_ONLY, 0, channel.size());
+ crc32.update(mbb);
+ }
+ getProject().setProperty(property, Long.toString(crc32.getValue()));
+ } catch (IOException ex) {
+ throw new BuildException(ex);
+ }
+ }
+}
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
index 69089c9bf..cf3ed9a67 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateLicenseSummary.java
@@ -31,6 +31,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
+import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
@@ -39,9 +40,12 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.CRC32;
@@ -298,12 +302,9 @@ private void evaluateBinaries(final PrintWriter licenseWriter, final PrintWriter
findBinaries(build, binaries2LicenseHeaders, crc2License, new HashMap<>(), "", testBinariesAreUnique, ignoredPatterns);
if (moduleFiles != null) {
for (Resource r : moduleFiles) {
- try (InputStream is = r.getInputStream()) {
- long crc = computeCRC32(is);
- Map<String, String> headers = crc2License.get(crc);
- if (headers != null) {
- binaries2LicenseHeaders.put(r.getName(), headers);
- }
+ Entry<Map<String, String>,Long> headers = getHeaders(crc2License, () -> r.getInputStream());
+ if (headers != null) {
+ binaries2LicenseHeaders.put(r.getName(), headers.getKey());
}
}
}
@@ -457,6 +458,41 @@ private void addNotice(PrintWriter output, String notice) throws IOException {
}
}
+ private Entry<Map<String, String>, Long> getHeaders(Map<Long, Map<String, String>> crc2License,
+ OpenInputStream in) throws IOException {
+ Map<String, String> headers;
+ long crc;
+
+ try (InputStream is = in.open()) {
+ crc = computeCRC32(is);
+ headers = crc2License.get(crc);
+ }
+
+ if (headers == null) {
+ try (InputStream is = in.open();
+ JarInputStream jin = new JarInputStream(is)) {
+ Manifest man = jin.getManifest();
+ if (man != null) {
+ String origCRC = man.getMainAttributes().getValue("NB-Original-CRC");
+ if (origCRC != null) {
+ try {
+ crc = Long.parseLong(origCRC);
+ headers = crc2License.get(crc);
+ } catch (NumberFormatException ex) {
+ throw new BuildException(ex);
+ }
+ }
+ }
+ }
+ }
+
+ return headers != null ? new SimpleEntry<>(headers, crc) : null;
+ }
+
+ private interface OpenInputStream {
+ public InputStream open() throws IOException;
+ }
+
private long computeCRC32(InputStream is) throws IOException {
byte[] buf = new byte[4096];
CRC32 crc32 = new CRC32();
@@ -527,31 +563,28 @@ private void findBinaries(File d, Map<String, Map<String, String>> binaries2Lice
if (f.isDirectory()) {
findBinaries(f, binaries2LicenseHeaders, crc2LicenseHeaders, crc2Binary, prefix + n + "/", testBinariesAreUnique, ignoredPatterns);
} else if (n.endsWith(".jar") || n.endsWith(".zip") || n.endsWith(".xml") || n.endsWith(".js") || n.endsWith(".dylib")) {
- try (InputStream is = new FileInputStream(f)) {
- long crc = computeCRC32(is);
- Map<String, String> headers = crc2LicenseHeaders.get(crc);
- if (headers != null) {
- String path = prefix + n;
- binaries2LicenseHeaders.put(path, headers);
- String otherPath = crc2Binary.put(crc, path);
- if (otherPath != null) {
- boolean ignored = false;
- for (String pattern : ignoredPatterns) {
- String[] parts = pattern.split(" ");
- assert parts.length == 2 : pattern;
- if (SelectorUtils.matchPath(parts[0], otherPath) && SelectorUtils.matchPath(parts[1], path)) {
- ignored = true;
- break;
- }
- if (SelectorUtils.matchPath(parts[0], path) && SelectorUtils.matchPath(parts[1], otherPath)) {
- ignored = true;
- break;
- }
+ Entry<Map<String, String>,Long> headersAndCRC = getHeaders(crc2LicenseHeaders, () -> new FileInputStream(f));
+ if (headersAndCRC != null) {
+ String path = prefix + n;
+ binaries2LicenseHeaders.put(path, headersAndCRC.getKey());
+ String otherPath = crc2Binary.put(headersAndCRC.getValue(), path);
+ if (otherPath != null) {
+ boolean ignored = false;
+ for (String pattern : ignoredPatterns) {
+ String[] parts = pattern.split(" ");
+ assert parts.length == 2 : pattern;
+ if (SelectorUtils.matchPath(parts[0], otherPath) && SelectorUtils.matchPath(parts[1], path)) {
+ ignored = true;
+ break;
}
- if (!ignored) {
- testBinariesAreUnique.append('\n').append(otherPath).append(" and ").append(path).append(" are identical");
+ if (SelectorUtils.matchPath(parts[0], path) && SelectorUtils.matchPath(parts[1], otherPath)) {
+ ignored = true;
+ break;
}
}
+ if (!ignored) {
+ testBinariesAreUnique.append('\n').append(otherPath).append(" and ").append(path).append(" are identical");
+ }
}
}
}
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index 6a1727994..81d4bb9ed 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -231,6 +231,10 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
<taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nbantext.jar}"/>
</target>
+ <target name="-define-FileCRC32Calculator">
+ <taskdef name="FileCRC32Calculator" classname="org.netbeans.nbbuild.FileCRC32Calculator" classpath="${nbantext.jar}"/>
+ </target>
+
<target name="-process.release.files"/>
<target name="-download.release.files" depends="-define-downloadbinaries-task">
diff --git a/o.apache.commons.codec/build.xml b/o.apache.commons.codec/build.xml
index 4bae54f99..61cd55139 100644
--- a/o.apache.commons.codec/build.xml
+++ b/o.apache.commons.codec/build.xml
@@ -21,13 +21,15 @@
-->
<project name="o.apache.commons.codec" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/commons-codec-1.3.jar" property="o.apache.commons.codec.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/commons-codec-1.3.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/>
<attribute name="Bundle-Version" value="1.3.0"/>
<attribute name="Export-Package" value="org.apache.commons.codec;version="1.3.0",org.apache.commons.codec.binary;version="1.3.0",org.apache.commons.codec.digest;version="1.3.0",org.apache.commons.codec.language;version="1.3.0",org.apache.commons.codec.net;version="1.3.0""/>
+ <attribute name="NB-Original-CRC" value="${o.apache.commons.codec.crc32}"/>
</manifest>
</jar>
</target>
diff --git a/o.apache.commons.httpclient/build.xml b/o.apache.commons.httpclient/build.xml
index fe3de00dd..b6088c309 100644
--- a/o.apache.commons.httpclient/build.xml
+++ b/o.apache.commons.httpclient/build.xml
@@ -21,7 +21,8 @@
-->
<project name="o.apache.commons.httpclient" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/commons-httpclient-3.1.jar" property="o.apache.commons.httpclient.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/commons-httpclient-3.1.jar"/>
<manifest>
@@ -30,6 +31,7 @@
<attribute name="Export-Package" value="org.apache.commons.httpclient;version="3.1.0",org.apache.commons.httpclient.auth;version="3.1.0",org.apache.commons.httpclient.cookie;version="3.1.0",org.apache.commons.httpclient.methods;version="3.1.0",org.apache.commons.httpclient.methods.multipart;version="3.1.0",org.apache.commons.httpclient.params;version="3.1.0",org.apache.commons.httpclient.protocol;version="3.1.0",org.apache.commons.httpclient.util;version="3.1.0""/>
<attribute name="Import-Package" value="javax.crypto;resolution:=optional,javax.crypto.spec;resolution:=optional,javax.net;resolution:=optional,javax.net.ssl;resolution:=optional,org.apache.commons.codec;version="[1.2.0,2.0.0)",org.apache.commons.codec.binary;version="[1.2.0,2.0.0)",org.apache.commons.codec.net;version="[1.2.0,2.0.0)",org.apache.commons.logging;version="[1.0.4,2.0.0)""/>
<attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="NB-Original-CRC" value="${o.apache.commons.httpclient.crc32}"/>
</manifest>
</jar>
</target>
diff --git a/o.apache.commons.logging/build.xml b/o.apache.commons.logging/build.xml
index 5ba65701a..5bf60f38f 100644
--- a/o.apache.commons.logging/build.xml
+++ b/o.apache.commons.logging/build.xml
@@ -21,13 +21,15 @@
-->
<project name="o.apache.commons.logging" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/commons-logging-1.1.1.jar" property="o.apache.commons.logging.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/commons-logging-1.1.1.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="org.apache.commons.logging"/>
<attribute name="Bundle-Version" value="1.1.1"/>
<attribute name="Export-Package" value="org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1""/>
+ <attribute name="NB-Original-CRC" value="${o.apache.commons.logging.crc32}"/>
</manifest>
</jar>
</target>
diff --git a/o.apache.ws.commons.util/build.xml b/o.apache.ws.commons.util/build.xml
index afd5e7ae6..b725ccefe 100644
--- a/o.apache.ws.commons.util/build.xml
+++ b/o.apache.ws.commons.util/build.xml
@@ -21,7 +21,8 @@
-->
<project name="o.apache.ws.commons.util" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/ws-commons-util-1.0.1.jar" property="o.apache.ws.commons.util.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/ws-commons-util-1.0.1.jar"/>
<manifest>
@@ -29,6 +30,7 @@
<attribute name="Bundle-Version" value="1.0.1"/>
<attribute name="Export-Package" value="org.apache.ws.commons.serialize;version="1.0.1",org.apache.ws.commons.util;version="1.0.1""/>
<attribute name="Import-Package" value="javax.xml,javax.xml.namespace,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"/>
+ <attribute name="NB-Original-CRC" value="${o.apache.ws.commons.util.crc32}"/>
</manifest>
</jar>
</target>
diff --git a/o.apache.xmlrpc/build.xml b/o.apache.xmlrpc/build.xml
index eb53be54b..f52bb49b0 100644
--- a/o.apache.xmlrpc/build.xml
+++ b/o.apache.xmlrpc/build.xml
@@ -21,7 +21,8 @@
-->
<project name="o.apache.xmlrpc" default="build" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar">
+ <target name="jar" depends="-define-FileCRC32Calculator">
+ <FileCRC32Calculator file="external/xmlrpc-common-3.0.jar" property="o.apache.xmlrpc.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/xmlrpc-common-3.0.jar"/>
<zipfileset src="external/xmlrpc-client-3.0.jar"/>
@@ -31,6 +32,7 @@
<attribute name="Bundle-Version" value="3.0.0"/>
<attribute name="Export-Package" value="org.apache.xmlrpc,org.apache.xmlrpc.client,org.apache.xmlrpc.client.util,org.apache.xmlrpc.common,org.apache.xmlrpc.jaxb,org.apache.xmlrpc.metadata,org.apache.xmlrpc.parser,org.apache.xmlrpc.serializer,org.apache.xmlrpc.server,org.apache.xmlrpc.util,org.apache.xmlrpc.webserver"/>
<attribute name="Import-Package" value="javax.xml.bind,javax.xml.namespace,javax.xml.parsers,org.apache.commons.httpclient,org.apache.commons.httpclient.auth,org.apache.commons.httpclient.methods,org.apache.commons.httpclient.params,org.apache.commons.logging,org.apache.ws.commons.serialize,org.apache.ws.commons.util,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
+ <attribute name="NB-Original-CRC" value="${o.apache.xmlrpc.crc32}"/> <!-- CRC of xmlrpc-common-3.0.jar -->
</manifest>
</jar>
</target>
diff --git a/o.apache.xmlrpc/external/xmlrpc-client-3.0-license.txt b/o.apache.xmlrpc/external/xmlrpc-3.0-license.txt
similarity index 99%
rename from o.apache.xmlrpc/external/xmlrpc-client-3.0-license.txt
rename to o.apache.xmlrpc/external/xmlrpc-3.0-license.txt
index eb7ff706e..0ab2b0f09 100644
--- a/o.apache.xmlrpc/external/xmlrpc-client-3.0-license.txt
+++ b/o.apache.xmlrpc/external/xmlrpc-3.0-license.txt
@@ -4,6 +4,7 @@ Origin: Apache Software Foundation
Version: 3.0
License: Apache-2.0
URL: http://ws.apache.org/xmlrpc/
+Files: xmlrpc-client-3.0.jar, xmlrpc-common-3.0.jar, xmlrpc-server-3.0.jar
Apache License
Version 2.0, January 2004
diff --git a/o.apache.xmlrpc/external/xmlrpc-common-3.0-license.txt b/o.apache.xmlrpc/external/xmlrpc-common-3.0-license.txt
deleted file mode 100644
index eb7ff706e..000000000
--- a/o.apache.xmlrpc/external/xmlrpc-common-3.0-license.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-Name: Apache XMLRPC
-Description: Java implementation of XML-RPC
-Origin: Apache Software Foundation
-Version: 3.0
-License: Apache-2.0
-URL: http://ws.apache.org/xmlrpc/
-
- 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/o.apache.xmlrpc/external/xmlrpc-server-3.0-license.txt b/o.apache.xmlrpc/external/xmlrpc-server-3.0-license.txt
deleted file mode 100644
index eb7ff706e..000000000
--- a/o.apache.xmlrpc/external/xmlrpc-server-3.0-license.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-Name: Apache XMLRPC
-Description: Java implementation of XML-RPC
-Origin: Apache Software Foundation
-Version: 3.0
-License: Apache-2.0
-URL: http://ws.apache.org/xmlrpc/
-
- 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.
----------------------------------------------------------------
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