Skip to content

Commit 0a39137

Browse files
joshelserjoshelser
committed
HBASE-19584 Fix L&N for source release
Protobuf source is not included in the source release and thus should not exist in the top-level L&N files. These should exist in the hbase-shaded-protobuf jar's L&N.
1 parent f92dabc commit 0a39137

File tree

4 files changed

+72
-77
lines changed

4 files changed

+72
-77
lines changed

‎LICENSE.txt

-38
Original file line numberDiff line numberDiff line change
@@ -200,41 +200,3 @@
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203-
204-
----
205-
This project incorporates portions of the 'Protocol Buffers' project avaialble
206-
under a '3-clause BSD' license.
207-
208-
Copyright 2008, Google Inc.
209-
All rights reserved.
210-
211-
Redistribution and use in source and binary forms, with or without
212-
modification, are permitted provided that the following conditions are
213-
met:
214-
215-
* Redistributions of source code must retain the above copyright
216-
notice, this list of conditions and the following disclaimer.
217-
* Redistributions in binary form must reproduce the above
218-
copyright notice, this list of conditions and the following disclaimer
219-
in the documentation and/or other materials provided with the
220-
distribution.
221-
* Neither the name of Google Inc. nor the names of its
222-
contributors may be used to endorse or promote products derived from
223-
this software without specific prior written permission.
224-
225-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
226-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
227-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
228-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
229-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
230-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
231-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
232-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
233-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
234-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
235-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
236-
237-
Code generated by the Protocol Buffer compiler is owned by the owner
238-
of the input file used when generating it. This code is not
239-
standalone and requires a support library to be linked with it. This
240-
support library is itself covered by the above license.

‎NOTICE.txt

+1-39
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,2 @@
11
Apache HBase - Third-Party
2-
Copyright 2017 The Apache Software Foundation
3-
4-
This product includes software developed at
5-
The Apache Software Foundation (http://www.apache.org/)
6-
and software developed elsewhere but licensed with the
7-
Apache License , v2.0.
8-
9-
Also redistributes modified google protobuf which requires
10-
this notice be shown:
11-
12-
// Protocol Buffers - Google's data interchange format
13-
// Copyright 2008 Google Inc. All rights reserved.
14-
// https://developers.google.com/protocol-buffers/
15-
//
16-
// Redistribution and use in source and binary forms, with or without
17-
// modification, are permitted provided that the following conditions are
18-
// met:
19-
//
20-
// * Redistributions of source code must retain the above copyright
21-
// notice, this list of conditions and the following disclaimer.
22-
// * Redistributions in binary form must reproduce the above
23-
// copyright notice, this list of conditions and the following disclaimer
24-
// in the documentation and/or other materials provided with the
25-
// distribution.
26-
// * Neither the name of Google Inc. nor the names of its
27-
// contributors may be used to endorse or promote products derived from
28-
// this software without specific prior written permission.
29-
//
30-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
31-
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
32-
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
33-
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
34-
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
35-
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
36-
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
37-
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
38-
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39-
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
40-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2+
Copyright 2018 The Apache Software Foundation

‎hbase-shaded-protobuf/src/main/appended-resources/META-INF/LICENSE

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
---
3+
4+
This project incorporates portions of the 'Protocol Buffers' project avaialble
5+
under a '3-clause BSD' license.
6+
7+
Copyright 2008, Google Inc.
8+
All rights reserved.
9+
10+
Redistribution and use in source and binary forms, with or without
11+
modification, are permitted provided that the following conditions are
12+
met:
13+
14+
* Redistributions of source code must retain the above copyright
15+
notice, this list of conditions and the following disclaimer.
16+
* Redistributions in binary form must reproduce the above
17+
copyright notice, this list of conditions and the following disclaimer
18+
in the documentation and/or other materials provided with the
19+
distribution.
20+
* Neither the name of Google Inc. nor the names of its
21+
contributors may be used to endorse or promote products derived from
22+
this software without specific prior written permission.
23+
24+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
25+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
26+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
27+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
28+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
29+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
30+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
31+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
34+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35+
36+
Code generated by the Protocol Buffer compiler is owned by the owner
37+
of the input file used when generating it. This code is not
38+
standalone and requires a support library to be linked with it. This
39+
support library is itself covered by the above license.

‎hbase-shaded-protobuf/src/main/appended-resources/META-INF/NOTICE

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
---
3+
4+
// Protocol Buffers - Google's data interchange format
5+
// Copyright 2008 Google Inc. All rights reserved.
6+
// https://developers.google.com/protocol-buffers/
7+
//
8+
// Redistribution and use in source and binary forms, with or without
9+
// modification, are permitted provided that the following conditions are
10+
// met:
11+
//
12+
// * Redistributions of source code must retain the above copyright
13+
// notice, this list of conditions and the following disclaimer.
14+
// * Redistributions in binary form must reproduce the above
15+
// copyright notice, this list of conditions and the following disclaimer
16+
// in the documentation and/or other materials provided with the
17+
// distribution.
18+
// * Neither the name of Google Inc. nor the names of its
19+
// contributors may be used to endorse or promote products derived from
20+
// this software without specific prior written permission.
21+
//
22+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)