Skip to content

Commit

Permalink
Merge pull request apache#2382 from pepness/update-spring-license
Browse files Browse the repository at this point in the history
[NETBEANS-4825] - Update Spring license version
  • Loading branch information
matthiasblaesing authored Sep 23, 2020
2 parents 3a85e27 + 97ea55a commit f5291ef
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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-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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Spring Framework 4.3.25.RELEASE
Spring Framework 4.3.29.RELEASE
Copyright (c) 2002-2019 Pivotal, Inc.
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
URL: https://spring.io/projects/spring-framework

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions nbbuild/licenses/names.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f5291ef

Please sign in to comment.