Skip to content

Commit 6382ac6

Browse files
fduttonFaron Dutton
and
Faron Dutton
authored
Updates LICENSE and NOTICE to comply with section 4d of the Apache License Version 2.0 (#741)
Modifications are based on the instructions found at https://infra.apache.org/licensing-howto.html and using Apache Spark as an example. Summary of changes: * Updated LICENSE, NOTICE and pom.xml * Removed code copied from Apache Commons Lang * Updated code copied from Apache Commons Validator, removed all modifications and moved into a separate, shaded package * Refactored format validators to used the updated, unmodified code from Apache Commons Validator Resolves #551 Co-authored-by: Faron Dutton <[email protected]>
1 parent d8c1310 commit 6382ac6

26 files changed

+3297
-3210
lines changed

LICENSE

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Apache License
23
Version 2.0, January 2004
34
http://www.apache.org/licenses/
@@ -178,15 +179,15 @@
178179
APPENDIX: How to apply the Apache License to your work.
179180

180181
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
182+
boilerplate notice, with the fields enclosed by brackets "[]"
182183
replaced with your own identifying information. (Don't include
183184
the brackets!) The text should be enclosed in the appropriate
184185
comment syntax for the file format. We also recommend that a
185186
file or class name and description of purpose be included on the
186187
same "printed page" as the copyright notice for easier
187188
identification within third-party archives.
188189

189-
Copyright {yyyy} {name of copyright owner}
190+
Copyright [yyyy] [name of copyright owner]
190191

191192
Licensed under the Apache License, Version 2.0 (the "License");
192193
you may not use this file except in compliance with the License.
@@ -198,4 +199,4 @@
198199
distributed under the License is distributed on an "AS IS" BASIS,
199200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200201
See the License for the specific language governing permissions and
201-
limitations under the License.
202+
limitations under the License.

NOTICE

+10-119
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,13 @@
1-
Json-schema-validator
2-
=====================
1+
JSON Schema Validator
2+
Copyright (c) 2016 and onwards Network New Technologies Inc.
33

4+
// ------------------------------------------------------------------
5+
// NOTICE file corresponding to the section 4d of The Apache License,
6+
// Version 2.0, in this case for
7+
// ------------------------------------------------------------------
48

5-
Copyright (c) 2019 Network New Technologies Inc.
9+
Apache Commons Validator
10+
Copyright 2001-2023 The Apache Software Foundation
611

7-
Licensed under the Apache License, Version 2.0 (the "License");
8-
you may not use this file except in compliance with the License.
9-
You may obtain a copy of the License at
10-
11-
http://www.apache.org/licenses/LICENSE-2.0
12-
13-
Unless required by applicable law or agreed to in writing, software
14-
distributed under the License is distributed on an "AS IS" BASIS,
15-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
See the License for the specific language governing permissions and
17-
limitations under the License.
18-
19-
20-
==========================================================================
21-
Third Party Dependencies
22-
==========================================================================
23-
24-
This project includes or depends on code from third party projects.
25-
26-
The following are attribution notices from dependencies:
27-
28-
-----------------
29-
Undertow
30-
-----------------
31-
32-
JBoss, Home of Professional Open Source.
33-
Copyright 2014 Red Hat, Inc., and individual contributors
34-
as indicated by the @author tags.
35-
36-
Licensed under the Apache License, Version 2.0 (the "License");
37-
you may not use this file except in compliance with the License.
38-
You may obtain a copy of the License at
39-
40-
http://www.apache.org/licenses/LICENSE-2.0
41-
42-
Unless required by applicable law or agreed to in writing, software
43-
distributed under the License is distributed on an "AS IS" BASIS,
44-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
45-
See the License for the specific language governing permissions and
46-
limitations under the License.
47-
48-
-----------------
49-
Jackson
50-
-----------------
51-
52-
This copy of Jackson JSON processor streaming parser/generator is licensed under the
53-
Apache (Software) License, version 2.0 ("the License").
54-
See the License for details about distribution rights, and the
55-
specific rights regarding derivate works.
56-
57-
You may obtain a copy of the License at:
58-
59-
http://www.apache.org/licenses/LICENSE-2.0
60-
61-
-----------------
62-
SLF4J
63-
-----------------
64-
65-
Copyright (c) 2004-2017 QOS.ch
66-
All rights reserved.
67-
68-
Permission is hereby granted, free of charge, to any person obtaining
69-
a copy of this software and associated documentation files (the
70-
"Software"), to deal in the Software without restriction, including
71-
without limitation the rights to use, copy, modify, merge, publish,
72-
distribute, sublicense, and/or sell copies of the Software, and to
73-
permit persons to whom the Software is furnished to do so, subject to
74-
the following conditions:
75-
76-
The above copyright notice and this permission notice shall be
77-
included in all copies or substantial portions of the Software.
78-
79-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
80-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
81-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
82-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
83-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
84-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
85-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
86-
87-
https://www.slf4j.org/license.html
88-
89-
-----------------
90-
Commons-lang3
91-
-----------------
92-
93-
Licensed to the Apache Software Foundation (ASF) under one or more
94-
contributor license agreements. See the NOTICE file distributed with
95-
this work for additional information regarding copyright ownership.
96-
The ASF licenses this file to You under the Apache License, Version 2.0
97-
(the "License"); you may not use this file except in compliance with
98-
the License. You may obtain a copy of the License at
99-
100-
http://www.apache.org/licenses/LICENSE-2.0
101-
102-
Unless required by applicable law or agreed to in writing, software
103-
distributed under the License is distributed on an "AS IS" BASIS,
104-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
105-
See the License for the specific language governing permissions and
106-
limitations under the License.
107-
108-
-----------------
109-
Logback
110-
-----------------
111-
112-
Logback: the reliable, generic, fast and flexible logging framework.
113-
Copyright (C) 1999-2015, QOS.ch. All rights reserved.
114-
115-
This program and the accompanying materials are dual-licensed under
116-
either the terms of the Eclipse Public License v1.0 as published by
117-
the Eclipse Foundation
118-
119-
or (per the licensee's choosing)
120-
121-
under the terms of the GNU Lesser General Public License version 2.1
122-
as published by the Free Software Foundation.
12+
This product includes software developed at
13+
The Apache Software Foundation (http://www.apache.org/).

0 commit comments

Comments
 (0)