Skip to content

Commit

Permalink
Update Spring Framework to version 4.3.29 (apache#2374)
Browse files Browse the repository at this point in the history 
* Update Spring Framework to version 4.3.29

* Update Bundle.properties

* Update spring-webmvc-4.0.xml
  • Loading branch information
@hectorespert
hectorespert authored Sep 21, 2020
1 parent 811ccc5 commit 5b8c56e
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 122 deletions.
2 changes: 1 addition & 1 deletion enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/Bundle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
spring-webmvc4=Spring Web MVC 4.3.25
spring-webmvc4=Spring Web MVC 4.3.29
spring-webmvc3=Spring Web MVC 3.2.18
4 changes: 2 additions & 2 deletions ...rise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.25.RELEASE.jar!/</resource>
<resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-4.3.29.RELEASE.jar!/</resource>
</volume>
<volume>
<type>src</type>
Expand All @@ -37,7 +37,7 @@
<properties>
<property>
<name>maven-dependencies</name>
<value>org.springframework:spring-webmvc:4.3.25.RELEASE:jar</value>
<value>org.springframework:spring-webmvc:4.3.29.RELEASE:jar</value>
</property>
</properties>
</library>
40 changes: 20 additions & 20 deletions java/libs.springframework/external/binaries-list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@ BC0BDADE0A7A52B8FAE88E1FEBC8479383A2ACAD org.springframework:spring-web:3.2.18.R
60E5BB3DC9CB83D6CC53628082EC89A57D4832B2 org.springframework:spring-webmvc:3.2.18.RELEASE
3A5C539FC312C386699CD78DA46C579B3C9A191D org.springframework:spring-webmvc-portlet:3.2.18.RELEASE

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
27CB46A1F8D108E4383D36891597C70D8B245528 org.springframework:spring-aop:4.3.29.RELEASE
64CFC9F5A92C3446DE797872CB5072FE3C39CF65 org.springframework:spring-aspects:4.3.29.RELEASE
E9643898198ABE38ECD3660ABD217DB2157444ED org.springframework:spring-beans:4.3.29.RELEASE
A156035DB751AC097EBC4A6A0B329000E30F8213 org.springframework:spring-context:4.3.29.RELEASE
3357D1355BC2CD967E0A4D3C8C83F3B2D75FBA5C org.springframework:spring-context-support:4.3.29.RELEASE
363B3A551DB5C20C7872AA143E52CE8933374BA6 org.springframework:spring-core:4.3.29.RELEASE
48C9A0F167899119DC4685590B940442E2B932F4 org.springframework:spring-expression:4.3.29.RELEASE
7D74ED40E1E5C7B49634E9AD11C64701813BFACD org.springframework:spring-instrument:4.3.29.RELEASE
E28297AC3656E6F3FBB7DD699DC52CC7F01246F6 org.springframework:spring-instrument-tomcat:4.3.29.RELEASE
13260B278B849BB1B74BA0C7D5771BD3B1A29F13 org.springframework:spring-jdbc:4.3.29.RELEASE
12F90BA42016E297EF01434E2425537150543D50 org.springframework:spring-jms:4.3.29.RELEASE
DD73936EF2554ABDA9DB4128F80A4489CF0FAA0D org.springframework:spring-messaging:4.3.29.RELEASE
02A662C490E4D53B6C8DF2C74F3946B4D95A1E69 org.springframework:spring-orm:4.3.29.RELEASE
42145BE2D36D4C4FEB8132D66B878142803F8A28 org.springframework:spring-oxm:4.3.29.RELEASE
EA43AFE07BC5908B230CE8CE33AF51C82E6DE878 org.springframework:spring-test:4.3.29.RELEASE
5588F29200B2FA3748F7AD335F625F9744135A08 org.springframework:spring-tx:4.3.29.RELEASE
31BAABE32CE5EDF8B625F47A88FD402947BF9436 org.springframework:spring-web:4.3.29.RELEASE
41EA1DFC591F4378E315179CBD4A35C37C2D513D org.springframework:spring-webmvc:4.3.29.RELEASE
F532F0E38C1DEB2E92B76AF24233EC0E9579EEA8 org.springframework:spring-webmvc-portlet:4.3.29.RELEASE
E5264D0806F8465BACC283B23FE3D48A7743622B org.springframework:spring-websocket:4.3.29.RELEASE

6AE14B8A11B4A30F22A15C8F97AC4B5D0979A4EF org.springframework:spring-aop:5.2.9.RELEASE
6726B662C862E8BF297C9251E7851FBC9FE01D84 org.springframework:spring-aspects:5.2.9.RELEASE
Expand Down
34 changes: 24 additions & 10 deletions ...ring-framework-4.3.25.RELEASE-license.txt → ...ring-framework-4.3.29.RELEASE-license.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: Spring Framework
Description: Java/J2EE application framework
Version: 4.3.25.RELEASE
Version: 4.3.29.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-test-4.3.25.RELEASE.jar spring-tx-4.3.25.RELEASE.jar spring-web-4.3.25.RELEASE.jar spring-webmvc-4.3.25.RELEASE.jar spring-webmvc-portlet-4.3.25.RELEASE.jar spring-websocket-4.3.25.RELEASE.jar
License: Apache-2.0-spring4.3.29
Files: spring-aop-4.3.29.RELEASE.jar spring-aspects-4.3.29.RELEASE.jar spring-beans-4.3.29.RELEASE.jar spring-context-4.3.29.RELEASE.jar spring-context-support-4.3.29.RELEASE.jar spring-core-4.3.29.RELEASE.jar spring-expression-4.3.29.RELEASE.jar spring-instrument-4.3.29.RELEASE.jar spring-instrument-tomcat-4.3.29.RELEASE.jar spring-jdbc-4.3.29.RELEASE.jar spring-jms-4.3.29.RELEASE.jar spring-messaging-4.3.29.RELEASE.jar spring-orm-4.3.29.RELEASE.jar spring-oxm-4.3.29.RELEASE.jar spring-test-4.3.29.RELEASE.jar spring-tx-4.3.29.RELEASE.jar spring-web-4.3.29.RELEASE.jar spring-webmvc-4.3.29.RELEASE.jar spring-webmvc-portlet-4.3.29.RELEASE.jar spring-websocket-4.3.29.RELEASE.jar
URL: https://spring.io/projects/spring-framework

Apache License
Expand Down Expand Up @@ -210,17 +210,17 @@ URL: https://spring.io/projects/spring-framework

=======================================================================

SPRING FRAMEWORK 4.3.25.RELEASE SUBCOMPONENTS:
SPRING FRAMEWORK 4.3.29.RELEASE SUBCOMPONENTS:

Spring Framework 4.3.25.RELEASE includes a number of subcomponents
Spring Framework 4.3.29.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):
>>> ASM 6.0 (org.ow2.asm:asm:6.0, org.ow2.asm:asm-commons:6.0):

Copyright (c) 2000-2011 INRIA, France Telecom
All rights reserved.
Expand Down Expand Up @@ -255,12 +255,26 @@ THE POSSIBILITY OF SUCH DAMAGE.
Copyright (c) 1999-2009, OW2 Consortium <https://www.ow2.org/>


>>> CGLIB 3.0 (cglib:cglib:3.0):
>>> CGLIB 3.2.6 (cglib:cglib:3.2.6):

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.
https://github.com/cglib/cglib/releases/download/RELEASE_3_2_6/cglib-3.2.6.jar,
CGLIB 3.2.6 is licensed under the Apache License, version 2.0, the text of
which is included above.


>>> Objenesis 2.6 (org.objenesis:objenesis:2.6):

Per the LICENSE file in the Objenesis ZIP distribution downloaded from
http://objenesis.org/download.html, Objenesis 2.6 is licensed under the
Apache License, version 2.0, the text of which is included above.

Per the NOTICE file in the Objenesis ZIP distribution downloaded from
http://objenesis.org/download.html and corresponding to section 4d of the
Apache License, Version 2.0, in this case for Objenesis:

Objenesis
Copyright 2006-2017 Joe Walnes, Henri Tremblay, Leonardo Mesquita


===============================================================================
Expand Down
0 ...pring-framework-4.3.25.RELEASE-notice.txt → ...pring-framework-4.3.29.RELEASE-notice.txt
View file
File renamed without changes.
80 changes: 40 additions & 40 deletions java/libs.springframework/nbproject/project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,26 @@ release.external/spring-webmvc-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-
release.external/spring-webmvc-portlet-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-webmvc-portlet-3.2.18.RELEASE.jar

# 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
release.external/spring-aop-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-aop-4.3.29.RELEASE.jar
release.external/spring-aspects-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-aspects-4.3.29.RELEASE.jar
release.external/spring-beans-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-beans-4.3.29.RELEASE.jar
release.external/spring-context-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-context-4.3.29.RELEASE.jar
release.external/spring-context-support-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-context-support-4.3.29.RELEASE.jar
release.external/spring-core-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-core-4.3.29.RELEASE.jar
release.external/spring-expression-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-expression-4.3.29.RELEASE.jar
release.external/spring-instrument-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-instrument-4.3.29.RELEASE.jar
release.external/spring-instrument-tomcat-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-instrument-tomcat-4.3.29.RELEASE.jar
release.external/spring-jdbc-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-jdbc-4.3.29.RELEASE.jar
release.external/spring-jms-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-jms-4.3.29.RELEASE.jar
release.external/spring-messaging-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-messaging-4.3.29.RELEASE.jar
release.external/spring-orm-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-orm-4.3.29.RELEASE.jar
release.external/spring-oxm-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-oxm-4.3.29.RELEASE.jar
release.external/spring-test-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-test-4.3.29.RELEASE.jar
release.external/spring-tx-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-tx-4.3.29.RELEASE.jar
release.external/spring-web-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-web-4.3.29.RELEASE.jar
release.external/spring-webmvc-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-webmvc-4.3.29.RELEASE.jar
release.external/spring-webmvc-portlet-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-webmvc-portlet-4.3.29.RELEASE.jar
release.external/spring-websocket-4.3.29.RELEASE.jar=modules/ext/spring-4/spring-websocket-4.3.29.RELEASE.jar

# Spring 5.2.9
release.external/spring-aop-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-aop-5.2.9.RELEASE.jar
Expand Down Expand Up @@ -108,26 +108,26 @@ jnlp.indirect.jars=\
modules/ext/spring-3.0/spring-web-3.2.18.RELEASE.jar,\
modules/ext/spring-3.0/spring-webmvc-3.2.18.RELEASE.jar,\
modules/ext/spring-3.0/spring-webmvc-portlet-3.2.18.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-4/spring-aop-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-aspects-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-beans-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-context-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-context-support-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-core-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-expression-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-instrument-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-instrument-tomcat-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-jdbc-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-jms-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-messaging-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-orm-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-oxm-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-test-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-tx-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-web-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-webmvc-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-webmvc-portlet-4.3.29.RELEASE.jar,\
modules/ext/spring-4/spring-websocket-4.3.29.RELEASE.jar,\
modules/ext/spring-5/spring-aop-5.2.9.RELEASE.jar,\
modules/ext/spring-5/spring-aspects-5.2.9.RELEASE.jar,\
modules/ext/spring-5/spring-beans-5.2.9.RELEASE.jar,\
Expand Down
2 changes: 1 addition & 1 deletion java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ OpenIDE-Module-Long-Description=\
and integrates it into NetBeans.

spring-framework300=Spring Framework 3.2.18
spring-framework400=Spring Framework 4.3.25
spring-framework400=Spring Framework 4.3.29
spring-framework500=Spring Framework 5.2.9
Loading

0 comments on commit 5b8c56e

Please sign in to comment.