This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 97ea55a -Update Spring license version -Simplify license naming
-Rename Spring licenses to match new format -Update version inside spring4
notice.txt
new f5291ef Merge pull request #2382 from pepness/update-spring-license
97ea55a is described below
commit 97ea55a1ae4045053abc1b7b05a161d036749606
Author: Jose Contreras <pepnes...@gmail.com>
AuthorDate: Sun Sep 20 13:27:22 2020 -0500
-Update Spring license version
-Simplify license naming
-Rename Spring licenses to match new format
-Update version inside spring4 notice.txt
---
.../external/spring-framework-3.2.18.RELEASE-license.txt | 2 +-
.../external/spring-framework-4.3.29.RELEASE-license.txt | 2 +-
.../external/spring-framework-4.3.29.RELEASE-notice.txt | 2 +-
.../external/spring-framework-5.2.9.RELEASE-license.txt | 2 +-
nbbuild/licenses/{Apache-2.0-spring3.2.18 => Apache-2.0-spring3} | 0
nbbuild/licenses/{Apache-2.0-spring4.3.29 => Apache-2.0-spring4} | 0
nbbuild/licenses/{Apache-2.0-spring5.2.9 => Apache-2.0-spring5} | 0
nbbuild/licenses/names.properties | 6 +++---
8 files changed, 7 insertions(+), 7 deletions(-)
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
index 7305309..2c488c8 100644
---
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
@@ -2,7 +2,7 @@ Name: Spring Framework
Description: Java/J2EE application framework
Version: 3.2.18.RELEASE
Origin: SpringSource
-License: Apache-2.0-spring3.2.18
+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-tes [...]
URL: https://spring.io/projects/spring-framework
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
index bf06766..ed51a3c 100644
---
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
@@ -2,7 +2,7 @@ Name: Spring Framework
Description: Java/J2EE application framework
Version: 4.3.29.RELEASE
Origin: Spring
-License: Apache-2.0-spring4.3.29
+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- [...]
URL: https://spring.io/projects/spring-framework
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
index 84e51a4..ce57456 100644
---
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
@@ -1,2 +1,2 @@
-Spring Framework 4.3.25.RELEASE
+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.2.9.RELEASE-license.txt
index d8a64e0..da57eda 100644
---
a/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt
+++
b/java/libs.springframework/external/spring-framework-5.2.9.RELEASE-license.txt
@@ -2,7 +2,7 @@ Name: Spring Framework
Description: Java/J2EE application framework
Version: 5.2.9.RELEASE
Origin: Spring
-License: Apache-2.0-spring5.2.9
+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.
[...]
URL: https://spring.io/projects/spring-framework
diff --git a/nbbuild/licenses/Apache-2.0-spring3.2.18
b/nbbuild/licenses/Apache-2.0-spring3
similarity index 100%
rename from nbbuild/licenses/Apache-2.0-spring3.2.18
rename to nbbuild/licenses/Apache-2.0-spring3
diff --git a/nbbuild/licenses/Apache-2.0-spring4.3.29
b/nbbuild/licenses/Apache-2.0-spring4
similarity index 100%
rename from nbbuild/licenses/Apache-2.0-spring4.3.29
rename to nbbuild/licenses/Apache-2.0-spring4
diff --git a/nbbuild/licenses/Apache-2.0-spring5.2.9
b/nbbuild/licenses/Apache-2.0-spring5
similarity index 100%
rename from nbbuild/licenses/Apache-2.0-spring5.2.9
rename to nbbuild/licenses/Apache-2.0-spring5
diff --git a/nbbuild/licenses/names.properties
b/nbbuild/licenses/names.properties
index 9c79f5a..603652f 100644
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@ -19,9 +19,9 @@ GPL-2-CP=GPL v2 with Classpath exception
(http://openjdk.java.net/legal/gplv2+ce
Apache-2.0=Apache Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
Apache-2.0-groovy=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Apache Groovy addendums
Apache-2.0-lucene=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Apache Lucene addendums
-Apache-2.0-spring3.2.7=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
3.2.7
-Apache-2.0-spring4.0.1=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
4.0.1
-Apache-2.0-spring5.2.2=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
5.2.2
+Apache-2.0-spring3=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
3.X
+Apache-2.0-spring4=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
4.X
+Apache-2.0-spring5=Apache Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt) with Spring addendums, version
5.X
Apache-2.0-ASF=Apache Version 2.0 with CLA reference
(http://www.apache.org/licenses/LICENSE-2.0.txt)
OSGi=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html)
with OSGi materials under Apache License Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
BSD-css3-grammar=BSD license for CSS 2.1/3 grammar with copyright for Jim
Idle, Temporal Wave LLC/ASF
---------------------------------------------------------------------
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
