You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2017/11/30 00:07:33 UTC
[GitHub] merlimat closed pull request #928: Fixed Apache RAT exclusions
merlimat closed pull request #928: Fixed Apache RAT exclusions
URL: https://github.com/apache/incubator-pulsar/pull/928
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/all/src/assemble/src.xml b/all/src/assemble/src.xml
index a7ef5cb1e..59fab8e53 100644
--- a/all/src/assemble/src.xml
+++ b/all/src/assemble/src.xml
@@ -42,7 +42,8 @@
<include>**/conf/**</include>
<include>**/bin/**</include>
<include>**/*.txt</include>
- <include>doc/*</include>
+ <include>docker/**</include>
+ <include>dashboard/**</include>
</includes>
<excludes>
<exclude>.git/**</exclude>
@@ -86,9 +87,5 @@
<exclude>**/*.dylib</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>doc/apidocs</outputDirectory>
- </fileSet>
</fileSets>
</assembly>
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java
index 51908a4ce..88af63ddc 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/proto/PendingBookieOpsStats.java
@@ -1,3 +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.
+ */
package org.apache.bookkeeper.mledger.proto;
/**
diff --git a/pom.xml b/pom.xml
index f10af7492..4b5136d5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,7 +615,8 @@ flexible messaging model and an intuitive client API.</description>
<exclude>**/*.crt</exclude>
<exclude>**/*.key</exclude>
<exclude>**/*.csr</exclude>
- <exclude>**/proto/*.java</exclude>
+ <exclude>src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java</exclude>
+ <exclude>src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java</exclude>
<exclude>bin/proto/*</exclude>
<exclude>**/*.patch</exclude>
<exclude>data/**</exclude>
@@ -686,82 +687,37 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>**/target/**</exclude>
- <exclude>data/**</exclude>
- <exclude>logs/**</exclude>
- <exclude>**/test-output/**</exclude>
- <exclude>**/*.hgrm</exclude>
- <exclude>**/*.test</exclude>
-
<!-- Other license files -->
<exclude>licenses/LICENSE-*.txt</exclude>
<exclude>src/assemble/README.bin.txt</exclude>
-
- <!-- Exclude site files -->
- <exclude>site/Gemfile.lock</exclude>
- <exclude>site/VERSIONS</exclude>
- <exclude>site/_sass/bootstrap-sass/**</exclude>
- <exclude>site/_sass/font-awesome/**</exclude>
- <exclude>site/.sass-cache/**</exclude>
- <exclude>site/fonts/**</exclude>
- <exclude>site/img/**</exclude>
- <exclude>site/js/jquery.scrollTo.min.js</exclude>
- <exclude>site/js/jquery.tocify.min.js</exclude>
- <exclude>generated-site/**</exclude>
-
- <exclude>**/*.patch</exclude>
- <exclude>.github/*.md</exclude>
-
<exclude>src/assemble/LICENSE.bin.txt</exclude>
<exclude>src/assemble/NOTICE.bin.txt</exclude>
- <!-- Protobuf generated files -->
- <exclude>**/proto/*.java</exclude>
- <exclude>pulsar-client-cpp/lib/PulsarApi.pb.*</exclude>
+ <!-- These files are generated automatically by the Protobuf compiler
+ and are included in source tree for convenience -->
+ <exclude>src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java</exclude>
+ <exclude>src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java</exclude>
<exclude>bin/proto/MLDataFormats_pb2.py</exclude>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/*</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
-
- <exclude>pulsar-client-cpp/python/MANIFEST</exclude>
- <exclude>**/*.egg-info/*</exclude>
-
- <!-- Dashboard are exported from grafana -->
- <exclude>docker/grafana/dashboards/*.json</exclude>
-
<!-- LZ4 code is under BSD 2-clause -->
<exclude>pulsar-client-cpp/lib/lz4/lz4.*</exclude>
<!-- This file is using ZLib license -->
<exclude>pulsar-client-cpp/lib/checksum/crc32c_sw.cc</exclude>
- <!-- Apache v2.0 Licensed code without ASF Copyright -->
+ <!-- This is a text property file that contains just a class name -->
<exclude>**/META-INF/services/com.scurrilous.circe.HashProvider</exclude>
- <!-- Idea project files -->
- <exclude>**/*.cbp</exclude>
- <exclude>**/.idea/*</exclude>
- <exclude>**/Project.cbp</exclude>
-
- <!-- CMake temp files -->
- <exclude>**/cmake_install.cmake</exclude>
- <exclude>**/CMakeFiles/**</exclude>
- <exclude>**/CMakeCache.txt</exclude>
- <exclude>*/**/Makefile</exclude>
-
<!-- Django generated code -->
<exclude>dashboard/django/stats/migrations/*.py</exclude>
<exclude>dashboard/conf/uwsgi_params</exclude>
- <exclude>docs/img/pulsar.svg</exclude>
<!-- Exclude certificates used for tests -->
<exclude>**/*.crt</exclude>
<exclude>**/*.key</exclude>
<exclude>**/*.csr</exclude>
<exclude>**/*.json</exclude>
+ <exclude>src/test/resources/athenz.conf.test</exclude>
</excludes>
</configuration>
</plugin>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services