This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 f962223 Add Spring framework 5.2.2
new 929890e Merge pull request #1756 from blackleg/spring_framework_5
f962223 is described below
commit f962223edec5cbb247084decb78eace256869ec4
Author: Hector Espert <hectorespertpa...@gmail.com>
AuthorDate: Fri Dec 6 21:26:31 2019 +0100
Add Spring framework 5.2.2
---
.../spring.webmvc/nbproject/project.properties | 2 +-
.../spring/webmvc/resources/Bundle.properties | 1 +
.../modules/spring/webmvc/resources/layer.xml | 3 +
.../spring/webmvc/resources/spring-webmvc-5.0.xml | 34 ++-
java/libs.springframework/external/binaries-list | 22 ++
.../spring-framework-5.2.2.RELEASE-license.txt | 283 +++++++++++++++++++++
.../spring-framework-5.2.2.RELEASE-notice.txt | 11 +
.../nbproject/project.properties | 49 +++-
.../libs/springframework/Bundle.properties | 2 +-
.../org/netbeans/libs/springframework/layer.xml | 3 +
.../libs/springframework/spring-framework500.xml | 86 +++++++
nbbuild/licenses/Apache-2.0-spring5.2.2 | 275 ++++++++++++++++++++
nbbuild/licenses/names.properties | 1 +
13 files changed, 755 insertions(+), 17 deletions(-)
diff --git a/enterprise/spring.webmvc/nbproject/project.properties
b/enterprise/spring.webmvc/nbproject/project.properties
index 83410b8..1c60922 100644
--- a/enterprise/spring.webmvc/nbproject/project.properties
+++ b/enterprise/spring.webmvc/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.7
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
#release.external/spring-webmvc-3.0.6.RELEASE.jar=modules/ext/spring/spring-webmvc-3.0.6.RELEASE.jar
diff --git
a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties
index c9444e3..20c6f51 100644
---
a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties
+++
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties
@@ -23,5 +23,6 @@ OpenIDE-Module-Long-Description=Provides support for
extending a web project wit
Templates/SpringFramework/AbstractController.java=Abstract Controller
Templates/SpringFramework/SimpleFormController.java=Simple Form Controller
Templates/SpringFramework/index.jsp=View page
+spring-webmvc5=Spring Web MVC 5.2.2
spring-webmvc4=Spring Web MVC 4.0.1
spring-webmvc3=Spring Web MVC 3.2.7
diff --git
a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml
index 0a2dddd..ff7c1fa 100644
---
a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml
+++
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml
@@ -32,6 +32,9 @@
</folder>
<folder name="org-netbeans-api-project-libraries">
<folder name="Libraries">
+ <file name="spring-webmvc-5.0.xml" url="spring-webmvc-5.0.xml">
+ <attr name="displayName"
bundlevalue="org.netbeans.modules.spring.webmvc.resources.Bundle#spring-webmvc5"/>
+ </file>
<file name="spring-webmvc-4.0.xml" url="spring-webmvc-4.0.xml">
<attr name="displayName"
bundlevalue="org.netbeans.modules.spring.webmvc.resources.Bundle#spring-webmvc4"/>
</file>
diff --git
a/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml
similarity index 53%
copy from
java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
copy to
enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml
index 3b19829..b6e01ab 100644
--- a/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
+++
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml
@@ -19,16 +19,24 @@
under the License.
-->
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN"
"http://www.netbeans.org/dtds/filesystem-1_2.dtd";>
-<filesystem>
- <folder name="org-netbeans-api-project-libraries">
- <folder name="Libraries">
- <file name="spring-framework300.xml" url="spring-framework300.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.libs.springframework.Bundle#spring-framework300"/>
- </file>
- <file name="spring-framework400.xml" url="spring-framework400.xml">
- <attr name="displayName"
bundlevalue="org.netbeans.libs.springframework.Bundle#spring-framework400"/>
- </file>
- </folder>
- </folder>
-</filesystem>
+<library version="3.0"
xmlns="http://www.netbeans.org/ns/library-declaration/3";>
+ <name>spring-webmvc5.0</name>
+ <type>j2se</type>
+
<localizing-bundle>org.netbeans.modules.spring.webmvc.resources.Bundle</localizing-bundle>
+ <volume>
+ <type>classpath</type>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.2.RELEASE.jar!/</resource>
+ </volume>
+ <volume>
+ <type>src</type>
+ </volume>
+ <volume>
+ <type>javadoc</type>
+ </volume>
+ <properties>
+ <property>
+ <name>maven-dependencies</name>
+ <value>org.springframework:spring-webmvc:5.2.2.RELEASE:jar</value>
+ </property>
+ </properties>
+</library>
diff --git a/java/libs.springframework/external/binaries-list
b/java/libs.springframework/external/binaries-list
index 0aa43e9..d1533c7 100644
--- a/java/libs.springframework/external/binaries-list
+++ b/java/libs.springframework/external/binaries-list
@@ -16,3 +16,25 @@
# under the License.
7666B94C1004AFFFE88E5328BD70EBA6F60125F4 spring-framework-3.2.7.RELEASE.zip
91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266 spring-framework-4.0.1.RELEASE.zip
+
+899739CF7F338F6297AA9EB25EA8B16338FE4E6D
org.springframework:spring-aop:5.2.2.RELEASE
+A7FC38EE5FCC7EFFF607CC93B5FA7259C0FBB4DA
org.springframework:spring-aspects:5.2.2.RELEASE
+81E4D9CC2E8FAC88AB4EB7325C4521BD07C6389C
org.springframework:spring-beans:5.2.2.RELEASE
+A77A18FA425EBA9C55447FA0711E2DBFBF71907B
org.springframework:spring-context:5.2.2.RELEASE
+F31F4B86F2A4C973834848917774F12C3D108B8A
org.springframework:spring-context-indexer:5.2.2.RELEASE
+F09E0177737A5BE5C6B6315363BFFF722E3524CB
org.springframework:spring-context-support:5.2.2.RELEASE
+BFCF2F6D0494D89DB63AE170B8491223C93A88DC
org.springframework:spring-core:5.2.2.RELEASE
+EB93BC4D4EB8E0BEE60EA910E0FD615869336643
org.springframework:spring-expression:5.2.2.RELEASE
+73DE68C900985304EF13EE3C4D313FACF7FBF883
org.springframework:spring-instrument:5.2.2.RELEASE
+35EFD564BF664C0BF53BD336B583391A7F872DA7
org.springframework:spring-jcl:5.2.2.RELEASE
+6F0070F04C60F77D0048DC5521F8AAFD5A86E87E
org.springframework:spring-jdbc:5.2.2.RELEASE
+A275151B739A85C3EF9003338231A3798A72A870
org.springframework:spring-jms:5.2.2.RELEASE
+93E22C86E57017E3093347E31BDB162B928999C9
org.springframework:spring-messaging:5.2.2.RELEASE
+1B17C9E69D92E54439A092D6943E956F80392F43
org.springframework:spring-orm:5.2.2.RELEASE
+6BFABF762138BFFAF1799F9D27D37F0EE7896722
org.springframework:spring-oxm:5.2.2.RELEASE
+444E2F91F667558DF1853B15915AC28B2185404C
org.springframework:spring-test:5.2.2.RELEASE
+2AF860BAA0B094E13786613E15E1804EDB7A5977
org.springframework:spring-tx:5.2.2.RELEASE
+D9B0A8079B7D604F134E3054127A7AEBA65949A5
org.springframework:spring-web:5.2.2.RELEASE
+610C4889B4E5087E2103FCFAE32144AF0321D06D
org.springframework:spring-webflux:5.2.2.RELEASE
+A0E9E88A296C09850F92318872F4DEE9F62C8C13
org.springframework:spring-webmvc:5.2.2.RELEASE
+F751C66B60482096F97F28E196DE25AAABC39668
org.springframework:spring-websocket:5.2.2.RELEASE
diff --git
a/java/libs.springframework/external/spring-framework-5.2.2.RELEASE-license.txt
b/java/libs.springframework/external/spring-framework-5.2.2.RELEASE-license.txt
new file mode 100644
index 0000000..cf12ea2
--- /dev/null
+++
b/java/libs.springframework/external/spring-framework-5.2.2.RELEASE-license.txt
@@ -0,0 +1,283 @@
+Name: Spring Framework
+Description: Java/J2EE application framework
+Version: 5.2.2.RELEASE
+Origin: Spring
+License: Apache-2.0-spring5.2.2
+Files: spring-instrument-5.2.2.RELEASE.jar
spring-context-support-5.2.2.RELEASE.jar
spring-context-indexer-5.2.2.RELEASE.jar spring-jms-5.2.2.RELEASE.jar
spring-beans-5.2.2.RELEASE.jar spring-webmvc-5.2.2.RELEASE.jar
spring-expression-5.2.2.RELEASE.jar spring-context-5.2.2.RELEASE.jar
spring-orm-5.2.2.RELEASE.jar spring-core-5.2.2.RELEASE.jar
spring-aspects-5.2.2.RELEASE.jar spring-websocket-5.2.2.RELEASE.jar
spring-tx-5.2.2.RELEASE.jar spring-jdbc-5.2.2.RELEASE.jar spring-webflux-5.2.2.
[...]
+URL: https://spring.io/projects/spring-framework
+
+ Apache License
+ Version 2.0, January 2004
+ https://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
+
+ https://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.
+
+=======================================================================
+
+SPRING FRAMEWORK 5.2.2.RELEASE SUBCOMPONENTS:
+
+Spring Framework 5.2.2.RELEASE includes a number of subcomponents
+with separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+
+>>> ASM 4.0 (org.ow2.asm:asm:4.0, org.ow2.asm:asm-commons:4.0):
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2009, OW2 Consortium <https://www.ow2.org/>
+
+
+>>> CGLIB 3.0 (cglib:cglib:3.0):
+
+Per the LICENSE file in the CGLIB JAR distribution downloaded from
+https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
+CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
+is included above.
+
+
+===============================================================================
+
+To the extent any open source components are licensed under the EPL and/or
+other similar licenses that require the source code and/or modifications to
+source code to be made available (as would be noted above), you may obtain a
+copy of the source code corresponding to the binaries for such open source
+components and modifications thereto, if any, (the "Source Files"), by
+downloading the Source Files from https://spring.io/projects, Pivotal's website
+at https://network.pivotal.io/open-source, or by sending a request, with your
+name and address to: Pivotal Software, Inc., 875 Howard Street, 5th floor, San
+Francisco, CA 94103, Attention: General Counsel. All such requests should
+clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel. Pivotal
+can mail a copy of the Source Files to you on a CD or equivalent physical
+medium.
+
+This offer to obtain a copy of the Source Files is valid for three years from
+the date you acquired this Software product. Alternatively, the Source Files
+may accompany the Software.
diff --git
a/java/libs.springframework/external/spring-framework-5.2.2.RELEASE-notice.txt
b/java/libs.springframework/external/spring-framework-5.2.2.RELEASE-notice.txt
new file mode 100644
index 0000000..8856dd1
--- /dev/null
+++
b/java/libs.springframework/external/spring-framework-5.2.2.RELEASE-notice.txt
@@ -0,0 +1,11 @@
+Spring Framework 5.2.2.RELEASE
+Copyright (c) 2002-2019 Pivotal, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
diff --git a/java/libs.springframework/nbproject/project.properties
b/java/libs.springframework/nbproject/project.properties
index e37fca3..44f0911 100644
--- a/java/libs.springframework/nbproject/project.properties
+++ b/java/libs.springframework/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.7
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true
@@ -71,6 +71,29 @@
release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELE
release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-websocket-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-websocket-4.0.1.RELEASE.jar
release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/license.txt=modules/ext/spring-4/license.txt
+# Spring 5.2.2
+release.external/spring-aop-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-aop-5.2.2.RELEASE.jar
+release.external/spring-aspects-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-aspects-5.2.2.RELEASE.jar
+release.external/spring-beans-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-beans-5.2.2.RELEASE.jar
+release.external/spring-context-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-context-5.2.2.RELEASE.jar
+release.external/spring-context-indexer-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-context-indexer-5.2.2.RELEASE.jar
+release.external/spring-context-support-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-context-support-5.2.2.RELEASE.jar
+release.external/spring-core-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-core-5.2.2.RELEASE.jar
+release.external/spring-expression-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-expression-5.2.2.RELEASE.jar
+release.external/spring-instrument-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-instrument-5.2.2.RELEASE.jar
+release.external/spring-jcl-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-jcl-5.2.2.RELEASE.jar
+release.external/spring-jdbc-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-jdbc-5.2.2.RELEASE.jar
+release.external/spring-jms-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-jms-5.2.2.RELEASE.jar
+release.external/spring-messaging-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-messaging-5.2.2.RELEASE.jar
+release.external/spring-orm-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-orm-5.2.2.RELEASE.jar
+release.external/spring-oxm-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-oxm-5.2.2.RELEASE.jar
+release.external/spring-test-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-test-5.2.2.RELEASE.jar
+release.external/spring-tx-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-tx-5.2.2.RELEASE.jar
+release.external/spring-web-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-web-5.2.2.RELEASE.jar
+release.external/spring-webflux-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-webflux-5.2.2.RELEASE.jar
+release.external/spring-webmvc-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-webmvc-5.2.2.RELEASE.jar
+release.external/spring-websocket-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-websocket-5.2.2.RELEASE.jar
+
jnlp.indirect.jars=\
modules/ext/spring-3.0/spring-aop-3.2.7.RELEASE.jar,\
modules/ext/spring-3.0/spring-aspects-3.2.7.RELEASE.jar,\
@@ -114,7 +137,29 @@ jnlp.indirect.jars=\
modules/ext/spring-4/spring-web-4.0.1.RELEASE.jar,\
modules/ext/spring-4/spring-webmvc-4.0.1.RELEASE.jar,\
modules/ext/spring-4/spring-webmvc-portlet-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-websocket-4.0.1.RELEASE.jar
+ modules/ext/spring-4/spring-websocket-4.0.1.RELEASE.jar,\
+ modules/ext/spring-5/spring-aop-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-aspects-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-beans-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-context-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-context-indexer-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-context-support-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-core-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-expression-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-instrument-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-jcl-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-jdbc-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-jms-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-messaging-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-orm-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-oxm-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-test-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-tx-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-web-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-webflux-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-webmvc-5.2.2.RELEASE.jar,\
+ modules/ext/spring-5/spring-websocket-5.2.2.RELEASE.jar
+
jnlp.verify.excludes=\
modules/ext/spring-3.0/license.txt,\
modules/ext/spring-4/license.txt
diff --git
a/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
b/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
index 3f1b7bd..541655f 100644
---
a/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
+++
b/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
@@ -24,4 +24,4 @@ OpenIDE-Module-Long-Description=\
spring-framework300=Spring Framework 3.2.7
spring-framework400=Spring Framework 4.0.1
-
+spring-framework500=Spring Framework 5.2.2
diff --git
a/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
b/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
index 3b19829..792a36a 100644
--- a/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
+++ b/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml
@@ -29,6 +29,9 @@
<file name="spring-framework400.xml" url="spring-framework400.xml">
<attr name="displayName"
bundlevalue="org.netbeans.libs.springframework.Bundle#spring-framework400"/>
</file>
+ <file name="spring-framework500.xml" url="spring-framework500.xml">
+ <attr name="displayName"
bundlevalue="org.netbeans.libs.springframework.Bundle#spring-framework500"/>
+ </file>
</folder>
</folder>
</filesystem>
diff --git
a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework500.xml
b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework500.xml
new file mode 100644
index 0000000..1ba5bf0
--- /dev/null
+++
b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework500.xml
@@ -0,0 +1,86 @@
+<?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.
+
+-->
+<library version="3.0"
xmlns="http://www.netbeans.org/ns/library-declaration/3";>
+ <name>spring-framework500</name>
+ <type>j2se</type>
+
<localizing-bundle>org.netbeans.libs.springframework.Bundle</localizing-bundle>
+ <volume>
+ <type>classpath</type>
+
<resource>jar:nbinst://org.apache.commons.logging/modules/org-apache-commons-logging.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.cglib/modules/ext/cglib-2.2.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-aop-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-aspects-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-beans-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-indexer-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-support-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-core-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-expression-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-instrument-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jcl-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jdbc-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jms-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-messaging-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-orm-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-oxm-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-test-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-tx-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-web-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webflux-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.2.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-websocket-5.2.2.RELEASE.jar!/</resource>
+ </volume>
+ <volume>
+ <type>src</type>
+ </volume>
+ <volume>
+ <type>javadoc</type>
+ </volume>
+ <properties>
+ <property>
+ <name>maven-dependencies</name>
+ <value>
+ org.springframework:spring-aop:5.2.2.RELEASE:jar
+ org.springframework:spring-aspects:5.2.2.RELEASE:jar
+ org.springframework:spring-beans:5.2.2.RELEASE:jar
+ org.springframework:spring-context:5.2.2.RELEASE:jar
+ org.springframework:spring-context-indexer:5.2.2.RELEASE:jar
+ org.springframework:spring-context-support:5.2.2.RELEASE:jar
+ org.springframework:spring-core:5.2.2.RELEASE:jar
+ org.springframework:spring-expression:5.2.2.RELEASE:jar
+ org.springframework:spring-instrument:5.2.2.RELEASE:jar
+ org.springframework:spring-jcl:5.2.2.RELEASE:jar
+ org.springframework:spring-jdbc:5.2.2.RELEASE:jar
+ org.springframework:spring-jms:5.2.2.RELEASE:jar
+ org.springframework:spring-messaging:5.2.2.RELEASE:jar
+ org.springframework:spring-orm:5.2.2.RELEASE:jar
+ org.springframework:spring-oxm:5.2.2.RELEASE:jar
+ org.springframework:spring-test:5.2.2.RELEASE:jar
+ org.springframework:spring-tx:5.2.2.RELEASE:jar
+ org.springframework:spring-web:5.2.2.RELEASE:jar
+ org.springframework:spring-webflux:5.2.2.RELEASE:jar
+ org.springframework:spring-webmvc:5.2.2.RELEASE:jar
+ org.springframework:spring-websocket:5.2.2.RELEASE:jar
+ </value>
+ </property>
+ </properties>
+</library>
diff --git a/nbbuild/licenses/Apache-2.0-spring5.2.2
b/nbbuild/licenses/Apache-2.0-spring5.2.2
new file mode 100644
index 0000000..52f190d
--- /dev/null
+++ b/nbbuild/licenses/Apache-2.0-spring5.2.2
@@ -0,0 +1,275 @@
+ Apache License
+ Version 2.0, January 2004
+ https://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
+
+ https://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.
+
+=======================================================================
+
+SPRING FRAMEWORK 5.2.2.RELEASE SUBCOMPONENTS:
+
+Spring Framework 5.2.2.RELEASE includes a number of subcomponents
+with separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+
+>>> ASM 4.0 (org.ow2.asm:asm:4.0, org.ow2.asm:asm-commons:4.0):
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2009, OW2 Consortium <https://www.ow2.org/>
+
+
+>>> CGLIB 3.0 (cglib:cglib:3.0):
+
+Per the LICENSE file in the CGLIB JAR distribution downloaded from
+https://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
+CGLIB 3.0 is licensed under the Apache License, version 2.0, the text of which
+is included above.
+
+
+===============================================================================
+
+To the extent any open source components are licensed under the EPL and/or
+other similar licenses that require the source code and/or modifications to
+source code to be made available (as would be noted above), you may obtain a
+copy of the source code corresponding to the binaries for such open source
+components and modifications thereto, if any, (the "Source Files"), by
+downloading the Source Files from https://spring.io/projects, Pivotal's website
+at https://network.pivotal.io/open-source, or by sending a request, with your
+name and address to: Pivotal Software, Inc., 875 Howard Street, 5th floor, San
+Francisco, CA 94103, Attention: General Counsel. All such requests should
+clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel. Pivotal
+can mail a copy of the Source Files to you on a CD or equivalent physical
+medium.
+
+This offer to obtain a copy of the Source Files is valid for three years from
+the date you acquired this Software product. Alternatively, the Source Files
+may accompany the Software.
diff --git a/nbbuild/licenses/names.properties
b/nbbuild/licenses/names.properties
index b894c45..c272350 100644
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@ -21,6 +21,7 @@ Apache-2.0-groovy=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.
Apache-2.0-lucene=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Apache Lucene addendums
Apache-2.0-spring3.2.7=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
3.2.7
Apache-2.0-spring4.0.1=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
4.0.1
+Apache-2.0-spring5.2.2=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
5.2.2
Apache-2.0-ASF=Apache Version 2.0 with CLA reference
(http://www.apache.org/licenses/LICENSE-2.0.txt)
OSGi=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html)
with OSGi materials under Apache License Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
BSD-css3-grammar=BSD license for CSS 2.1/3 grammar with copyright for Jim
Idle, Temporal Wave LLC/ASF
---------------------------------------------------------------------
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
