This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 1ae47c8 Remove rat-exclusion for *.jar.external and use licenseinfo.xml new 7a6f223 Merge pull request #1558 from matthiasblaesing/fx-licenseinfo 1ae47c8 is described below commit 1ae47c8a48618752a92227fcb6c32e08a71502af Author: Matthias Bläsing <mblaes...@doppel-helix.eu> AuthorDate: Tue Oct 8 19:20:56 2019 +0200 Remove rat-exclusion for *.jar.external and use licenseinfo.xml --- extra/libs.javafx.linux/licenseinfo.xml | 33 ++++++++++++++++++++++++++++++++ extra/libs.javafx.macosx/licenseinfo.xml | 33 ++++++++++++++++++++++++++++++++ extra/libs.javafx.win/licenseinfo.xml | 33 ++++++++++++++++++++++++++++++++ nbbuild/rat-exclusions.txt | 1 - 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/extra/libs.javafx.linux/licenseinfo.xml b/extra/libs.javafx.linux/licenseinfo.xml new file mode 100644 index 0000000..dbeffea --- /dev/null +++ b/extra/libs.javafx.linux/licenseinfo.xml @@ -0,0 +1,33 @@ +<?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. + +--> +<licenseinfo> + <fileset> + <file>external/javafx-base-13-linux.jar.external</file> + <file>external/javafx-controls-13-linux.jar.external</file> + <file>external/javafx-graphics-13-linux.jar.external</file> + <file>external/javafx-media-13-linux.jar.external</file> + <file>external/javafx-swing-13-linux.jar.external</file> + <file>external/javafx-web-13-linux.jar.external</file> + <license ref="Apache-2.0-ASF" /> + <comment type="COMMENT_UNSUPPORTED" /> + </fileset> +</licenseinfo> diff --git a/extra/libs.javafx.macosx/licenseinfo.xml b/extra/libs.javafx.macosx/licenseinfo.xml new file mode 100644 index 0000000..e5d1304 --- /dev/null +++ b/extra/libs.javafx.macosx/licenseinfo.xml @@ -0,0 +1,33 @@ +<?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. + +--> +<licenseinfo> + <fileset> + <file>external/javafx-base-13-mac.jar.external</file> + <file>external/javafx-controls-13-mac.jar.external</file> + <file>external/javafx-graphics-13-mac.jar.external</file> + <file>external/javafx-media-13-mac.jar.external</file> + <file>external/javafx-swing-13-mac.jar.external</file> + <file>external/javafx-web-13-mac.jar.external</file> + <license ref="Apache-2.0-ASF" /> + <comment type="COMMENT_UNSUPPORTED" /> + </fileset> +</licenseinfo> diff --git a/extra/libs.javafx.win/licenseinfo.xml b/extra/libs.javafx.win/licenseinfo.xml new file mode 100644 index 0000000..516e24b --- /dev/null +++ b/extra/libs.javafx.win/licenseinfo.xml @@ -0,0 +1,33 @@ +<?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. + +--> +<licenseinfo> + <fileset> + <file>external/javafx-base-13-win.jar.external</file> + <file>external/javafx-controls-13-win.jar.external</file> + <file>external/javafx-graphics-13-win.jar.external</file> + <file>external/javafx-media-13-win.jar.external</file> + <file>external/javafx-swing-13-win.jar.external</file> + <file>external/javafx-web-13-win.jar.external</file> + <license ref="Apache-2.0-ASF" /> + <comment type="COMMENT_UNSUPPORTED" /> + </fileset> +</licenseinfo> diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt index 910cfba..851f61c 100644 --- a/nbbuild/rat-exclusions.txt +++ b/nbbuild/rat-exclusions.txt @@ -153,7 +153,6 @@ platform/openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorT ###### external dependencies licences and notices **/external/*-license.txt **/external/*-notice.txt -**/external/*.jar.external ###### generated ### signatures for past versions --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists