You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/10/19 16:05:28 UTC
[pulsar] branch branch-2.9 updated: [branch-2.9] Fix license check issue (#18117)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new dced66cb055 [branch-2.9] Fix license check issue (#18117)
dced66cb055 is described below
commit dced66cb0559106e1437c20e9deffa9e8823c47f
Author: Jiwei Guo <te...@apache.org>
AuthorDate: Thu Oct 20 00:05:19 2022 +0800
[branch-2.9] Fix license check issue (#18117)
---
.github/workflows/ci-license.yaml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 2 +-
pom.xml | 8 +++++++-
pulsar-sql/presto-distribution/LICENSE | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci-license.yaml b/.github/workflows/ci-license.yaml
index 3c975674880..8e1225c3283 100644
--- a/.github/workflows/ci-license.yaml
+++ b/.github/workflows/ci-license.yaml
@@ -88,4 +88,4 @@ jobs:
- name: license check
if: ${{ steps.check_changes.outputs.docs_only != 'true' }}
- run: src/check-binary-license ./distribution/server/target/apache-pulsar-*-bin.tar.gz
+ run: src/check-binary-license --no-presto ./distribution/server/target/apache-pulsar-*-bin.tar.gz
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index f5b58f8146c..5296c800283 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -449,7 +449,7 @@ The Apache Software License, Version 2.0
- org.eclipse.jetty.websocket-websocket-servlet-9.4.48.v20220622.jar
- org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.48.v20220622.jar
- org.eclipse.jetty-jetty-alpn-server-9.4.48.v20220622.jar
- * SnakeYaml -- org.yaml-snakeyaml-1.30.jar
+ * SnakeYaml -- org.yaml-snakeyaml-1.31.jar
* RocksDB - org.rocksdb-rocksdbjni-6.16.4.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.5.1.jar
* Apache Thrift - org.apache.thrift-libthrift-0.14.2.jar
diff --git a/pom.xml b/pom.xml
index 2cf20885df0..3b1aac8cc03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@ flexible messaging model and an intuitive client API.</description>
<!-- apache commons -->
<commons-compress.version>1.21</commons-compress.version>
-
+ <snakeyaml.version>1.31</snakeyaml.version>
<bookkeeper.version>4.14.5</bookkeeper.version>
<zookeeper.version>3.6.3</zookeeper.version>
<commons-cli.version>1.5.0</commons-cli.version>
@@ -1263,6 +1263,12 @@ flexible messaging model and an intuitive client API.</description>
<version>${roaringbitmap.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index eea9c04d48c..39ff98aff3b 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -398,7 +398,7 @@ The Apache Software License, Version 2.0
* RocksDB JNI
- rocksdbjni-6.16.4.jar
* SnakeYAML
- - snakeyaml-1.30.jar
+ - snakeyaml-1.31.jar
* Bean Validation API
- validation-api-2.0.1.Final.jar
* Objectsize