Merge branch '7.0.x'

framework-docs/src/docs/dist/notice.txt

@@ -1,5 +1,5 @@
 Spring Framework ${version}
-Copyright (c) 2002-${copyright} Pivotal, Inc.
+Copyright (c) 2002-${copyright} Broadcom Inc.
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with

gradle/spring-module.gradle

@@ -46,11 +46,14 @@ jar {
 	manifest.attributes["Build-Jdk-Spec"] = "${System.getProperty("java.specification.version")}"
 
 	from("${rootDir}/framework-docs/src/docs/dist") {
-		include "license.txt"
 		include "notice.txt"
 		into "META-INF"
 		expand(copyright: new Date().format("yyyy"), version: project.version)
 	}
+	from("${rootDir}/framework-docs/src/docs/dist") {
+		include "license.txt"
+		into "META-INF"
+	}
 }
 
 normalization {