Retire EOL Spring 3, 4 and update Spring 5 lib wrapper to 5.3.31.

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",

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<FileObject> filesToOpen = new LinkedHashSet<FileObject>();
+        private final Set<FileObject> 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<Library> libraries = new ArrayList<Library>(3);
+            List<Library> 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<Void>() {
-                        public Void run() throws IOException {
-                            List<File> files = manager.getConfigFiles();
-                            files.addAll(newConfigFiles);
-                            List<ConfigFileGroup> 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<Void>) () -> {
+                        List<File> files = manager.getConfigFiles();
+                        files.addAll(newConfigFiles);
+                        List<ConfigFileGroup> 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<Library> 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) {

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

enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/layer.xml

@@ -35,12 +35,6 @@
             <file name="spring-webmvc-5.0.xml" url="spring-webmvc-5.0.xml">
                 <attr name="displayName" bundlevalue="org.netbeans.modules.spring.webmvc.resources.Bundle#spring-webmvc5"/>
             </file>
-            <file name="spring-webmvc-4.0.xml" url="spring-webmvc-4.0.xml">
-                <attr name="displayName" bundlevalue="org.netbeans.modules.spring.webmvc.resources.Bundle#spring-webmvc4"/>
-            </file>
-            <file name="spring-webmvc-3.0.xml" url="spring-webmvc-3.0.xml">
-                <attr name="displayName" bundlevalue="org.netbeans.modules.spring.webmvc.resources.Bundle#spring-webmvc3"/>
-            </file>
         </folder>
     </folder>
     <folder name="Templates">

enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-5.0.xml

@@ -25,7 +25,7 @@
     <localizing-bundle>org.netbeans.modules.spring.webmvc.resources.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.2.9.RELEASE.jar!/</resource>
+        <resource>jar:nbinst://org.netbeans.libs.springframework/modules/ext/spring-5/spring-webmvc-5.3.31.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
@@ -36,7 +36,7 @@
     <properties>
         <property>
             <name>maven-dependencies</name>
-            <value>org.springframework:spring-webmvc:5.2.9.RELEASE:jar</value>
+            <value>org.springframework:spring-webmvc:5.3.31:jar</value>
         </property>
     </properties>
 </library>

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