From ee189a0155cb3c8b4edeada083e9e8795ccbf705 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 5 Jun 2018 12:10:28 -0400 Subject: [PATCH] INT-4481: Add licence and notice to each artifact JIRA: https://jira.spring.io/browse/INT-4481 * Now each generated jar has `licence.txt` and `notice.txt` entries in its `META-INF` * Copy `notice.txt` from the Spring Framework with an appropriate polishing --- build.gradle | 8 ++++++++ src/dist/notice.txt | 32 +++++++++++--------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 4548c2afe4..3c06eade76 100644 --- a/build.gradle +++ b/build.gradle @@ -292,6 +292,13 @@ subprojects { subproject -> 'Automatic-Module-Name': subproject.name.replace('-', '.') // for Jigsaw ) } + + from("${rootProject.projectDir}/src/dist") { + include "license.txt" + include "notice.txt" + into "META-INF" + expand(copyright: new Date().format("yyyy"), version: project.version) + } } check.dependsOn javadoc @@ -1002,6 +1009,7 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) { include 'license.txt' include 'notice.txt' into "${baseDir}" + expand(copyright: new Date().format("yyyy"), version: project.version) } from(zipTree(docsZip.archivePath)) { diff --git a/src/dist/notice.txt b/src/dist/notice.txt index 6394b12401..28154a5c5b 100644 --- a/src/dist/notice.txt +++ b/src/dist/notice.txt @@ -1,21 +1,11 @@ - ======================================================================== - == NOTICE file corresponding to section 4 d of the Apache License, == - == Version 2.0, in this case for the Spring Integration distribution. == - ======================================================================== - - This product includes software developed by - the Apache Software Foundation (http://www.apache.org). - - The end-user documentation included with a redistribution, if any, - must include the following acknowledgement: - - "This product includes software developed by the Spring Framework - Project (http://www.springframework.org)." - - Alternatively, this acknowledgement may appear in the software itself, - if and wherever such third-party acknowledgements normally appear. - - The names "Spring", "Spring Framework", and "Spring Integration" must - not be used to endorse or promote products derived from this software - without prior written permission. For written permission, please contact - enquiries@springsource.com. +Spring Integration Framework ${version} +Copyright (c) 2009-${copyright} Pivotal, 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 +the License. + +This product may include a number of subcomponents with separate +copyright notices and license terms. Your use of the source code for +these subcomponents is subject to the terms and conditions of the +subcomponent's license, as noted in the license.txt file.