From 3b4d6811be4381c12f978819c3a5885f1d494370 Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Tue, 6 Feb 2018 21:50:29 -0800 Subject: [PATCH] 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 ++++++++++++++ .../templates/bookkeeper.service | 19 ++++++++++++++ .../templates/pulsar.service | 19 ++++++++++++++ .../templates/zookeeper.service | 19 ++++++++++++++ .../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(-) delete mode 100644 deployment/terraform-ansible/terraform.tfstate diff --git a/deployment/terraform-ansible/aws/ansible.cfg b/deployment/terraform-ansible/aws/ansible.cfg index 69cf91f13e067..e00db17cec272 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 079660f3ac296..d353262e3adc9 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 808cee4515023..4786ec7abafdc 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 7a97dc01a07fb..779e2e5f1c4e5 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 830992b9a327c..db6ca30e11850 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 35298f5417a84..3c01accc03f0b 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 c02166c351735..f2b6d75424ba0 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 b3e5b0d03299c..1f91753e19016 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 = < LICENSE NOTICE + DISCLAIMER **/*.txt **/*.pem **/*.crt @@ -686,9 +687,22 @@ flexible messaging model and an intuitive client API. SCRIPT_STYLE SCRIPT_STYLE SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE JAVADOC_STYLE XML_STYLE + SCRIPT_STYLE JAVADOC_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE @@ -726,6 +740,9 @@ flexible messaging model and an intuitive client API. src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java bin/proto/MLDataFormats_pb2.py + + dependency-reduced-pom.xml + pulsar-client-cpp/lib/lz4/lz4.* @@ -744,7 +761,9 @@ flexible messaging model and an intuitive client API. **/*.key **/*.csr **/*.json + **/*.htpasswd src/test/resources/athenz.conf.test + deployment/terraform-ansible/templates/myid @@ -791,6 +810,11 @@ flexible messaging model and an intuitive client API. maven-archiver 2.5 + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + org.eclipse.m2e lifecycle-mapping @@ -861,7 +885,6 @@ flexible messaging model and an intuitive client API. org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 pulsar/checkstyle.xml pulsar/suppressions.xml diff --git a/pulsar-client-cpp/build-support/clang_format_exclusions.txt b/pulsar-client-cpp/build-support/clang_format_exclusions.txt index d3594ec97d6a1..59ceccd5eae7f 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 911de7369f610..970959d8140d5 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