You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/02/07 05:50:31 UTC
[incubator-pulsar] branch master updated: Fixed apache rat errors
(#1194)
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 3b4d681 Fixed apache rat errors (#1194)
3b4d681 is described below
commit 3b4d6811be4381c12f978819c3a5885f1d494370
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Tue Feb 6 21:50:29 2018 -0800
Fixed apache rat errors (#1194)
---
deployment/terraform-ansible/aws/ansible.cfg | 19 ++++++++++++++++
deployment/terraform-ansible/aws/instances.tf | 19 ++++++++++++++++
deployment/terraform-ansible/aws/keys.tf | 19 ++++++++++++++++
deployment/terraform-ansible/aws/network.tf | 19 ++++++++++++++++
deployment/terraform-ansible/aws/output.tf | 19 ++++++++++++++++
deployment/terraform-ansible/aws/provider.tf | 19 ++++++++++++++++
deployment/terraform-ansible/aws/security.tf | 19 ++++++++++++++++
deployment/terraform-ansible/aws/variables.tf | 19 ++++++++++++++++
.../terraform-ansible/templates/bookkeeper.service | 19 ++++++++++++++++
.../terraform-ansible/templates/pulsar.service | 19 ++++++++++++++++
.../terraform-ansible/templates/zookeeper.service | 19 ++++++++++++++++
deployment/terraform-ansible/terraform.tfstate | 16 --------------
pom.xml | 25 +++++++++++++++++++++-
.../build-support/clang_format_exclusions.txt | 19 ++++++++++++++++
site/Makefile | 19 ++++++++++++++++
15 files changed, 271 insertions(+), 17 deletions(-)
diff --git a/deployment/terraform-ansible/aws/ansible.cfg b/deployment/terraform-ansible/aws/ansible.cfg
index 69cf91f..e00db17 100644
--- a/deployment/terraform-ansible/aws/ansible.cfg
+++ b/deployment/terraform-ansible/aws/ansible.cfg
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
[defaults]
private_key_file=~/.ssh/pulsar_aws
host_key_checking=false
diff --git a/deployment/terraform-ansible/aws/instances.tf b/deployment/terraform-ansible/aws/instances.tf
index 079660f..d353262 100644
--- a/deployment/terraform-ansible/aws/instances.tf
+++ b/deployment/terraform-ansible/aws/instances.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
resource "aws_instance" "zookeeper" {
ami = "${var.aws_ami}"
instance_type = "${var.instance_types["zookeeper"]}"
diff --git a/deployment/terraform-ansible/aws/keys.tf b/deployment/terraform-ansible/aws/keys.tf
index 808cee4..4786ec7 100644
--- a/deployment/terraform-ansible/aws/keys.tf
+++ b/deployment/terraform-ansible/aws/keys.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
resource "random_id" "key_pair_name" {
byte_length = 4
prefix = "${var.key_name_prefix}-"
diff --git a/deployment/terraform-ansible/aws/network.tf b/deployment/terraform-ansible/aws/network.tf
index 7a97dc0..779e2e5 100644
--- a/deployment/terraform-ansible/aws/network.tf
+++ b/deployment/terraform-ansible/aws/network.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
resource "aws_vpc" "pulsar_vpc" {
cidr_block = "${var.base_cidr_block}"
enable_dns_support = true
diff --git a/deployment/terraform-ansible/aws/output.tf b/deployment/terraform-ansible/aws/output.tf
index 830992b..db6ca30 100644
--- a/deployment/terraform-ansible/aws/output.tf
+++ b/deployment/terraform-ansible/aws/output.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
output "dns_name" {
value = "${aws_elb.default.dns_name}"
}
diff --git a/deployment/terraform-ansible/aws/provider.tf b/deployment/terraform-ansible/aws/provider.tf
index 35298f5..3c01acc 100644
--- a/deployment/terraform-ansible/aws/provider.tf
+++ b/deployment/terraform-ansible/aws/provider.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
provider "aws" {
region = "${var.region}"
version = "1.5"
diff --git a/deployment/terraform-ansible/aws/security.tf b/deployment/terraform-ansible/aws/security.tf
index c02166c..f2b6d75 100644
--- a/deployment/terraform-ansible/aws/security.tf
+++ b/deployment/terraform-ansible/aws/security.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
resource "aws_security_group" "elb" {
name = "pulsar-elb"
vpc_id = "${aws_vpc.pulsar_vpc.id}"
diff --git a/deployment/terraform-ansible/aws/variables.tf b/deployment/terraform-ansible/aws/variables.tf
index b3e5b0d..1f91753 100644
--- a/deployment/terraform-ansible/aws/variables.tf
+++ b/deployment/terraform-ansible/aws/variables.tf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
variable "public_key_path" {
description = <<DESCRIPTION
Path to the SSH public key to be used for authentication.
diff --git a/deployment/terraform-ansible/templates/bookkeeper.service b/deployment/terraform-ansible/templates/bookkeeper.service
index 1056ad8..0c90661 100644
--- a/deployment/terraform-ansible/templates/bookkeeper.service
+++ b/deployment/terraform-ansible/templates/bookkeeper.service
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
[Unit]
Description=Bookkeeper
After=network.target
diff --git a/deployment/terraform-ansible/templates/pulsar.service b/deployment/terraform-ansible/templates/pulsar.service
index 15886c1..a30b012 100644
--- a/deployment/terraform-ansible/templates/pulsar.service
+++ b/deployment/terraform-ansible/templates/pulsar.service
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
[Unit]
Description=Pulsar Broker
After=network.target
diff --git a/deployment/terraform-ansible/templates/zookeeper.service b/deployment/terraform-ansible/templates/zookeeper.service
index 9c9f6e6..87f1196 100644
--- a/deployment/terraform-ansible/templates/zookeeper.service
+++ b/deployment/terraform-ansible/templates/zookeeper.service
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
[Unit]
Description=ZooKeeper Local
After=network.target
diff --git a/deployment/terraform-ansible/terraform.tfstate b/deployment/terraform-ansible/terraform.tfstate
deleted file mode 100644
index 8539234..0000000
--- a/deployment/terraform-ansible/terraform.tfstate
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "version": 3,
- "terraform_version": "0.11.0",
- "serial": 1,
- "lineage": "b5fa0907-e53e-4607-9800-610e5de4ec10",
- "modules": [
- {
- "path": [
- "root"
- ],
- "outputs": {},
- "resources": {},
- "depends_on": []
- }
- ]
-}
diff --git a/pom.xml b/pom.xml
index 9b9bcbc..27ff691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,6 +635,7 @@ flexible messaging model and an intuitive client API.</description>
<excludes>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
+ <exclude>DISCLAIMER</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.pem</exclude>
<exclude>**/*.crt</exclude>
@@ -686,9 +687,22 @@ flexible messaging model and an intuitive client API.</description>
<conf>SCRIPT_STYLE</conf>
<ini>SCRIPT_STYLE</ini>
<yaml>SCRIPT_STYLE</yaml>
+ <tf>SCRIPT_STYLE</tf>
+ <cfg>SCRIPT_STYLE</cfg>
+ <Makefile>SCRIPT_STYLE</Makefile>
+ <service>SCRIPT_STYLE</service>
<cc>JAVADOC_STYLE</cc>
<md>XML_STYLE</md>
+ <txt>SCRIPT_STYLE</txt>
<scss>JAVADOC_STYLE</scss>
+ <Doxyfile>SCRIPT_STYLE</Doxyfile>
+ <pulsar>SCRIPT_STYLE</pulsar>
+ <pulsar-managed-ledger-admin>SCRIPT_STYLE</pulsar-managed-ledger-admin>
+ <pulsar-daemon>SCRIPT_STYLE</pulsar-daemon>
+ <pulsar-admin>SCRIPT_STYLE</pulsar-admin>
+ <pulsar-perf>SCRIPT_STYLE</pulsar-perf>
+ <pulsar-client>SCRIPT_STYLE</pulsar-client>
+ <bookkeeper>SCRIPT_STYLE</bookkeeper>
</mapping>
</configuration>
</plugin>
@@ -726,6 +740,9 @@ flexible messaging model and an intuitive client API.</description>
<exclude>src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java</exclude>
<exclude>bin/proto/MLDataFormats_pb2.py</exclude>
+ <!-- This is generated during maven build -->
+ <exclude>dependency-reduced-pom.xml</exclude>
+
<!-- LZ4 code is under BSD 2-clause -->
<exclude>pulsar-client-cpp/lib/lz4/lz4.*</exclude>
@@ -744,7 +761,9 @@ flexible messaging model and an intuitive client API.</description>
<exclude>**/*.key</exclude>
<exclude>**/*.csr</exclude>
<exclude>**/*.json</exclude>
+ <exclude>**/*.htpasswd</exclude>
<exclude>src/test/resources/athenz.conf.test</exclude>
+ <exclude>deployment/terraform-ansible/templates/myid</exclude>
</excludes>
</configuration>
</plugin>
@@ -792,6 +811,11 @@ flexible messaging model and an intuitive client API.</description>
<version>2.5</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
@@ -861,7 +885,6 @@ flexible messaging model and an intuitive client API.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.0.0</version>
<configuration>
<configLocation>pulsar/checkstyle.xml</configLocation>
<suppressionsLocation>pulsar/suppressions.xml</suppressionsLocation>
diff --git a/pulsar-client-cpp/build-support/clang_format_exclusions.txt b/pulsar-client-cpp/build-support/clang_format_exclusions.txt
index d3594ec..59ceccd 100644
--- a/pulsar-client-cpp/build-support/clang_format_exclusions.txt
+++ b/pulsar-client-cpp/build-support/clang_format_exclusions.txt
@@ -1,2 +1,21 @@
+#
+# 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.
+#
+
*.pb.h
*.pb.cc
diff --git a/site/Makefile b/site/Makefile
index 911de73..970959d 100644
--- a/site/Makefile
+++ b/site/Makefile
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
BUNDLE = bundle
JEKYLL = $(BUNDLE) exec jekyll
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.