diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringConfigPanelVisual.java b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringConfigPanelVisual.java index 253a1bdcdb05..281063dbf315 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringConfigPanelVisual.java +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringConfigPanelVisual.java @@ -288,17 +288,14 @@ public void run() { springLibs.add(new SpringLibrary(library)); } } - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - cbSpringVersion.setModel(new DefaultComboBoxModel(items.toArray(new String[items.size()]))); - int selectedIndex = cbSpringVersion.getSelectedIndex(); - if (selectedIndex < springLibs.size()) { - springLibrary = springLibs.get(selectedIndex); - libsInitialized = true; - repaint(); - fireChange(); - } + SwingUtilities.invokeLater(() -> { + cbSpringVersion.setModel(new DefaultComboBoxModel(items.toArray(new String[0]))); + int selectedIndex = cbSpringVersion.getSelectedIndex(); + if (selectedIndex < springLibs.size()) { + springLibrary = springLibs.get(selectedIndex); + libsInitialized = true; + repaint(); + fireChange(); } }); LOG.log(Level.FINEST, "Time spent in {0} initLibraries = {1} ms", diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java index c6c9fccc79bd..0b19fe3ea2b5 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java @@ -126,6 +126,7 @@ public boolean getIncludeJstl() { return includeJstl; } + @Override public synchronized SpringConfigPanelVisual getComponent() { if (component == null) { component = new SpringConfigPanelVisual(this); @@ -134,6 +135,7 @@ public synchronized SpringConfigPanelVisual getComponent() { return component; } + @Override public boolean isValid() { if (dispatcherName == null || dispatcherName.trim().length() == 0){ controller.setErrorMessage(NbBundle.getMessage(SpringConfigPanelVisual.class, "MSG_DispatcherNameIsEmpty")); // NOI18N @@ -166,18 +168,22 @@ public boolean isValid() { return true; } + @Override public HelpCtx getHelp() { return new HelpCtx(SpringWebModuleExtender.class); } + @Override public final void addChangeListener(ChangeListener l) { changeSupport.addChangeListener(l); } + @Override public final void removeChangeListener(ChangeListener l) { changeSupport.removeChangeListener(l); } + @Override public void stateChanged(ChangeEvent e) { dispatcherName = getComponent().getDispatcherName(); dispatcherMapping = getComponent().getDispatcherMapping(); @@ -238,7 +244,7 @@ private class CreateSpringConfig implements FileSystem.AtomicAction { public static final String DISPATCHER_SERVLET = "org.springframework.web.servlet.DispatcherServlet"; // NOI18N public static final String ENCODING = "UTF-8"; // NOI18N - private final Set filesToOpen = new LinkedHashSet(); + private final Set filesToOpen = new LinkedHashSet<>(); private final WebModule webModule; public CreateSpringConfig(WebModule webModule) { @@ -248,6 +254,7 @@ public CreateSpringConfig(WebModule webModule) { @NbBundle.Messages({ "CreateSpringConfig.msg.invalid.dd=Deployment descriptor cointains errors, Spring framework has to be manually configured there!" }) + @Override public void run() throws IOException { // MODIFY WEB.XML FileObject dd = webModule.getDeploymentDescriptor(); @@ -282,7 +289,7 @@ public void run() throws IOException { } // ADD JSTL LIBRARY IF ENABLED AND SPRING LIBRARY - List libraries = new ArrayList(3); + List libraries = new ArrayList<>(3); Library springLibrary = component.getSpringLibrary(); String version = component.getSpringLibraryVersion(); Library webMVCLibrary = null; @@ -375,18 +382,16 @@ public void run() throws IOException { if (scope != null) { final ConfigFileManager manager = scope.getConfigFileManager(); try { - manager.mutex().writeAccess(new ExceptionAction() { - public Void run() throws IOException { - List files = manager.getConfigFiles(); - files.addAll(newConfigFiles); - List groups = manager.getConfigFileGroups(); - String groupName = NbBundle.getMessage(SpringWebModuleExtender.class, "LBL_DefaultGroup"); - ConfigFileGroup newGroup = ConfigFileGroup.create(groupName, newConfigFiles); - groups.add(newGroup); - manager.putConfigFilesAndGroups(files, groups); - manager.save(); - return null; - } + manager.mutex().writeAccess((ExceptionAction) () -> { + List files = manager.getConfigFiles(); + files.addAll(newConfigFiles); + List groups = manager.getConfigFileGroups(); + String groupName = NbBundle.getMessage(SpringWebModuleExtender.class, "LBL_DefaultGroup"); + ConfigFileGroup newGroup = ConfigFileGroup.create(groupName, newConfigFiles); + groups.add(newGroup); + manager.putConfigFilesAndGroups(files, groups); + manager.save(); + return null; }); } catch (MutexException e) { throw (IOException)e.getException(); @@ -428,7 +433,7 @@ protected boolean addLibrariesToWebModule(List libraries, WebModule web if (groups.length == 0) { return false; } - addLibraryResult = ProjectClassPathModifier.addLibraries(libraries.toArray(new Library[libraries.size()]), groups[0].getRootFolder(), ClassPath.COMPILE); + addLibraryResult = ProjectClassPathModifier.addLibraries(libraries.toArray(new Library[0]), groups[0].getRootFolder(), ClassPath.COMPILE); } catch (IOException e) { LOGGER.log(Level.WARNING, "Libraries required for the Spring MVC project not added", e); // NOI18N } catch (UnsupportedOperationException uoe) { 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 94344ac754c7..a210bc001211 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,6 +23,4 @@ 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.9 -spring-webmvc4=Spring Web MVC 4.3.29 -spring-webmvc3=Spring Web MVC 3.2.18 +spring-webmvc5=Spring Web MVC 5.3.31 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 92c9b08e6433..56b2bee5b582 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 @@ -35,12 +35,6 @@ - - - - - - diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml deleted file mode 100644 index 4f1319881ef3..000000000000 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - spring-webmvc3.0 - j2se - org.netbeans.modules.spring.webmvc.resources.Bundle - - classpath - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-webmvc-3.2.18.RELEASE.jar!/ - - - src - - - javadoc - - - - - maven-dependencies - org.springframework:spring-webmvc:3.2.18.RELEASE:jar - - - - 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 deleted file mode 100644 index 068e9526f91e..000000000000 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - spring-webmvc4.0 - j2se - org.netbeans.modules.spring.webmvc.resources.Bundle - - classpath - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-4.3.29.RELEASE.jar!/ - - - src - - - javadoc - - - - - maven-dependencies - org.springframework:spring-webmvc:4.3.29.RELEASE:jar - - - diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml index eebf64b234e0..aa51dbca0081 100644 --- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml +++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml @@ -25,7 +25,7 @@ org.netbeans.modules.spring.webmvc.resources.Bundle classpath - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.9.RELEASE.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.3.31.jar!/ src @@ -36,7 +36,7 @@ maven-dependencies - org.springframework:spring-webmvc:5.2.9.RELEASE:jar + org.springframework:spring-webmvc:5.3.31:jar diff --git a/java/libs.springframework/external/binaries-list b/java/libs.springframework/external/binaries-list index 55f5e7f9261a..ae384bba6e05 100644 --- a/java/libs.springframework/external/binaries-list +++ b/java/libs.springframework/external/binaries-list @@ -15,65 +15,24 @@ # specific language governing permissions and limitations # under the License. -BF3BD91214A6D0B4C4DAEEFBE3FCF008D9E3A368 org.springframework:spring-aop:3.2.18.RELEASE -6DA09D3FFFB160DA4DCBFCB37F2C69841DC5880C org.springframework:spring-aspects:3.2.18.RELEASE -4C0BB7E1A69D650145E8E08A3BCC03A8BC3C453E org.springframework:spring-beans:3.2.18.RELEASE -E8DC9E1B55BFB6AD5AD49B358D5CA6E3D4CD7488 org.springframework:spring-context:3.2.18.RELEASE -04350E904118D340AC3BAB577A3CF1CE5E978BB2 org.springframework:spring-context-support:3.2.18.RELEASE -0E2BD9C162280CD79C2EA0F67F174EE5D7B84DDD org.springframework:spring-core:3.2.18.RELEASE -070C1FB9F2111601193E01A8D0C3CCBCA1BF3706 org.springframework:spring-expression:3.2.18.RELEASE -19E9E757AB89ABE73DC537BD23B7E2C7F43BA47C org.springframework:spring-instrument:3.2.18.RELEASE -42242449CF080B4681F3E17F9390CA1389A5823B org.springframework:spring-instrument-tomcat:3.2.18.RELEASE -FF23752B5D75C96FFA6B3EC5055CBC07ED8F0675 org.springframework:spring-jdbc:3.2.18.RELEASE -BD9D212D1501985448BDB42F35C15D87089BAC92 org.springframework:spring-jms:3.2.18.RELEASE -4A771498E04A81D107349CE717251558F8F24931 org.springframework:spring-orm:3.2.18.RELEASE -A1A8B9558B024D44C5CCDBE6523D4504C86AAC7A org.springframework:spring-oxm:3.2.18.RELEASE -BE7D91FE8416A30F53D1039ACEEA08A9AC4AC0DF org.springframework:spring-struts:3.2.18.RELEASE -93351AD841EB73899E2FA8F17F0F55F7346198C9 org.springframework:spring-test:3.2.18.RELEASE -FDD56C7F7AC4EE463BAE12DDCB2EDB0AFCCBDDE6 org.springframework:spring-tx:3.2.18.RELEASE -BC0BDADE0A7A52B8FAE88E1FEBC8479383A2ACAD org.springframework:spring-web:3.2.18.RELEASE -60E5BB3DC9CB83D6CC53628082EC89A57D4832B2 org.springframework:spring-webmvc:3.2.18.RELEASE -3A5C539FC312C386699CD78DA46C579B3C9A191D org.springframework:spring-webmvc-portlet:3.2.18.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 -80E722FFA73A43459F639D36E25AA4E4A08D8D79 org.springframework:spring-beans:5.2.9.RELEASE -4003EF2DB8B5E4B22330FC6D67AAE7AC5D304319 org.springframework:spring-context:5.2.9.RELEASE -A63D4C78080BE31A4BB7B7451137119EB7C9BA0D org.springframework:spring-context-indexer:5.2.9.RELEASE -94038F11339F2A7394AA21B75F8D7B562019667E org.springframework:spring-context-support:5.2.9.RELEASE -400A6FDB45BFA5318AA7D06360F4495B75080BB5 org.springframework:spring-core:5.2.9.RELEASE -C8584DE306BE115EF1715B7ED9D50FB2802867AA org.springframework:spring-expression:5.2.9.RELEASE -7D258AA1A8BCE3501040016D49D244F217517863 org.springframework:spring-instrument:5.2.9.RELEASE -39777C3EEAF3D0957D9FDFFBB75E3FF8A89CAF62 org.springframework:spring-jcl:5.2.9.RELEASE -00877E892E80D3B92F24D70E1E4BDD386B2AA9A2 org.springframework:spring-jdbc:5.2.9.RELEASE -A3E6C6EB1D0D31F5DF62C19D64AEECEB21662F41 org.springframework:spring-jms:5.2.9.RELEASE -649BC39008EC725BA9FDC847AA68DB70ADC5E250 org.springframework:spring-messaging:5.2.9.RELEASE -E21A091F545E8A87ABD721AC5BB2B76431C9C0F2 org.springframework:spring-orm:5.2.9.RELEASE -D136374AB8E8965F7A7D7A516FA573036CE4E933 org.springframework:spring-oxm:5.2.9.RELEASE -CDCD16D9931EE1D9CBA35CA3C465521794C0B98A org.springframework:spring-test:5.2.9.RELEASE -6E7CC2FE50BEBF443F42B91001BD7D4D930AE7A1 org.springframework:spring-tx:5.2.9.RELEASE -4BC4A60B74EA0A92ED09D41C675F8426324B4E56 org.springframework:spring-web:5.2.9.RELEASE -C62F1230A10BDE828161379F16D31ED5051A46FE org.springframework:spring-webflux:5.2.9.RELEASE -BEC8682DF7622707F067F98457EE95A8F276DE80 org.springframework:spring-webmvc:5.2.9.RELEASE -27152843FE9B5F498C890F88C057817794484E60 org.springframework:spring-websocket:5.2.9.RELEASE +3BE929DBDB5F4516919AD09A3D3720D779BB65D9 org.springframework:spring-aop:5.3.31 +9BD8E781E08E1B02A78E867913B96BCCD2BC5798 org.springframework:spring-aspects:5.3.31 +D27258849071B3B268ECC388ECA35BBFCC586448 org.springframework:spring-beans:5.3.31 +A2D6E76507F037AD835E8C2288DFEDF28981999F org.springframework:spring-context:5.3.31 +45F6186340490A5DB5966798375C24835B5152FC org.springframework:spring-context-indexer:5.3.31 +1DCE4C0F8A8382A9107CE6A47E603F4A3EFA3301 org.springframework:spring-context-support:5.3.31 +368E76F732A3C331B970F69CAFEC1525D27B34D3 org.springframework:spring-core:5.3.31 +55637AF1B186D1008890980C2876C5FC83599756 org.springframework:spring-expression:5.3.31 +EA66DC7F38C94F0307DDD23D5A6667D368C004B8 org.springframework:spring-instrument:5.3.31 +E7AB9EE590A195415DD6B898440D776B4C8DB78C org.springframework:spring-jcl:5.3.31 +9124850A2E396A33E5DBD5D1E891E105DAC48633 org.springframework:spring-jdbc:5.3.31 +C0F41C70335786115036CC707B1629A78B7DFB09 org.springframework:spring-jms:5.3.31 +DB3BE10EEDDE60C3F237A4BC625A0C2A98445352 org.springframework:spring-messaging:5.3.31 +CB9B7AC171E680E3EAA2FB69E90A8595F8AA201B org.springframework:spring-orm:5.3.31 +EEC68C6788292F7FB46C02C8CD5AAF4FD241FC88 org.springframework:spring-oxm:5.3.31 +950FF61934D9709AD22FBB176EBCF0E0B80BB5CE org.springframework:spring-test:5.3.31 +143E79385354FC7FFD9773A31BA989931AD9E920 org.springframework:spring-tx:5.3.31 +3BF73C385A1F2F4A0D482149D6A205E854CEC497 org.springframework:spring-web:5.3.31 +D56917F2F1FA8CF6B2CEC4D62EFAE8DC495AA03D org.springframework:spring-webflux:5.3.31 +45754D056EFFE8257A012F6B98ED5454CF1E8960 org.springframework:spring-webmvc:5.3.31 +7AA3AE3FA2DD8A07E61B88A186D8E27F1A6C86D8 org.springframework:spring-websocket:5.3.31 diff --git a/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt b/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt deleted file mode 100644 index 2c488c84c3ce..000000000000 --- a/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt +++ /dev/null @@ -1,287 +0,0 @@ -Name: Spring Framework -Description: Java/J2EE application framework -Version: 3.2.18.RELEASE -Origin: SpringSource -License: Apache-2.0-spring3 -Files: spring-aop-3.2.18.RELEASE.jar spring-aspects-3.2.18.RELEASE.jar spring-beans-3.2.18.RELEASE.jar spring-context-3.2.18.RELEASE.jar spring-context-support-3.2.18.RELEASE.jar spring-core-3.2.18.RELEASE.jar spring-expression-3.2.18.RELEASE.jar spring-instrument-3.2.18.RELEASE.jar spring-instrument-tomcat-3.2.18.RELEASE.jar spring-jdbc-3.2.18.RELEASE.jar spring-jms-3.2.18.RELEASE.jar spring-orm-3.2.18.RELEASE.jar spring-oxm-3.2.18.RELEASE.jar spring-struts-3.2.18.RELEASE.jar spring-test-3.2.18.RELEASE.jar spring-tx-3.2.18.RELEASE.jar spring-web-3.2.18.RELEASE.jar spring-webmvc-3.2.18.RELEASE.jar spring-webmvc-portlet-3.2.18.RELEASE.jar -URL: https://spring.io/projects/spring-framework - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -======================================================================= - -SPRING FRAMEWORK 3.2.18.RELEASE SUBCOMPONENTS: - -Spring Framework 3.2.18.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 - - ->>> 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, -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 -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 info@gopivotal.com. 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. diff --git a/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-notice.txt b/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-notice.txt deleted file mode 100644 index e16ce3cb04a7..000000000000 --- a/java/libs.springframework/external/spring-framework-3.2.18.RELEASE-notice.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Framework 3.2.18.RELEASE -Copyright (c) 2002-2016 Pivotal, Inc. diff --git a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt b/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt deleted file mode 100644 index ed51a3c6eb07..000000000000 --- a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt +++ /dev/null @@ -1,297 +0,0 @@ -Name: Spring Framework -Description: Java/J2EE application framework -Version: 4.3.29.RELEASE -Origin: Spring -License: Apache-2.0-spring4 -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 - 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 4.3.29.RELEASE 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 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. - -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 - - ->>> CGLIB 3.2.6 (cglib:cglib:3.2.6): - -Per the LICENSE file in the CGLIB JAR distribution downloaded from -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 - - -=============================================================================== - -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-4.3.29.RELEASE-notice.txt b/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt deleted file mode 100644 index ce57456bc092..000000000000 --- a/java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Framework 4.3.29.RELEASE -Copyright (c) 2002-2019 Pivotal, Inc. diff --git a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt b/java/libs.springframework/external/spring-framework-5.3.31-license.txt similarity index 93% rename from java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt rename to java/libs.springframework/external/spring-framework-5.3.31-license.txt index da57edaffc0e..bc7cb5454078 100644 --- a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt +++ b/java/libs.springframework/external/spring-framework-5.3.31-license.txt @@ -1,9 +1,9 @@ Name: Spring Framework Description: Java/J2EE application framework -Version: 5.2.9.RELEASE +Version: 5.3.31 Origin: Spring License: Apache-2.0-spring5 -Files: spring-instrument-5.2.9.RELEASE.jar spring-context-support-5.2.9.RELEASE.jar spring-context-indexer-5.2.9.RELEASE.jar spring-jms-5.2.9.RELEASE.jar spring-beans-5.2.9.RELEASE.jar spring-webmvc-5.2.9.RELEASE.jar spring-expression-5.2.9.RELEASE.jar spring-context-5.2.9.RELEASE.jar spring-orm-5.2.9.RELEASE.jar spring-core-5.2.9.RELEASE.jar spring-aspects-5.2.9.RELEASE.jar spring-websocket-5.2.9.RELEASE.jar spring-tx-5.2.9.RELEASE.jar spring-jdbc-5.2.9.RELEASE.jar spring-webflux-5.2.9.RELEASE.jar spring-jcl-5.2.9.RELEASE.jar spring-oxm-5.2.9.RELEASE.jar spring-messaging-5.2.9.RELEASE.jar spring-aop-5.2.9.RELEASE.jar spring-web-5.2.9.RELEASE.jar spring-test-5.2.9.RELEASE.jar +Files: spring-instrument-5.3.31.jar spring-context-support-5.3.31.jar spring-context-indexer-5.3.31.jar spring-jms-5.3.31.jar spring-beans-5.3.31.jar spring-webmvc-5.3.31.jar spring-expression-5.3.31.jar spring-context-5.3.31.jar spring-orm-5.3.31.jar spring-core-5.3.31.jar spring-aspects-5.3.31.jar spring-websocket-5.3.31.jar spring-tx-5.3.31.jar spring-jdbc-5.3.31.jar spring-webflux-5.3.31.jar spring-jcl-5.3.31.jar spring-oxm-5.3.31.jar spring-messaging-5.3.31.jar spring-aop-5.3.31.jar spring-web-5.3.31.jar spring-test-5.3.31.jar URL: https://spring.io/projects/spring-framework Apache License @@ -210,9 +210,9 @@ URL: https://spring.io/projects/spring-framework ======================================================================= -SPRING FRAMEWORK 5.2.9.RELEASE SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.31 SUBCOMPONENTS: -Spring Framework 5.2.9.RELEASE includes a number of subcomponents +Spring Framework 5.3.31 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 @@ -220,7 +220,7 @@ code for these subcomponents is subject to the terms and conditions of the following licenses. ->>> ASM 7.1 (org.ow2.asm:asm:7.1, org.ow2.asm:asm-commons:7.1): +>>> ASM 9.1 (org.ow2.asm:asm:9.1, org.ow2.asm:asm-commons:9.1): Copyright (c) 2000-2011 INRIA, France Telecom All rights reserved. @@ -263,10 +263,10 @@ CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which is included above. ->>> Objenesis 3.1 (org.objenesis:objenesis:3.1): +>>> Objenesis 3.2 (org.objenesis:objenesis:3.2): Per the LICENSE file in the Objenesis ZIP distribution downloaded from -http://objenesis.org/download.html, Objenesis 3.1 is licensed under the +http://objenesis.org/download.html, Objenesis 3.2 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 diff --git a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-notice.txt b/java/libs.springframework/external/spring-framework-5.3.31-notice.txt similarity index 55% rename from java/libs.springframework/external/spring-framework-5.2.9.RELEASE-notice.txt rename to java/libs.springframework/external/spring-framework-5.3.31-notice.txt index ebbdfde67b8c..f6a717214c8a 100644 --- a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-notice.txt +++ b/java/libs.springframework/external/spring-framework-5.3.31-notice.txt @@ -1,2 +1,2 @@ -Spring Framework 5.2.9.RELEASE +Spring Framework 5.3.31 Copyright (c) 2002-2019 Pivotal, Inc. diff --git a/java/libs.springframework/nbproject/project.properties b/java/libs.springframework/nbproject/project.properties index 7a7f64b348c5..44b3f481e81e 100644 --- a/java/libs.springframework/nbproject/project.properties +++ b/java/libs.springframework/nbproject/project.properties @@ -22,130 +22,49 @@ is.autoload=true module.jar.verifylinkageignores=org((\.apache\.commons\.logging\.impl)|(\.springframework)).* -# Spring 3.2.18 -release.external/spring-aop-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-aop-3.2.18.RELEASE.jar -release.external/spring-aspects-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-aspects-3.2.18.RELEASE.jar -release.external/spring-beans-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-beans-3.2.18.RELEASE.jar -release.external/spring-context-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-context-3.2.18.RELEASE.jar -release.external/spring-context-support-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-context-support-3.2.18.RELEASE.jar -release.external/spring-core-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-core-3.2.18.RELEASE.jar -release.external/spring-expression-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-expression-3.2.18.RELEASE.jar -release.external/spring-instrument-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-instrument-3.2.18.RELEASE.jar -release.external/spring-instrument-tomcat-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-instrument-tomcat-3.2.18.RELEASE.jar -release.external/spring-jdbc-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-jdbc-3.2.18.RELEASE.jar -release.external/spring-jms-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-jms-3.2.18.RELEASE.jar -release.external/spring-orm-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-orm-3.2.18.RELEASE.jar -release.external/spring-oxm-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-oxm-3.2.18.RELEASE.jar -release.external/spring-struts-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-struts-3.2.18.RELEASE.jar -release.external/spring-test-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-test-3.2.18.RELEASE.jar -release.external/spring-tx-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-tx-3.2.18.RELEASE.jar -release.external/spring-web-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-web-3.2.18.RELEASE.jar -release.external/spring-webmvc-3.2.18.RELEASE.jar=modules/ext/spring-3.0/spring-webmvc-3.2.18.RELEASE.jar -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.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 -release.external/spring-aspects-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-aspects-5.2.9.RELEASE.jar -release.external/spring-beans-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-beans-5.2.9.RELEASE.jar -release.external/spring-context-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-context-5.2.9.RELEASE.jar -release.external/spring-context-indexer-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-context-indexer-5.2.9.RELEASE.jar -release.external/spring-context-support-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-context-support-5.2.9.RELEASE.jar -release.external/spring-core-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-core-5.2.9.RELEASE.jar -release.external/spring-expression-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-expression-5.2.9.RELEASE.jar -release.external/spring-instrument-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-instrument-5.2.9.RELEASE.jar -release.external/spring-jcl-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-jcl-5.2.9.RELEASE.jar -release.external/spring-jdbc-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-jdbc-5.2.9.RELEASE.jar -release.external/spring-jms-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-jms-5.2.9.RELEASE.jar -release.external/spring-messaging-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-messaging-5.2.9.RELEASE.jar -release.external/spring-orm-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-orm-5.2.9.RELEASE.jar -release.external/spring-oxm-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-oxm-5.2.9.RELEASE.jar -release.external/spring-test-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-test-5.2.9.RELEASE.jar -release.external/spring-tx-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-tx-5.2.9.RELEASE.jar -release.external/spring-web-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-web-5.2.9.RELEASE.jar -release.external/spring-webflux-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-webflux-5.2.9.RELEASE.jar -release.external/spring-webmvc-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-webmvc-5.2.9.RELEASE.jar -release.external/spring-websocket-5.2.9.RELEASE.jar=modules/ext/spring-5/spring-websocket-5.2.9.RELEASE.jar +release.external/spring-aop-5.3.31.jar=modules/ext/spring-5/spring-aop-5.3.31.jar +release.external/spring-aspects-5.3.31.jar=modules/ext/spring-5/spring-aspects-5.3.31.jar +release.external/spring-beans-5.3.31.jar=modules/ext/spring-5/spring-beans-5.3.31.jar +release.external/spring-context-5.3.31.jar=modules/ext/spring-5/spring-context-5.3.31.jar +release.external/spring-context-indexer-5.3.31.jar=modules/ext/spring-5/spring-context-indexer-5.3.31.jar +release.external/spring-context-support-5.3.31.jar=modules/ext/spring-5/spring-context-support-5.3.31.jar +release.external/spring-core-5.3.31.jar=modules/ext/spring-5/spring-core-5.3.31.jar +release.external/spring-expression-5.3.31.jar=modules/ext/spring-5/spring-expression-5.3.31.jar +release.external/spring-instrument-5.3.31.jar=modules/ext/spring-5/spring-instrument-5.3.31.jar +release.external/spring-jcl-5.3.31.jar=modules/ext/spring-5/spring-jcl-5.3.31.jar +release.external/spring-jdbc-5.3.31.jar=modules/ext/spring-5/spring-jdbc-5.3.31.jar +release.external/spring-jms-5.3.31.jar=modules/ext/spring-5/spring-jms-5.3.31.jar +release.external/spring-messaging-5.3.31.jar=modules/ext/spring-5/spring-messaging-5.3.31.jar +release.external/spring-orm-5.3.31.jar=modules/ext/spring-5/spring-orm-5.3.31.jar +release.external/spring-oxm-5.3.31.jar=modules/ext/spring-5/spring-oxm-5.3.31.jar +release.external/spring-test-5.3.31.jar=modules/ext/spring-5/spring-test-5.3.31.jar +release.external/spring-tx-5.3.31.jar=modules/ext/spring-5/spring-tx-5.3.31.jar +release.external/spring-web-5.3.31.jar=modules/ext/spring-5/spring-web-5.3.31.jar +release.external/spring-webflux-5.3.31.jar=modules/ext/spring-5/spring-webflux-5.3.31.jar +release.external/spring-webmvc-5.3.31.jar=modules/ext/spring-5/spring-webmvc-5.3.31.jar +release.external/spring-websocket-5.3.31.jar=modules/ext/spring-5/spring-websocket-5.3.31.jar jnlp.indirect.jars=\ - modules/ext/spring-3.0/spring-aop-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-aspects-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-beans-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-context-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-context-support-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-core-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-expression-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-instrument-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-instrument-tomcat-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-jdbc-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-jms-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-orm-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-oxm-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-struts-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-test-3.2.18.RELEASE.jar,\ - modules/ext/spring-3.0/spring-tx-3.2.18.RELEASE.jar,\ - 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.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,\ - modules/ext/spring-5/spring-context-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-context-indexer-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-context-support-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-core-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-expression-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-instrument-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-jcl-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-jdbc-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-jms-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-messaging-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-orm-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-oxm-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-test-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-tx-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-web-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-webflux-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-webmvc-5.2.9.RELEASE.jar,\ - modules/ext/spring-5/spring-websocket-5.2.9.RELEASE.jar + modules/ext/spring-5/spring-aop-5.3.31.jar,\ + modules/ext/spring-5/spring-aspects-5.3.31.jar,\ + modules/ext/spring-5/spring-beans-5.3.31.jar,\ + modules/ext/spring-5/spring-context-5.3.31.jar,\ + modules/ext/spring-5/spring-context-indexer-5.3.31.jar,\ + modules/ext/spring-5/spring-context-support-5.3.31.jar,\ + modules/ext/spring-5/spring-core-5.3.31.jar,\ + modules/ext/spring-5/spring-expression-5.3.31.jar,\ + modules/ext/spring-5/spring-instrument-5.3.31.jar,\ + modules/ext/spring-5/spring-jcl-5.3.31.jar,\ + modules/ext/spring-5/spring-jdbc-5.3.31.jar,\ + modules/ext/spring-5/spring-jms-5.3.31.jar,\ + modules/ext/spring-5/spring-messaging-5.3.31.jar,\ + modules/ext/spring-5/spring-orm-5.3.31.jar,\ + modules/ext/spring-5/spring-oxm-5.3.31.jar,\ + modules/ext/spring-5/spring-test-5.3.31.jar,\ + modules/ext/spring-5/spring-tx-5.3.31.jar,\ + modules/ext/spring-5/spring-web-5.3.31.jar,\ + modules/ext/spring-5/spring-webflux-5.3.31.jar,\ + modules/ext/spring-5/spring-webmvc-5.3.31.jar,\ + modules/ext/spring-5/spring-websocket-5.3.31.jar 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 e885cc9062d3..3e448bc0a823 100644 --- a/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties +++ b/java/libs.springframework/src/org/netbeans/libs/springframework/Bundle.properties @@ -19,9 +19,7 @@ OpenIDE-Module-Name=Spring Framework Library OpenIDE-Module-Display-Category=Libraries OpenIDE-Module-Short-Description=Bundles the Spring Framework. OpenIDE-Module-Long-Description=\ - The module bundles the Spring Framework http://www.springframework.org/ \ + The module bundles the Spring Framework https://spring.io/ \ and integrates it into NetBeans. -spring-framework300=Spring Framework 3.2.18 -spring-framework400=Spring Framework 4.3.29 -spring-framework500=Spring Framework 5.2.9 +spring-framework500=Spring Framework 5.3.31 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 792a36a6f153..360e8a99bd0c 100644 --- a/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml +++ b/java/libs.springframework/src/org/netbeans/libs/springframework/layer.xml @@ -23,12 +23,6 @@ - - - - - - diff --git a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework300.xml b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework300.xml deleted file mode 100644 index fd8f4b60a0dd..000000000000 --- a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework300.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - spring-framework300 - j2se - org.netbeans.libs.springframework.Bundle - - classpath - jar:nbinst://org.apache.commons.logging/modules/org-apache-commons-logging.jar!/ - jar:nbinst://org.netbeans.libs.cglib/modules/ext/cglib-2.2.jar!/ - - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-aop-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-aspects-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-beans-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-context-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-context-support-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-core-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-expression-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-instrument-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-instrument-tomcat-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-jdbc-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-jms-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-orm-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-oxm-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-struts-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-test-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-tx-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-web-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-webmvc-3.2.18.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-3.0/spring-webmvc-portlet-3.2.18.RELEASE.jar!/ - - - src - - - javadoc - - - - - maven-dependencies - - org.springframework:spring-aop:3.2.18.RELEASE:jar - org.springframework:spring-aspects:3.2.18.RELEASE:jar - org.springframework:spring-beans:3.2.18.RELEASE:jar - org.springframework:spring-context:3.2.18.RELEASE:jar - org.springframework:spring-context-support:3.2.18.RELEASE:jar - org.springframework:spring-core:3.2.18.RELEASE:jar - org.springframework:spring-expression:3.2.18.RELEASE:jar - org.springframework:spring-framework-bom:3.2.18.RELEASE:pom - org.springframework:spring-instrument:3.2.18.RELEASE:jar - org.springframework:spring-instrument-tomcat:3.2.18.RELEASE:jar - org.springframework:spring-jdbc:3.2.18.RELEASE:jar - org.springframework:spring-jms:3.2.18.RELEASE:jar - org.springframework:spring-orm:3.2.18.RELEASE:jar - org.springframework:spring-oxm:3.2.18.RELEASE:jar - org.springframework:spring-struts:3.2.18.RELEASE:jar - org.springframework:spring-test:3.2.18.RELEASE:jar - org.springframework:spring-tx:3.2.18.RELEASE:jar - org.springframework:spring-web:3.2.18.RELEASE:jar - org.springframework:spring-webmvc:3.2.18.RELEASE:jar - org.springframework:spring-webmvc-portlet:3.2.18.RELEASE:jar - - - - 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 deleted file mode 100644 index 6d9144410309..000000000000 --- a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework400.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - spring-framework400 - j2se - org.netbeans.libs.springframework.Bundle - - classpath - jar:nbinst://org.apache.commons.logging/modules/org-apache-commons-logging.jar!/ - jar:nbinst://org.netbeans.libs.cglib/modules/ext/cglib-2.2.jar!/ - - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-aop-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-aspects-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-beans-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-context-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-context-support-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-core-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-expression-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-instrument-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-instrument-tomcat-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-jdbc-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-jms-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-messaging-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-orm-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-oxm-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-test-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-tx-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-web-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-webmvc-portlet-4.3.29.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-4/spring-websocket-4.3.29.RELEASE.jar!/ - - - src - - - javadoc - - - - - maven-dependencies - - org.springframework:spring-aop:4.3.29.RELEASE:jar - org.springframework:spring-aspects:4.3.29.RELEASE:jar - org.springframework:spring-beans:4.3.29.RELEASE:jar - org.springframework:spring-context:4.3.29.RELEASE:jar - org.springframework:spring-context-support:4.3.29.RELEASE:jar - org.springframework:spring-core:4.3.29.RELEASE:jar - org.springframework:spring-expression:4.3.29.RELEASE:jar - org.springframework:spring-framework-bom:4.3.29.RELEASE:pom - org.springframework:spring-instrument:4.3.29.RELEASE:jar - org.springframework:spring-instrument-tomcat:4.3.29.RELEASE:jar - org.springframework:spring-jdbc:4.3.29.RELEASE:jar - org.springframework:spring-jms:4.3.29.RELEASE:jar - org.springframework:spring-messaging:4.3.29.RELEASE:jar - org.springframework:spring-orm:4.3.29.RELEASE:jar - org.springframework:spring-oxm:4.3.29.RELEASE:jar - org.springframework:spring-test:4.3.29.RELEASE:jar - org.springframework:spring-tx:4.3.29.RELEASE:jar - org.springframework:spring-web:4.3.29.RELEASE:jar - org.springframework:spring-webmvc:4.3.29.RELEASE:jar - org.springframework:spring-webmvc-portlet:4.3.29.RELEASE:jar - org.springframework:spring-websocket:4.3.29.RELEASE:jar - - - - 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 index 8b36204bd1d6..9a031668ccbe 100644 --- a/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework500.xml +++ b/java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework500.xml @@ -27,27 +27,27 @@ classpath jar:nbinst://org.apache.commons.logging/modules/org-apache-commons-logging.jar!/ jar:nbinst://org.netbeans.libs.cglib/modules/ext/cglib-2.2.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-aop-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-aspects-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-beans-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-indexer-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-support-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-core-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-expression-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-instrument-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jcl-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jdbc-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jms-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-messaging-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-orm-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-oxm-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-test-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-tx-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-web-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webflux-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.9.RELEASE.jar!/ - jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-websocket-5.2.9.RELEASE.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-aop-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-aspects-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-beans-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-indexer-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-context-support-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-core-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-expression-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-instrument-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jcl-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jdbc-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-jms-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-messaging-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-orm-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-oxm-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-test-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-tx-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-web-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webflux-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.3.31.jar!/ + jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-websocket-5.3.31.jar!/ src @@ -59,28 +59,28 @@ maven-dependencies - org.springframework:spring-aop:5.2.9.RELEASE:jar - org.springframework:spring-aspects:5.2.9.RELEASE:jar - org.springframework:spring-beans:5.2.9.RELEASE:jar - org.springframework:spring-context:5.2.9.RELEASE:jar - org.springframework:spring-context-indexer:5.2.9.RELEASE:jar - org.springframework:spring-context-support:5.2.9.RELEASE:jar - org.springframework:spring-core:5.2.9.RELEASE:jar - org.springframework:spring-expression:5.2.9.RELEASE:jar - org.springframework:spring-framework-bom:5.2.9.RELEASE:pom - org.springframework:spring-instrument:5.2.9.RELEASE:jar - org.springframework:spring-jcl:5.2.9.RELEASE:jar - org.springframework:spring-jdbc:5.2.9.RELEASE:jar - org.springframework:spring-jms:5.2.9.RELEASE:jar - org.springframework:spring-messaging:5.2.9.RELEASE:jar - org.springframework:spring-orm:5.2.9.RELEASE:jar - org.springframework:spring-oxm:5.2.9.RELEASE:jar - org.springframework:spring-test:5.2.9.RELEASE:jar - org.springframework:spring-tx:5.2.9.RELEASE:jar - org.springframework:spring-web:5.2.9.RELEASE:jar - org.springframework:spring-webflux:5.2.9.RELEASE:jar - org.springframework:spring-webmvc:5.2.9.RELEASE:jar - org.springframework:spring-websocket:5.2.9.RELEASE:jar + org.springframework:spring-aop:5.3.31:jar + org.springframework:spring-aspects:5.3.31:jar + org.springframework:spring-beans:5.3.31:jar + org.springframework:spring-context:5.3.31:jar + org.springframework:spring-context-indexer:5.3.31:jar + org.springframework:spring-context-support:5.3.31:jar + org.springframework:spring-core:5.3.31:jar + org.springframework:spring-expression:5.3.31:jar + org.springframework:spring-framework-bom:5.3.31:pom + org.springframework:spring-instrument:5.3.31:jar + org.springframework:spring-jcl:5.3.31:jar + org.springframework:spring-jdbc:5.3.31:jar + org.springframework:spring-jms:5.3.31:jar + org.springframework:spring-messaging:5.3.31:jar + org.springframework:spring-orm:5.3.31:jar + org.springframework:spring-oxm:5.3.31:jar + org.springframework:spring-test:5.3.31:jar + org.springframework:spring-tx:5.3.31:jar + org.springframework:spring-web:5.3.31:jar + org.springframework:spring-webflux:5.3.31:jar + org.springframework:spring-webmvc:5.3.31:jar + org.springframework:spring-websocket:5.3.31:jar diff --git a/java/spring.beans/nbproject/project.properties b/java/spring.beans/nbproject/project.properties index 0eb7832031da..abc32736e74f 100644 --- a/java/spring.beans/nbproject/project.properties +++ b/java/spring.beans/nbproject/project.properties @@ -19,6 +19,7 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.64.0 +#for SpringModelAnnotationsTest requires.nb.javac=true test.config.stableBTD.includes=**/*Test.class @@ -26,4 +27,4 @@ test.config.stableBTD.excludes=\ **/SpringConfigFileModelControllerTest.class # Spring API classes -test.unit.cp.extra=${libs.springframework.dir}/modules/ext/spring-3.0/spring-context-3.2.18.RELEASE.jar +test.unit.cp.extra=${libs.springframework.dir}/modules/ext/spring-5/spring-context-5.3.31.jar diff --git a/nbbuild/licenses/Apache-2.0-spring5 b/nbbuild/licenses/Apache-2.0-spring5 index b952ca095f16..5da45db0df18 100644 --- a/nbbuild/licenses/Apache-2.0-spring5 +++ b/nbbuild/licenses/Apache-2.0-spring5 @@ -202,9 +202,9 @@ ======================================================================= -SPRING FRAMEWORK 5.2.9.RELEASE SUBCOMPONENTS: +SPRING FRAMEWORK 5.3.31 SUBCOMPONENTS: -Spring Framework 5.2.9.RELEASE includes a number of subcomponents +Spring Framework 5.3.31 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 @@ -212,7 +212,7 @@ code for these subcomponents is subject to the terms and conditions of the following licenses. ->>> ASM 7.1 (org.ow2.asm:asm:7.1, org.ow2.asm:asm-commons:7.1): +>>> ASM 9.1 (org.ow2.asm:asm:9.1, org.ow2.asm:asm-commons:9.1): Copyright (c) 2000-2011 INRIA, France Telecom All rights reserved. @@ -255,10 +255,10 @@ CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which is included above. ->>> Objenesis 3.1 (org.objenesis:objenesis:3.1): +>>> Objenesis 3.2 (org.objenesis:objenesis:3.2): Per the LICENSE file in the Objenesis ZIP distribution downloaded from -http://objenesis.org/download.html, Objenesis 3.1 is licensed under the +http://objenesis.org/download.html, Objenesis 3.2 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