Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit 43d213f

Browse files
jansupoljansupol
committed
Updated licenses tags in pom.xml to contain 3rd party code licenses
Updated NOTICE.txt Change-Id: Iabe0d16aa1dfe04234c6c5a2515c135a3e8bd204
1 parent 0d8a5e8 commit 43d213f

File tree

6 files changed

+138
-33
lines changed

6 files changed

+138
-33
lines changed

‎core-common/pom.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2018 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -57,6 +57,35 @@
5757

5858
<description>Jersey core common packages</description>
5959

60+
<licenses>
61+
<license>
62+
<name>Common Development and Distribution License (CDDL), Version 1.1</name>
63+
<url>https://oss.oracle.com/licenses/CDDL-1.1</url>
64+
<distribution>repo</distribution>
65+
<comments>Except for Guava, and JSR-166 files.
66+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
67+
</license>
68+
<license>
69+
<name>The GNU General Public License (GPL), Version 2, With Classpath Exception</name>
70+
<url>https://github.com/jersey/jersey/blob/master/LICENSE.html</url> <!-- Updated CPE wording -->
71+
<distribution>repo</distribution>
72+
<comments>Except for Guava, and JSR-166 files.
73+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
74+
</license>
75+
<license>
76+
<name>Apache License, 2.0</name>
77+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
78+
<distribution>repo</distribution>
79+
<comments>Google Guava @ org.glassfish.jersey.internal.guava</comments>
80+
</license>
81+
<license>
82+
<name>Public Domain</name>
83+
<url>https://creativecommons.org/publicdomain/zero/1.0/</url>
84+
<distribution>repo</distribution>
85+
<comments>JSR-166 Extension to JEP 266 @ org.glassfish.jersey.internal.jsr166</comments>
86+
</license>
87+
</licenses>
88+
6089
<build>
6190
<resources>
6291
<resource>

‎core-common/src/main/resources/META-INF/NOTICE.txt‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -740,32 +740,4 @@ JSR-166 Extension - JEP 266
740740
* Work.
741741
* d. Affirmer understands and acknowledges that Creative Commons is not a
742742
* party to this document and has no duty or obligation with respect to
743-
* this CC0 or use of the Work.
744-
745-
org.objectweb.asm Version 5.0.4
746-
* License: Modified BSD (http://asm.objectweb.org/license.html)
747-
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
748-
*
749-
* Redistribution and use in source and binary forms, with or without
750-
* modification, are permitted provided that the following conditions
751-
* are met:
752-
* 1. Redistributions of source code must retain the above copyright
753-
* notice, this list of conditions and the following disclaimer.
754-
* 2. Redistributions in binary form must reproduce the above copyright
755-
* notice, this list of conditions and the following disclaimer in the
756-
* documentation and/or other materials provided with the distribution.
757-
* 3. Neither the name of the copyright holders nor the names of its
758-
* contributors may be used to endorse or promote products derived from
759-
* this software without specific prior written permission.
760-
*
761-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
762-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
763-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
764-
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
765-
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
766-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
767-
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
768-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
769-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
770-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
771-
* THE POSSIBILITY OF SUCH DAMAGE.
743+
* this CC0 or use of the Work.

‎core-server/pom.xml‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2018 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -57,6 +57,35 @@
5757

5858
<description>Jersey core server implementation</description>
5959

60+
<licenses>
61+
<license>
62+
<name>Common Development and Distribution License (CDDL), Version 1.1</name>
63+
<url>https://oss.oracle.com/licenses/CDDL-1.1</url>
64+
<distribution>repo</distribution>
65+
<comments>Except for Dropwizard Monitoring inspired classes and ASM.
66+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
67+
</license>
68+
<license>
69+
<name>The GNU General Public License (GPL), Version 2, With Classpath Exception</name>
70+
<url>https://github.com/jersey/jersey/blob/master/LICENSE.html</url> <!-- Updated CPE wording -->
71+
<distribution>repo</distribution>
72+
<comments>Except for Dropwizard Monitoring inspired classes and ASM.
73+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
74+
</license>
75+
<license>
76+
<name>Apache License, 2.0</name>
77+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
78+
<distribution>repo</distribution>
79+
<comments>Dropwizard Monitoring inspired classes @ org.glassfish.jersey.server.internal.monitoring.core</comments>
80+
</license>
81+
<license>
82+
<name>Modified BSD</name>
83+
<url>http://asm.objectweb.org/license.html</url>
84+
<distribution>repo</distribution>
85+
<comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
86+
</license>
87+
</licenses>
88+
6089
<build>
6190
<testResources>
6291
<testResource>

‎core-server/src/main/resources/META-INF/NOTICE.txt‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,4 +612,32 @@ org.glassfish.jersey.server.internal.monitoring.core
612612
* distributed under the License is distributed on an "AS IS" BASIS,
613613
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
614614
* See the License for the specific language governing permissions and
615-
* limitations under the License.
615+
* limitations under the License.
616+
617+
org.objectweb.asm Version 5.0.4
618+
* License: Modified BSD (http://asm.objectweb.org/license.html)
619+
* Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
620+
*
621+
* Redistribution and use in source and binary forms, with or without
622+
* modification, are permitted provided that the following conditions
623+
* are met:
624+
* 1. Redistributions of source code must retain the above copyright
625+
* notice, this list of conditions and the following disclaimer.
626+
* 2. Redistributions in binary form must reproduce the above copyright
627+
* notice, this list of conditions and the following disclaimer in the
628+
* documentation and/or other materials provided with the distribution.
629+
* 3. Neither the name of the copyright holders nor the names of its
630+
* contributors may be used to endorse or promote products derived from
631+
* this software without specific prior written permission.
632+
*
633+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
634+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
635+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
636+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
637+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
638+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
639+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
640+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
641+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
642+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
643+
* THE POSSIBILITY OF SUCH DAMAGE.

‎media/json-jackson/pom.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2018 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -58,6 +58,29 @@
5858
Jersey JSON Jackson (2.x) entity providers support module.
5959
</description>
6060

61+
<licenses>
62+
<license>
63+
<name>Common Development and Distribution License (CDDL), Version 1.1</name>
64+
<url>https://oss.oracle.com/licenses/CDDL-1.1</url>
65+
<distribution>repo</distribution>
66+
<comments>Except for Jackson JAX-RS Providers.
67+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
68+
</license>
69+
<license>
70+
<name>The GNU General Public License (GPL), Version 2, With Classpath Exception</name>
71+
<url>https://github.com/jersey/jersey/blob/master/LICENSE.html</url> <!-- Updated CPE wording -->
72+
<distribution>repo</distribution>
73+
<comments>Except for Jackson JAX-RS Providers.
74+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
75+
</license>
76+
<license>
77+
<name>Apache License, 2.0</name>
78+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
79+
<distribution>repo</distribution>
80+
<comments>Jackson JAX-RS Providers @ org.glassfish.jersey.jackson.internal.jackson.jaxrs</comments>
81+
</license>
82+
</licenses>
83+
6184
<build>
6285
<plugins>
6386
<plugin>

‎pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,35 @@
163163
<name>CDDL 1.1</name>
164164
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
165165
<distribution>repo</distribution>
166+
<comments>Except for Guava, JSR-166 files, Dropwizard Monitoring inspired classes, ASM and Jackson JAX-RS Providers.
167+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
166168
</license>
167169
<license>
168170
<name>GPL2 w/ CPE</name>
169171
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
170172
<distribution>repo</distribution>
173+
<comments>Except for Guava, JSR-166 files, Dropwizard Monitoring inspired classes, ASM and Jackson JAX-RS Providers.
174+
See also https://github.com/jersey/jersey/blob/master/NOTICE.txt</comments>
175+
</license>
176+
<license>
177+
<name>Apache License, 2.0</name>
178+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
179+
<distribution>repo</distribution>
180+
<comments>Google Guava @ org.glassfish.jersey.internal.guava,
181+
Dropwizard Monitoring inspired classes @ org.glassfish.jersey.server.internal.monitoring.core and
182+
Jackson JAX-RS Providers @ org.glassfish.jersey.jackson.internal.jackson.jaxrs</comments>
183+
</license>
184+
<license>
185+
<name>Public Domain</name>
186+
<url>https://creativecommons.org/publicdomain/zero/1.0/</url>
187+
<distribution>repo</distribution>
188+
<comments>JSR-166 Extension to JEP 266 @ org.glassfish.jersey.internal.jsr166</comments>
189+
</license>
190+
<license>
191+
<name>Modified BSD</name>
192+
<url>http://asm.objectweb.org/license.html</url>
193+
<distribution>repo</distribution>
194+
<comments>ASM @ jersey.repackaged.org.objectweb.asm</comments>
171195
</license>
172196
</licenses>
173197

0 commit comments

Comments
 (0)