Skip to content

Commit 3ea8ce8

Browse files
author
Dai MIKURUBE
committed
Move LICENSE and NOTICE under META_INF/, with updating NOTICE
1 parent fd8886d commit 3ea8ce8

File tree

3 files changed

+135
-26
lines changed

3 files changed

+135
-26
lines changed

‎NOTICE

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
embulk-output-s3
22
Copyright 2015 Manabu Takayama, and the Embulk project
33

4-
This product includes software developed by Manabu Takayama, and in a part of the Embulk project (https://www.embulk.org/).
5-
It was originally developed by Manabu Takayama (https://github.com/llibra), and then transferred to the Embulk project.
6-
It was originally licenced under the MIT License before the transfer, and it is now licensed under the Apache Software License, Version 2.0.
4+
This product includes software developed by
5+
Manabu Takayama (https://github.com/llibra), and at
6+
the Embulk project (https://www.embulk.org/).
7+
8+
This product was originally developed by
9+
Manabu Takayama, then transferred to
10+
the Embulk project.
11+
12+
This product was originally licenced under
13+
the MIT License before the transfer, then re-licensed under
14+
the Apache Software License, Version 2.0.

‎NOTICE_GEM

Lines changed: 112 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,125 @@
11
embulk-output-s3
22
Copyright 2015 Manabu Takayama, and the Embulk project
33

4-
This product includes software developed by Manabu Takayama, and in a part of the Embulk project (https://www.embulk.org/).
5-
It was originally developed by Manabu Takayama (https://github.com/llibra), and then transferred to the Embulk project.
6-
It was originally licenced under the MIT License before the transfer, and it is now licensed under the Apache Software License, Version 2.0.
4+
This product includes software developed by
5+
Manabu Takayama (https://github.com/llibra), and at
6+
the Embulk project (https://www.embulk.org/).
77

8-
The gem distribution of this product includes JARs of the Jackson project (https://github.com/FasterXML/jackson), as-is.
8+
This product was originally developed by
9+
Manabu Takayama, then transferred to
10+
the Embulk project.
11+
12+
This product was originally licenced under
13+
the MIT License before the transfer, then re-licensed under
14+
the Apache Software License, Version 2.0.
15+
16+
17+
The gem distribution of this product includes products of
18+
the Jackson project, as-is.
19+
They are licensed under the Apache Software License, Version 2.0.
20+
See: https://github.com/FasterXML/jackson
21+
22+
23+
The gem distribution of this product includes products of
24+
the Jakarta Bean Validation API 1.1, as-is.
25+
They are licensed under the Apache Software License, Version 2.0.
26+
See: https://beanvalidation.org/1.1/
27+
28+
29+
The gem distribution of this product includes products of
30+
AWS SDK For Java 1.x, and Amazon Ion Java, as-is.
931
They are licensed under the Apache Software License, Version 2.0.
32+
See: https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/welcome.html
33+
See: https://github.com/amzn/ion-java
34+
35+
---------------- NOTICE of AWS SDK For Java 1.x ----------------
36+
AWS SDK for Java
37+
Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
38+
39+
This product includes software developed by
40+
Amazon Technologies, Inc (http://www.amazon.com/).
41+
42+
**********************
43+
THIRD PARTY COMPONENTS
44+
**********************
45+
This software includes third party software subject to the following copyrights:
46+
- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
47+
- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
1048

11-
The gem distribution of this product includes JARs of the Jakarta Bean Validation API 1.1 (https://beanvalidation.org/1.1/), as-is.
12-
It is licensed under the Apache Software License, Version 2.0.
49+
The licenses for these third party components are included in LICENSE.txt
50+
---------------- NOTICE of AWS SDK For Java 1.x ----------------
1351

14-
The gem distribution of this product includes JARs of AWS SDK For Java 1.x (https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/welcome.html), and Amazon Ion Java (https://github.com/amzn/ion-java), as-is.
52+
53+
The gem distribution of this product includes products of
54+
Joda-Time, as-is.
1555
They are licensed under the Apache Software License, Version 2.0.
56+
See: https://www.joda.org/joda-time/
57+
58+
---------------------- NOTICE of Joda-Time ---------------------
59+
=============================================================================
60+
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
61+
=============================================================================
62+
This product includes software developed by
63+
Joda.org (https://www.joda.org/).
64+
---------------------- NOTICE of Joda-Time ---------------------
1665

17-
The gem distribution of this product includes a JAR of Joda-Time (https://www.joda.org/joda-time/), as-is.
18-
It is licensed under the Apache Software License, Version 2.0.
1966

20-
The gem distribution of this product includes a JAR of the Apache Commons Codec (https://commons.apache.org/proper/commons-codec/), as-is.
21-
It is licensed under the Apache Software License, Version 2.0.
67+
The gem distribution of this product includes products of
68+
the Apache Commons Codec, as-is.
69+
They are licensed under the Apache Software License, Version 2.0.
70+
See: https://commons.apache.org/proper/commons-codec/
71+
72+
-------------- NOTICE of the Apache Commons Codec --------------
73+
Apache Commons Codec
74+
Copyright 2002-2020 The Apache Software Foundation
2275

23-
The gem distribution of this product includes a JAR of the Apache HttpClient 4.5 (http://hc.apache.org/httpcomponents-client-4.5.x/index.html), as-is.
24-
It is licensed under the Apache Software License, Version 2.0.
76+
This product includes software developed at
77+
The Apache Software Foundation (https://www.apache.org/).
2578

26-
The gem distribution of this product includes a JAR of the Apache HttpCore 4.4 (http://hc.apache.org/httpcomponents-core-4.4.x/index.html), as-is.
27-
It is licensed under the Apache Software License, Version 2.0.
79+
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
80+
contains test data from http://aspell.net/test/orig/batch0.tab.
81+
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
2882

29-
The gem distribution of this product includes a JAR of the JCL 1.2 implemented over SLF4J (http://www.slf4j.org/legacy.html) 1.7, as-is.
30-
It is licensed under the Apache Software License, Version 2.0.
83+
===============================================================================
84+
85+
The content of package org.apache.commons.codec.language.bm has been translated
86+
from the original php source code available at http://stevemorse.org/phoneticinfo.htm
87+
with permission from the original authors.
88+
Original source copyright:
89+
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
90+
-------------- NOTICE of the Apache Commons Codec --------------
91+
92+
93+
The gem distribution of this product includes products of
94+
the Apache HttpClient 4.5, as-is.
95+
They are licensed under the Apache Software License, Version 2.0.
96+
See: http://hc.apache.org/httpcomponents-client-4.5.x/index.html
97+
98+
-------------- NOTICE of the Apache HttpClient 4.5 -------------
99+
Apache HttpComponents Client
100+
Copyright 1999-2020 The Apache Software Foundation
101+
102+
This product includes software developed at
103+
The Apache Software Foundation (http://www.apache.org/).
104+
105+
-------------- NOTICE of the Apache HttpClient 4.5 -------------
106+
107+
108+
The gem distribution of this product includes products of
109+
the Apache HttpCore 4.4, as-is.
110+
They are licensed under the Apache Software License, Version 2.0.
111+
See: http://hc.apache.org/httpcomponents-core-4.4.x/index.html
112+
113+
--------------- NOTICE of the Apache HttpCore 4.4 --------------
114+
Apache HttpComponents Core
115+
Copyright 2005-2020 The Apache Software Foundation
116+
117+
This product includes software developed at
118+
The Apache Software Foundation (http://www.apache.org/).
119+
--------------- NOTICE of the Apache HttpCore 4.4 --------------
120+
121+
122+
The gem distribution of this product includes products of
123+
the JCL 1.2 implemented over SLF4J 1.7, as-is.
124+
They are licensed under the Apache Software License, Version 2.0.
125+
See: http://www.slf4j.org/legacy.html

‎build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,24 @@ javadoc {
143143
}
144144

145145
jar {
146-
from rootProject.file("LICENSE")
147-
from rootProject.file("NOTICE")
146+
metaInf {
147+
from rootProject.file("LICENSE")
148+
from rootProject.file("NOTICE")
149+
}
148150
}
149151

150152
sourcesJar {
151-
from rootProject.file("LICENSE")
152-
from rootProject.file("NOTICE")
153+
metaInf {
154+
from rootProject.file("LICENSE")
155+
from rootProject.file("NOTICE")
156+
}
153157
}
154158

155159
javadocJar {
156-
from rootProject.file("LICENSE")
157-
from rootProject.file("NOTICE")
160+
metaInf {
161+
from rootProject.file("LICENSE")
162+
from rootProject.file("NOTICE")
163+
}
158164
}
159165

160166
publishing {

0 commit comments

Comments
 (0)