This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 82f2684 Merge pull request #2008 from apache/NETBEANS-3254-2 new b6fabfe Update SpringFramework 3 new 8d38f08 Fix default Spring versionb new f8def4a Merge pull request #1954 from blackleg/springframework The 3748 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: java/libs.springframework/external/binaries-list | 21 +++++- .../spring-framework-3.2.18.RELEASE-license.txt | 76 +++++++++++++------ .../spring-framework-3.2.18.RELEASE-notice.txt | 2 + .../spring-framework-3.2.7.RELEASE-notice.txt | 2 - .../nbproject/project.properties | 88 ++++++++++------------ .../libs/springframework/Bundle.properties | 2 +- .../libs/springframework/spring-framework300.xml | 82 ++++++++++---------- java/spring.beans/nbproject/project.properties | 2 +- .../wizards/NewSpringXMLConfigWizardIterator.java | 2 +- .../licenses/Apache-2.0-spring3.2.18 | 55 ++++++++------ 10 files changed, 191 insertions(+), 141 deletions(-) rename nbbuild/licenses/Apache-2.0-spring3.2.7 => java/libs.springframework/external/spring-framework-3.2.18.RELEASE-license.txt (85%) create mode 100644 java/libs.springframework/external/spring-framework-3.2.18.RELEASE-notice.txt delete mode 100644 java/libs.springframework/external/spring-framework-3.2.7.RELEASE-notice.txt rename java/libs.springframework/external/spring-framework-3.2.7.RELEASE-license.txt => nbbuild/licenses/Apache-2.0-spring3.2.18 (91%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists