Skip to content

Commit 8124e9e

Browse files
garyrussellartembilan
authored andcommitted
Add licence and notice to all artifacts
- remove the epl-license; we haven't had an erlang module since 1.4 **cherry-pick to 2.0.x, 1.7.x** (cherry picked from commit f3b977d) # Conflicts: # build.gradle
1 parent 337b24b commit 8124e9e

File tree

4 files changed

+19
-308
lines changed

4 files changed

+19
-308
lines changed

build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@ subprojects { subproject ->
195195
archives javadocJar
196196
}
197197

198+
jar {
199+
from("${rootProject.projectDir}/src/dist") {
200+
include "license.txt"
201+
include "notice.txt"
202+
into "META-INF"
203+
expand(copyright: new Date().format("yyyy"), version: project.version)
204+
}
205+
}
206+
207+
198208
build.dependsOn jacocoTestReport
199209

200210
}

src/dist/epl-license.txt

Lines changed: 0 additions & 289 deletions
This file was deleted.
File renamed without changes.

src/dist/notice.txt

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
1-
========================================================================
2-
== NOTICE file corresponding to section 4 d of the Apache License, ==
3-
== Version 2.0, in this case for the Spring Integration distribution. ==
4-
========================================================================
1+
Spring AMQP Framework ${version}
2+
Copyright (c) 2010-${copyright} Pivotal, Inc.
53

6-
This product includes software developed by
7-
the Apache Software Foundation (http://www.apache.org).
4+
This product is licensed to you under the Apache License, Version 2.0
5+
(the "License"). You may not use this product except in compliance with
6+
the License.
87

9-
The end-user documentation included with a redistribution, if any,
10-
must include the following acknowledgement:
11-
12-
"This product includes software developed by the Spring Framework
13-
Project (http://www.spring.io)."
14-
15-
Alternatively, this acknowledgement may appear in the software itself,
16-
if and wherever such third-party acknowledgements normally appear.
17-
18-
The names "Spring", "Spring Framework", and "Spring AMQP" must
19-
not be used to endorse or promote products derived from this software
20-
without prior written permission. For written permission, please contact
21-
8+
This product may include a number of subcomponents with separate
9+
copyright notices and license terms. Your use of the source code for
10+
these subcomponents is subject to the terms and conditions of the
11+
subcomponent's license, as noted in the license.txt file.

0 commit comments

Comments
 (0)