This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 0b26ce7 Fixed License header for
ByteBufCoded{Input,Output}Stream.java (#1971)
0b26ce7 is described below
commit 0b26ce7e25fb3ef6011a286ec9d1263333c28900
Author: Matteo Merli <[email protected]>
AuthorDate: Thu Jun 14 19:22:10 2018 -0700
Fixed License header for ByteBufCoded{Input,Output}Stream.java (#1971)
---
dev/README.md | 21 +++++++++++++++++
pom.xml | 3 +++
.../util/protobuf/ByteBufCodedInputStream.java | 27 ++++------------------
.../util/protobuf/ByteBufCodedOutputStream.java | 27 ++++------------------
4 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/dev/README.md b/dev/README.md
index 6be1070..856ae6a 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -1,3 +1,24 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
## Apache Pulsar Dev Tools
### Running Integration Tests on macOS
diff --git a/pom.xml b/pom.xml
index 39e2b92..7b3d23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -923,6 +923,8 @@ flexible messaging model and an intuitive client
API.</description>
<exclude>src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java</exclude>
<exclude>src/main/java/org/apache/pulsar/broker/service/schema/proto/SchemaRegistryFormat.java</exclude>
<exclude>src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java</exclude>
+ <exclude>**/ByteBufCodedInputStream.java</exclude>
+ <exclude>**/ByteBufCodedOutputStream.java</exclude>
<exclude>bin/proto/*</exclude>
<exclude>**/*.patch</exclude>
<exclude>data/**</exclude>
@@ -1013,6 +1015,7 @@ flexible messaging model and an intuitive client
API.</description>
<excludes>
<!-- Other license files -->
<exclude>licenses/LICENSE-*.txt</exclude>
+ <exclude>pulsar-client-cpp/pkg/licenses/LICENSE-*.txt</exclude>
<exclude>src/assemble/README.bin.txt</exclude>
<exclude>src/assemble/LICENSE.bin.txt</exclude>
<exclude>src/assemble/NOTICE.bin.txt</exclude>
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java
b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java
index 1843d18..937b083 100644
---
a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java
+++
b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java
@@ -1,25 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This file is derived from Google ProcolBuffer CodedInputStream class
- */
-
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// http://code.google.com/p/protobuf/
@@ -50,6 +28,11 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*
+ * This file is derived from Google ProcolBuffer CodedInputStream class
+ * with adaptations to work directly with Netty ByteBuf instances.
+ */
+
package org.apache.pulsar.common.util.protobuf;
import io.netty.buffer.ByteBuf;
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java
b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java
index 8cb8dcc..2a58e4a 100644
---
a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java
+++
b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java
@@ -1,25 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * This file is derived from Google ProcolBuffer CodedOutputStream class
- */
-
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// http://code.google.com/p/protobuf/
@@ -50,6 +28,11 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*
+ * This file is derived from Google ProcolBuffer CodedOutputStream class
+ * with adaptations to work directly with Netty ByteBuf instances.
+ */
+
package org.apache.pulsar.common.util.protobuf;
import io.netty.buffer.ByteBuf;
--
To stop receiving notification emails like this one, please contact
[email protected].
