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 2020/11/27 16:38:36 UTC
[pulsar] branch master updated: Upgrade license-maven-plugin to
4.0.rc2 version (#8706)
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/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new c019e21 Upgrade license-maven-plugin to 4.0.rc2 version (#8706)
c019e21 is described below
commit c019e21351f018442720afb1fd0c8438ef060a29
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Nov 27 18:38:20 2020 +0200
Upgrade license-maven-plugin to 4.0.rc2 version (#8706)
- old plugin is outdated and fails sporadically
---
buildtools/pom.xml | 11 ++-
pom.xml | 123 ++++++++++++++++++---------------
pulsar-sql/presto-distribution/pom.xml | 17 +++--
3 files changed, 88 insertions(+), 63 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 72dcc71..f085a22 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -62,9 +62,16 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>3.0</version>
+ <version>4.0.rc2</version>
<configuration>
- <header>../src/license-header.txt</header>
+ <licenseSets>
+ <licenseSet>
+ <header>../src/license-header.txt</header>
+ </licenseSet>
+ </licenseSets>
+ <mapping>
+ <java>JAVADOC_STYLE</java>
+ </mapping>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index e5955e4..65c946f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@ flexible messaging model and an intuitive client API.</description>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<aspectj-maven-plugin.version>1.11.1</aspectj-maven-plugin.version>
- <license-maven-plugin.version>3.0</license-maven-plugin.version>
+ <license-maven-plugin.version>4.0.rc2</license-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
@@ -1134,62 +1134,66 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>license-maven-plugin</artifactId>
<version>${license-maven-plugin.version}</version>
<configuration>
- <header>src/license-header.txt</header>
-
- <excludes>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.pem</exclude>
- <exclude>**/*.crt</exclude>
- <exclude>**/*.key</exclude>
- <exclude>**/*.csr</exclude>
- <exclude>**/*.log</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>**/*.avsc</exclude>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/*.graffle</exclude>
- <exclude>**/*.hgrm</exclude>
- <exclude>src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java</exclude>
- <exclude>src/main/java/org/apache/pulsar/transaction/coordinator/proto/PulsarTransactionMetadata.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/*.java</exclude>
- <exclude>src/test/java/org/apache/pulsar/common/api/proto/*.java</exclude>
- <exclude>src/main/java/org/apache/pulsar/io/kinesis/fbs/CompressionType.java</exclude>
- <exclude>src/main/java/org/apache/pulsar/io/kinesis/fbs/EncryptionCtx.java</exclude>
- <exclude>src/main/java/org/apache/pulsar/io/kinesis/fbs/EncryptionKey.java</exclude>
- <exclude>src/main/java/org/apache/pulsar/io/kinesis/fbs/KeyValue.java</exclude>
- <exclude>src/main/java/org/apache/pulsar/io/kinesis/fbs/Message.java</exclude>
- <exclude>src/main/java/org/apache/bookkeeper/mledger/util/AbstractCASReferenceCounted.java</exclude>
- <exclude>**/ByteBufCodedInputStream.java</exclude>
- <exclude>**/ByteBufCodedOutputStream.java</exclude>
- <exclude>bin/proto/*</exclude>
- <exclude>conf/schema_example.conf</exclude>
- <exclude>data/**</exclude>
- <exclude>logs/**</exclude>
- <exclude>**/circe/**</exclude>
- <exclude>pulsar-broker/src/test/resources/authentication/basic/.htpasswd</exclude>
- <exclude>pulsar-client-cpp/lib/checksum/int_types.h</exclude>
- <exclude>pulsar-client-cpp/lib/checksum/gf2.hpp</exclude>
- <exclude>pulsar-client-cpp/lib/checksum/crc32c_sse42.cc</exclude>
- <exclude>pulsar-client-cpp/lib/checksum/crc32c_sse42.h</exclude>
- <exclude>pulsar-client-cpp/lib/checksum/crc32c_sw.cc</exclude>
- <exclude>pulsar-client-cpp/lib/lz4/lz4.*</exclude>
- <exclude>pulsar-client-cpp/lib/PulsarApi.pb.*</exclude>
- <exclude>pulsar-client-cpp/CMakeFiles/**</exclude>
- <exclude>pulsar-client-cpp/**/Makefile</exclude>
- <exclude>pulsar-client-cpp/**/cmake_install.cmake</exclude>
- <exclude>**/CMakeFiles/**</exclude>
- <exclude>**/django/stats/migrations/*.py</exclude>
- <exclude>site2/**</exclude>
- <exclude>generated-site/**</exclude>
- <exclude>.github/*.md</exclude>
- <exclude>**/.idea/**</exclude>
- <exclude>**/generated/**</exclude>
- <exclude>**/zk-3.5-test-data/*</exclude>
- </excludes>
+ <licenseSets>
+ <licenseSet>
+ <header>src/license-header.txt</header>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.pem</exclude>
+ <exclude>**/*.crt</exclude>
+ <exclude>**/*.key</exclude>
+ <exclude>**/*.csr</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.patch</exclude>
+ <exclude>**/*.avsc</exclude>
+ <exclude>**/*.versionsBackup</exclude>
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/*.graffle</exclude>
+ <exclude>**/*.hgrm</exclude>
+ <exclude>**/src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java</exclude>
+ <exclude>**/src/main/java/org/apache/pulsar/transaction/coordinator/proto/PulsarTransactionMetadata.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/*.java</exclude>
+ <exclude>**/src/test/java/org/apache/pulsar/common/api/proto/*.java</exclude>
+ <exclude>**/src/main/java/org/apache/pulsar/io/kinesis/fbs/CompressionType.java</exclude>
+ <exclude>**/src/main/java/org/apache/pulsar/io/kinesis/fbs/EncryptionCtx.java</exclude>
+ <exclude>**/src/main/java/org/apache/pulsar/io/kinesis/fbs/EncryptionKey.java</exclude>
+ <exclude>**/src/main/java/org/apache/pulsar/io/kinesis/fbs/KeyValue.java</exclude>
+ <exclude>**/src/main/java/org/apache/pulsar/io/kinesis/fbs/Message.java</exclude>
+ <exclude>**/src/main/java/org/apache/bookkeeper/mledger/util/AbstractCASReferenceCounted.java</exclude>
+ <exclude>**/ByteBufCodedInputStream.java</exclude>
+ <exclude>**/ByteBufCodedOutputStream.java</exclude>
+ <exclude>bin/proto/*</exclude>
+ <exclude>conf/schema_example.conf</exclude>
+ <exclude>data/**</exclude>
+ <exclude>logs/**</exclude>
+ <exclude>**/circe/**</exclude>
+ <exclude>pulsar-broker/src/test/resources/authentication/basic/.htpasswd</exclude>
+ <exclude>pulsar-client-cpp/lib/checksum/int_types.h</exclude>
+ <exclude>pulsar-client-cpp/lib/checksum/gf2.hpp</exclude>
+ <exclude>pulsar-client-cpp/lib/checksum/crc32c_sse42.cc</exclude>
+ <exclude>pulsar-client-cpp/lib/checksum/crc32c_sse42.h</exclude>
+ <exclude>pulsar-client-cpp/lib/checksum/crc32c_sw.cc</exclude>
+ <exclude>pulsar-client-cpp/lib/lz4/lz4.*</exclude>
+ <exclude>pulsar-client-cpp/lib/PulsarApi.pb.*</exclude>
+ <exclude>pulsar-client-cpp/CMakeFiles/**</exclude>
+ <exclude>pulsar-client-cpp/**/Makefile</exclude>
+ <exclude>pulsar-client-cpp/**/cmake_install.cmake</exclude>
+ <exclude>**/CMakeFiles/**</exclude>
+ <exclude>**/django/stats/migrations/*.py</exclude>
+ <exclude>site2/**</exclude>
+ <exclude>generated-site/**</exclude>
+ <exclude>.github/*.md</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/generated/**</exclude>
+ <exclude>**/zk-3.5-test-data/*</exclude>
+ </excludes>
+ </licenseSet>
+ </licenseSets>
<mapping>
+ <java>JAVADOC_STYLE</java>
<proto>JAVADOC_STYLE</proto>
<go>DOUBLESLASH_STYLE</go>
<conf>SCRIPT_STYLE</conf>
@@ -1214,6 +1218,13 @@ flexible messaging model and an intuitive client API.</description>
<tfvars>SCRIPT_STYLE</tfvars>
</mapping>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index e8056d9..286f637 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -335,12 +335,19 @@
</executions>
</plugin>
<plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>3.0</version>
- <configuration>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>4.0.rc2</version>
+ <configuration>
+ <licenseSets>
+ <licenseSet>
<header>../../src/license-header.txt</header>
- </configuration>
+ </licenseSet>
+ </licenseSets>
+ <mapping>
+ <java>JAVADOC_STYLE</java>
+ </mapping>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>