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 7234200 Update Spring framework 4
new 7a9ac1a Merge pull request #1816 from blackleg/spring_framework_update
7234200 is described below
commit 7234200b99dce5480b83cbbb6344d55816f636d5
Author: Hector Espert <[email protected]>
AuthorDate: Sun Dec 22 15:22:22 2019 +0100
Update Spring framework 4
---
.../spring/webmvc/resources/Bundle.properties | 2 +-
.../spring/webmvc/resources/spring-webmvc-4.0.xml | 4 +-
java/libs.springframework/external/binaries-list | 22 +++++-
.../spring-framework-4.0.1.RELEASE-notice.txt | 2 -
...=> spring-framework-4.3.25.RELEASE-license.txt} | 51 ++++++------
.../spring-framework-4.3.25.RELEASE-notice.txt | 2 +
.../spring-framework-5.2.2.RELEASE-notice.txt | 9 ---
.../nbproject/project.properties | 90 ++++++++++------------
.../libs/springframework/Bundle.properties | 2 +-
.../libs/springframework/spring-framework400.xml | 84 ++++++++++----------
...che-2.0-spring4.0.1 => Apache-2.0-spring4.3.25} | 42 +++++-----
11 files changed, 153 insertions(+), 157 deletions(-)
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 20c6f51..deefe5e 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
@@ -24,5 +24,5 @@ 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-webmvc4=Spring Web MVC 4.3.25
spring-webmvc3=Spring Web MVC 3.2.7
diff --git
a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml
index 82eaee7..5dc4457 100644
---
a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml
+++
b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml
@@ -25,7 +25,7 @@
<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-4/spring-webmvc-4.0.1.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-4.3.25.RELEASE.jar!/</resource>
</volume>
<volume>
<type>src</type>
@@ -37,7 +37,7 @@
<properties>
<property>
<name>maven-dependencies</name>
- <value>org.springframework:spring-webmvc:4.0.1.RELEASE:jar</value>
+ <value>org.springframework:spring-webmvc:4.3.25.RELEASE:jar</value>
</property>
</properties>
</library>
diff --git a/java/libs.springframework/external/binaries-list
b/java/libs.springframework/external/binaries-list
index d1533c7..890cd2e 100644
--- a/java/libs.springframework/external/binaries-list
+++ b/java/libs.springframework/external/binaries-list
@@ -15,7 +15,27 @@
# specific language governing permissions and limitations
# under the License.
7666B94C1004AFFFE88E5328BD70EBA6F60125F4 spring-framework-3.2.7.RELEASE.zip
-91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266 spring-framework-4.0.1.RELEASE.zip
+
+B426D37D95562934EB83845709760D69547017C5
org.springframework:spring-aop:4.3.25.RELEASE
+C8B685E6ED0D7DA3710335CF961A498BDB3FDDE2
org.springframework:spring-aspects:4.3.25.RELEASE
+E325C94D71A0D765A7DAB7E898CA167803AE43ED
org.springframework:spring-beans:4.3.25.RELEASE
+3DDEC82CE3EDA9AC3535E129C79C49CD3AC87180
org.springframework:spring-context:4.3.25.RELEASE
+4B1CFA53C586D0318E5B0E7FBB93502AE18A692D
org.springframework:spring-context-support:4.3.25.RELEASE
+584DB35A0FD30029A1CD7437C935B87D9A2A9237
org.springframework:spring-core:4.3.25.RELEASE
+3B37DE6186F6EA2CB454B4E8615B8873B896E574
org.springframework:spring-expression:4.3.25.RELEASE
+3BEF105BE5EDAFD8A433ACB59E44F74F7689329B
org.springframework:spring-instrument:4.3.25.RELEASE
+1CB97214496DC07B8D90313EBB7AFCD73333DFC1
org.springframework:spring-instrument-tomcat:4.3.25.RELEASE
+C79A08599F3F35E2DDA03867017D4149436FF197
org.springframework:spring-jdbc:4.3.25.RELEASE
+8CDFB35A4F9C1966C7F4B843BBF1A616ADD9CD4C
org.springframework:spring-jms:4.3.25.RELEASE
+3C24017415C18BE95A514B419677443460A0B1E4
org.springframework:spring-messaging:4.3.25.RELEASE
+A41E244075F8664C595A4E258DD0917808268279
org.springframework:spring-orm:4.3.25.RELEASE
+37FDF6383A6A44B774EEA9D9AFE6AE9927382929
org.springframework:spring-oxm:4.3.25.RELEASE
+4A64C7820499D41025407E02E58D793C0F5E8403
org.springframework:spring-test:4.3.25.RELEASE
+FA90985A9F4FA38A90472D343019C88C7A1B3364
org.springframework:spring-tx:4.3.25.RELEASE
+76D29C076153E09961C8E6FD9B2D5C50BB80B902
org.springframework:spring-web:4.3.25.RELEASE
+C9FBFCF99ABCD9BD9FD26468D719257841C24352
org.springframework:spring-webmvc:4.3.25.RELEASE
+8D1284B7A67FA36EFEBB8B7A556419CF17C0358F
org.springframework:spring-webmvc-portlet:4.3.25.RELEASE
+3FB500046DE14ADD07C3D6CFF45D53B542A82CED
org.springframework:spring-websocket:4.3.25.RELEASE
899739CF7F338F6297AA9EB25EA8B16338FE4E6D
org.springframework:spring-aop:5.2.2.RELEASE
A7FC38EE5FCC7EFFF607CC93B5FA7259C0FBB4DA
org.springframework:spring-aspects:5.2.2.RELEASE
diff --git
a/java/libs.springframework/external/spring-framework-4.0.1.RELEASE-notice.txt
b/java/libs.springframework/external/spring-framework-4.0.1.RELEASE-notice.txt
deleted file mode 100644
index f4a1589..0000000
---
a/java/libs.springframework/external/spring-framework-4.0.1.RELEASE-notice.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Spring Framework 4.0.1.RELEASE
-Copyright (c) 2002-2014 Pivotal, Inc.
\ No newline at end of file
diff --git
a/java/libs.springframework/external/spring-framework-4.0.1.RELEASE-license.txt
b/java/libs.springframework/external/spring-framework-4.3.25.RELEASE-license.txt
similarity index 87%
rename from
java/libs.springframework/external/spring-framework-4.0.1.RELEASE-license.txt
rename to
java/libs.springframework/external/spring-framework-4.3.25.RELEASE-license.txt
index b0e6e21..996a2a2 100644
---
a/java/libs.springframework/external/spring-framework-4.0.1.RELEASE-license.txt
+++
b/java/libs.springframework/external/spring-framework-4.3.25.RELEASE-license.txt
@@ -1,13 +1,14 @@
Name: Spring Framework
Description: Java/J2EE application framework
-Version: 4.0.1.RELEASE
-Origin: SpringSource
-License: Apache-2.0-spring4.0.1
-URL: http://www.springsource.org/download
(http://repo.spring.io/release/org/springframework/spring/)
+Version: 4.3.25.RELEASE
+Origin: Spring
+License: Apache-2.0-spring4.3.25
+Files: spring-aop-4.3.25.RELEASE.jar spring-aspects-4.3.25.RELEASE.jar
spring-beans-4.3.25.RELEASE.jar spring-context-4.3.25.RELEASE.jar
spring-context-support-4.3.25.RELEASE.jar spring-core-4.3.25.RELEASE.jar
spring-expression-4.3.25.RELEASE.jar spring-instrument-4.3.25.RELEASE.jar
spring-instrument-tomcat-4.3.25.RELEASE.jar spring-jdbc-4.3.25.RELEASE.jar
spring-jms-4.3.25.RELEASE.jar spring-messaging-4.3.25.RELEASE.jar
spring-orm-4.3.25.RELEASE.jar spring-oxm-4.3.25.RELEASE.jar spring- [...]
+URL: https://spring.io/projects/spring-framework
Apache License
Version 2.0, January 2004
- http://www.apache.org/licenses/
+ https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -199,7 +200,7 @@ URL: http://www.springsource.org/download
(http://repo.spring.io/release/org/spr
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
+ 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,
@@ -209,9 +210,9 @@ URL: http://www.springsource.org/download
(http://repo.spring.io/release/org/spr
=======================================================================
-SPRING FRAMEWORK 4.0.0.RELEASE SUBCOMPONENTS:
+SPRING FRAMEWORK 4.3.25.RELEASE SUBCOMPONENTS:
-Spring Framework 4.0.0.RELEASE includes a number of subcomponents
+Spring Framework 4.3.25.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
@@ -251,36 +252,32 @@ 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 <http://www.ow2.org/>
+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
-http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
+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 subcomponents are licensed under the EPL and/or
+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 http://www.springsource.org/download, or by
-sending a request, with your name and address to:
-
- Pivotal, Inc., 875 Howard St,
- San Francisco, CA 94103
- United States of America
-
-or email [email protected]. All such requests should clearly specify:
-
- OPEN SOURCE FILES REQUEST
- Attention General Counsel
-
-Pivotal shall 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.
+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-4.3.25.RELEASE-notice.txt
b/java/libs.springframework/external/spring-framework-4.3.25.RELEASE-notice.txt
new file mode 100644
index 0000000..84e51a4
--- /dev/null
+++
b/java/libs.springframework/external/spring-framework-4.3.25.RELEASE-notice.txt
@@ -0,0 +1,2 @@
+Spring Framework 4.3.25.RELEASE
+Copyright (c) 2002-2019 Pivotal, Inc.
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
index 8856dd1..e4b74ef 100644
---
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
@@ -1,11 +1,2 @@
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 44f0911..3caa2be 100644
--- a/java/libs.springframework/nbproject/project.properties
+++ b/java/libs.springframework/nbproject/project.properties
@@ -46,30 +46,27 @@
release.external/spring-framework-3.2.7.RELEASE.zip!/spring-framework-3.2.7.RELE
release.external/spring-framework-3.2.7.RELEASE.zip!/spring-framework-3.2.7.RELEASE/spring-webmvc-portlet-3.2.7.RELEASE.jar=modules/ext/spring-3.0/spring-webmvc-portlet-3.2.7.RELEASE.jar
release.external/spring-framework-3.2.7.RELEASE.zip!/spring-framework-3.2.7.RELEASE/license.txt=modules/ext/spring-3.0/license.txt
-# Spring 4.0.1
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-aop-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-aop-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-aspects-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-aspects-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-beans-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-beans-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-build-src-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-build-src-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-context-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-context-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-context-support-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-context-support-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-core-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-core-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-expression-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-expression-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-framework-bom-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-framework-bom-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-instrument-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-instrument-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-instrument-tomcat-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-instrument-tomcat-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-jdbc-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-jdbc-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-jms-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-jms-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-messaging-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-messaging-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-orm-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-orm-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-oxm-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-oxm-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-test-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-test-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-tx-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-tx-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-web-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-web-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-webmvc-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-webmvc-4.0.1.RELEASE.jar
-release.external/spring-framework-4.0.1.RELEASE.zip!/spring-framework-4.0.1.RELEASE/spring-webmvc-portlet-4.0.1.RELEASE.jar=modules/ext/spring-4/spring-webmvc-portlet-4.0.1.RELEASE.jar
-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 4.3.25
+release.external/spring-aop-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-aop-4.3.25.RELEASE.jar
+release.external/spring-aspects-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-aspects-4.3.25.RELEASE.jar
+release.external/spring-beans-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-beans-4.3.25.RELEASE.jar
+release.external/spring-context-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-context-4.3.25.RELEASE.jar
+release.external/spring-context-support-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-context-support-4.3.25.RELEASE.jar
+release.external/spring-core-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-core-4.3.25.RELEASE.jar
+release.external/spring-expression-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-expression-4.3.25.RELEASE.jar
+release.external/spring-instrument-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-instrument-4.3.25.RELEASE.jar
+release.external/spring-instrument-tomcat-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-instrument-tomcat-4.3.25.RELEASE.jar
+release.external/spring-jdbc-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-jdbc-4.3.25.RELEASE.jar
+release.external/spring-jms-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-jms-4.3.25.RELEASE.jar
+release.external/spring-messaging-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-messaging-4.3.25.RELEASE.jar
+release.external/spring-orm-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-orm-4.3.25.RELEASE.jar
+release.external/spring-oxm-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-oxm-4.3.25.RELEASE.jar
+release.external/spring-test-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-test-4.3.25.RELEASE.jar
+release.external/spring-tx-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-tx-4.3.25.RELEASE.jar
+release.external/spring-web-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-web-4.3.25.RELEASE.jar
+release.external/spring-webmvc-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-webmvc-4.3.25.RELEASE.jar
+release.external/spring-webmvc-portlet-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-webmvc-portlet-4.3.25.RELEASE.jar
+release.external/spring-websocket-4.3.25.RELEASE.jar=modules/ext/spring-4/spring-websocket-4.3.25.RELEASE.jar
# Spring 5.2.2
release.external/spring-aop-5.2.2.RELEASE.jar=modules/ext/spring-5/spring-aop-5.2.2.RELEASE.jar
@@ -116,28 +113,26 @@ jnlp.indirect.jars=\
modules/ext/spring-3.0/spring-web-3.2.7.RELEASE.jar,\
modules/ext/spring-3.0/spring-webmvc-3.2.7.RELEASE.jar,\
modules/ext/spring-3.0/spring-webmvc-portlet-3.2.7.RELEASE.jar,\
- modules/ext/spring-4/spring-aop-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-aspects-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-beans-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-build-src-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-context-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-context-support-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-core-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-expression-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-framework-bom-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-instrument-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-instrument-tomcat-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-jdbc-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-jms-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-messaging-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-orm-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-oxm-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-test-4.0.1.RELEASE.jar,\
- modules/ext/spring-4/spring-tx-4.0.1.RELEASE.jar,\
- 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-aop-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-aspects-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-beans-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-context-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-context-support-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-core-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-expression-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-instrument-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-instrument-tomcat-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-jdbc-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-jms-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-messaging-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-orm-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-oxm-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-test-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-tx-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-web-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-webmvc-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-webmvc-portlet-4.3.25.RELEASE.jar,\
+ modules/ext/spring-4/spring-websocket-4.3.25.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,\
@@ -161,5 +156,4 @@ jnlp.indirect.jars=\
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
+ modules/ext/spring-3.0/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 541655f..97591aa 100644
---
a/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
+++
b/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
@@ -23,5 +23,5 @@ OpenIDE-Module-Long-Description=\
and integrates it into NetBeans.
spring-framework300=Spring Framework 3.2.7
-spring-framework400=Spring Framework 4.0.1
+spring-framework400=Spring Framework 4.3.25
spring-framework500=Spring Framework 5.2.2
diff --git
a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework400.xml
b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework400.xml
index e72b1de..65edbb8 100644
---
a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework400.xml
+++
b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework400.xml
@@ -28,28 +28,26 @@
<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-4/spring-aop-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-aspects-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-beans-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-build-src-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-context-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-context-support-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-core-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-expression-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-framework-bom-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-instrument-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-instrument-tomcat-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-jdbc-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-jms-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-messaging-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-orm-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-oxm-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-test-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-tx-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-web-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-portlet-4.0.1.RELEASE.jar!/</resource>
-
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-websocket-4.0.1.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-aop-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-aspects-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-beans-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-context-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-context-support-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-core-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-expression-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-instrument-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-instrument-tomcat-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-jdbc-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-jms-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-messaging-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-orm-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-oxm-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-test-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-tx-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-web-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-portlet-4.3.25.RELEASE.jar!/</resource>
+
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-websocket-4.3.25.RELEASE.jar!/</resource>
</volume>
<volume>
<type>src</type>
@@ -62,27 +60,27 @@
<property>
<name>maven-dependencies</name>
<value>
- org.springframework:spring-aop:4.0.1.RELEASE:jar
- org.springframework:spring-aspects:4.0.1.RELEASE:jar
- org.springframework:spring-beans:4.0.1.RELEASE:jar
- org.springframework:spring-context:4.0.1.RELEASE:jar
- org.springframework:spring-context-support:4.0.1.RELEASE:jar
- org.springframework:spring-core:4.0.1.RELEASE:jar
- org.springframework:spring-expression:4.0.1.RELEASE:jar
- org.springframework:spring-framework-bom:4.0.1.RELEASE:jar
- org.springframework:spring-instrument:4.0.1.RELEASE:jar
- org.springframework:spring-instrument-tomcat:4.0.1.RELEASE:jar
- org.springframework:spring-jdbc:4.0.1.RELEASE:jar
- org.springframework:spring-jms:4.0.1.RELEASE:jar
- org.springframework:spring-messaging:4.0.1.RELEASE:jar
- org.springframework:spring-orm:4.0.1.RELEASE:jar
- org.springframework:spring-oxm:4.0.1.RELEASE:jar
- org.springframework:spring-test:4.0.1.RELEASE:jar
- org.springframework:spring-tx:4.0.1.RELEASE:jar
- org.springframework:spring-web:4.0.1.RELEASE:jar
- org.springframework:spring-webmvc:4.0.1.RELEASE:jar
- org.springframework:spring-webmvc-portlet:4.0.1.RELEASE:jar
- org.springframework:spring-websocket:4.0.1.RELEASE:jar
+ org.springframework:spring-aop:4.3.25.RELEASE:jar
+ org.springframework:spring-aspects:4.3.25.RELEASE:jar
+ org.springframework:spring-beans:4.3.25.RELEASE:jar
+ org.springframework:spring-context:4.3.25.RELEASE:jar
+ org.springframework:spring-context-support:4.3.25.RELEASE:jar
+ org.springframework:spring-core:4.3.25.RELEASE:jar
+ org.springframework:spring-expression:4.3.25.RELEASE:jar
+ org.springframework:spring-framework-bom:4.3.25.RELEASE:jar
+ org.springframework:spring-instrument:4.3.25.RELEASE:jar
+ org.springframework:spring-instrument-tomcat:4.3.25.RELEASE:jar
+ org.springframework:spring-jdbc:4.3.25.RELEASE:jar
+ org.springframework:spring-jms:4.3.25.RELEASE:jar
+ org.springframework:spring-messaging:4.3.25.RELEASE:jar
+ org.springframework:spring-orm:4.3.25.RELEASE:jar
+ org.springframework:spring-oxm:4.3.25.RELEASE:jar
+ org.springframework:spring-test:4.3.25.RELEASE:jar
+ org.springframework:spring-tx:4.3.25.RELEASE:jar
+ org.springframework:spring-web:4.3.25.RELEASE:jar
+ org.springframework:spring-webmvc:4.3.25.RELEASE:jar
+ org.springframework:spring-webmvc-portlet:4.3.25.RELEASE:jar
+ org.springframework:spring-websocket:4.3.25.RELEASE:jar
</value>
</property>
</properties>
diff --git a/nbbuild/licenses/Apache-2.0-spring4.0.1
b/nbbuild/licenses/Apache-2.0-spring4.3.25
similarity index 92%
rename from nbbuild/licenses/Apache-2.0-spring4.0.1
rename to nbbuild/licenses/Apache-2.0-spring4.3.25
index 84e60d6..b3e0194 100644
--- a/nbbuild/licenses/Apache-2.0-spring4.0.1
+++ b/nbbuild/licenses/Apache-2.0-spring4.3.25
@@ -1,6 +1,6 @@
Apache License
Version 2.0, January 2004
- http://www.apache.org/licenses/
+ https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -192,7 +192,7 @@
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
+ 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,
@@ -202,9 +202,9 @@
=======================================================================
-SPRING FRAMEWORK 4.0.0.RELEASE SUBCOMPONENTS:
+SPRING FRAMEWORK 4.3.25.RELEASE SUBCOMPONENTS:
-Spring Framework 4.0.0.RELEASE includes a number of subcomponents
+Spring Framework 4.3.25.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
@@ -244,36 +244,32 @@ 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 <http://www.ow2.org/>
+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
-http://sourceforge.net/projects/cglib/files/cglib3/3.0/cglib-3.0.jar/download,
+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 subcomponents are licensed under the EPL and/or
+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 http://www.springsource.org/download, or by
-sending a request, with your name and address to:
-
- Pivotal, Inc., 875 Howard St,
- San Francisco, CA 94103
- United States of America
-
-or email [email protected]. All such requests should clearly specify:
-
- OPEN SOURCE FILES REQUEST
- Attention General Counsel
-
-Pivotal shall 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.
+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.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
