You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mb...@apache.org on 2024/02/10 04:43:58 UTC

(netbeans) branch master updated (ff360b622e -> 7a4f29fd94)

This is an automated email from the ASF dual-hosted git repository.

mbien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


    from ff360b622e Merge pull request #7019 from mbien/ci-update-for-nb22
     add aa03d94037 Retire EOL Spring 3, 4 and update Spring 5 lib wrapper.
     new 7a4f29fd94 Merge pull request #6994 from mbien/retire-eol-spring-libs

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../spring/webmvc/SpringConfigPanelVisual.java     |  19 +-
 .../spring/webmvc/SpringWebModuleExtender.java     |  35 +--
 .../spring/webmvc/resources/Bundle.properties      |   4 +-
 .../modules/spring/webmvc/resources/layer.xml      |   6 -
 .../spring/webmvc/resources/spring-webmvc-3.0.xml  |  44 ---
 .../spring/webmvc/resources/spring-webmvc-4.0.xml  |  43 ---
 .../spring/webmvc/resources/spring-webmvc-5.0.xml  |   4 +-
 java/libs.springframework/external/binaries-list   |  83 ++----
 .../spring-framework-3.2.18.RELEASE-license.txt    | 287 --------------------
 .../spring-framework-3.2.18.RELEASE-notice.txt     |   2 -
 .../spring-framework-4.3.29.RELEASE-license.txt    | 297 ---------------------
 .../spring-framework-4.3.29.RELEASE-notice.txt     |   2 -
 ...nse.txt => spring-framework-5.3.31-license.txt} |  14 +-
 ...tice.txt => spring-framework-5.3.31-notice.txt} |   2 +-
 .../nbproject/project.properties                   | 165 +++---------
 .../libs/springframework/Bundle.properties         |   6 +-
 .../org/netbeans/libs/springframework/layer.xml    |   6 -
 .../libs/springframework/spring-framework300.xml   |  85 ------
 .../libs/springframework/spring-framework400.xml   |  87 ------
 .../libs/springframework/spring-framework500.xml   |  86 +++---
 java/spring.beans/nbproject/project.properties     |   3 +-
 nbbuild/licenses/Apache-2.0-spring5                |  10 +-
 22 files changed, 154 insertions(+), 1136 deletions(-)
 delete mode 100644 enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-3.0.xml
 delete mode 100644 enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/resources/spring-webmvc-4.0.xml
 delete mode 100644 java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt
 delete mode 100644 java/libs.springframework/external/spring-framework-3.2.18.RELEASE-notice.txt
 delete mode 100644 java/libs.springframework/external/spring-framework-4.3.29.RELEASE-license.txt
 delete mode 100644 java/libs.springframework/external/spring-framework-4.3.29.RELEASE-notice.txt
 rename java/libs.springframework/external/{spring-framework-5.2.9.RELEASE-license.txt => spring-framework-5.3.31-license.txt} (93%)
 rename java/libs.springframework/external/{spring-framework-5.2.9.RELEASE-notice.txt => spring-framework-5.3.31-notice.txt} (55%)
 delete mode 100644 java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework300.xml
 delete mode 100644 java/libs.springframework/src/org/netbeans/libs/springframework/spring-framework400.xml


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


(netbeans) 01/01: Merge pull request #6994 from mbien/retire-eol-spring-libs

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 7a4f29fd944da234550c3a04dec04dca20268345
Merge: ff360b622e aa03d94037
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Sat Feb 10 05:43:52 2024 +0100

    Merge pull request #6994 from mbien/retire-eol-spring-libs
    
    Retire EOL Spring 3, 4 and update Spring 5 lib wrapper to 5.3.31.

 .../spring/webmvc/SpringConfigPanelVisual.java     |  19 +-
 .../spring/webmvc/SpringWebModuleExtender.java     |  35 +--
 .../spring/webmvc/resources/Bundle.properties      |   4 +-
 .../modules/spring/webmvc/resources/layer.xml      |   6 -
 .../spring/webmvc/resources/spring-webmvc-3.0.xml  |  44 ---
 .../spring/webmvc/resources/spring-webmvc-4.0.xml  |  43 ---
 .../spring/webmvc/resources/spring-webmvc-5.0.xml  |   4 +-
 java/libs.springframework/external/binaries-list   |  83 ++----
 .../spring-framework-3.2.18.RELEASE-license.txt    | 287 --------------------
 .../spring-framework-3.2.18.RELEASE-notice.txt     |   2 -
 .../spring-framework-4.3.29.RELEASE-license.txt    | 297 ---------------------
 .../spring-framework-4.3.29.RELEASE-notice.txt     |   2 -
 ...nse.txt => spring-framework-5.3.31-license.txt} |  14 +-
 ...tice.txt => spring-framework-5.3.31-notice.txt} |   2 +-
 .../nbproject/project.properties                   | 165 +++---------
 .../libs/springframework/Bundle.properties         |   6 +-
 .../org/netbeans/libs/springframework/layer.xml    |   6 -
 .../libs/springframework/spring-framework300.xml   |  85 ------
 .../libs/springframework/spring-framework400.xml   |  87 ------
 .../libs/springframework/spring-framework500.xml   |  86 +++---
 java/spring.beans/nbproject/project.properties     |   3 +-
 nbbuild/licenses/Apache-2.0-spring5                |  10 +-
 22 files changed, 154 insertions(+), 1136 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists