Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[improve][misc] Sync commits from apache into 3.1_ds #322

Merged
merged 4 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ The Apache Software License, Version 2.0
- commons-cli-commons-cli-1.5.0.jar
- commons-codec-commons-codec-1.15.jar
- commons-configuration-commons-configuration-1.10.jar
- commons-io-commons-io-2.8.0.jar
- commons-io-commons-io-2.14.0.jar
- commons-lang-commons-lang-2.6.jar
- commons-logging-commons-logging-1.1.1.jar
- org.apache.commons-commons-collections4-4.4.jar
Expand Down Expand Up @@ -450,8 +450,8 @@ The Apache Software License, Version 2.0
* zt-zip
- org.zeroturnaround-zt-zip-1.17.jar
* Apache Avro
- org.apache.avro-avro-1.11.3.jar
- org.apache.avro-avro-protobuf-1.11.3.jar
- org.apache.avro-avro-1.11.4.jar
- org.apache.avro-avro-protobuf-1.11.4.jar
* Apache Curator
- org.apache.curator-curator-client-5.1.0.jar
- org.apache.curator-curator-framework-5.1.0.jar
Expand Down Expand Up @@ -528,8 +528,8 @@ MIT License
- com.auth0-jwks-rsa-0.22.0.jar
Protocol Buffers License
* Protocol Buffers
- com.google.protobuf-protobuf-java-3.19.6.jar -- ../licenses/LICENSE-protobuf.txt
- com.google.protobuf-protobuf-java-util-3.19.6.jar -- ../licenses/LICENSE-protobuf.txt
- com.google.protobuf-protobuf-java-3.25.5.jar -- ../licenses/LICENSE-protobuf.txt
- com.google.protobuf-protobuf-java-util-3.25.5.jar -- ../licenses/LICENSE-protobuf.txt

CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
Expand Down
8 changes: 4 additions & 4 deletions distribution/shell/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ The Apache Software License, Version 2.0
* Apache Commons
- commons-codec-1.15.jar
- commons-configuration-1.10.jar
- commons-io-2.8.0.jar
- commons-io-2.14.0.jar
- commons-lang-2.6.jar
- commons-logging-1.2.jar
- commons-lang3-3.11.jar
Expand Down Expand Up @@ -407,8 +407,8 @@ The Apache Software License, Version 2.0
* Google Error Prone Annotations - error_prone_annotations-2.5.1.jar
* Javassist -- javassist-3.25.0-GA.jar
* Apache Avro
- avro-1.11.3.jar
- avro-protobuf-1.11.3.jar
- avro-1.11.4.jar
- avro-protobuf-1.11.4.jar
* Spotify completable-futures -- completable-futures-0.3.6.jar

BSD 3-clause "New" or "Revised" License
Expand All @@ -423,7 +423,7 @@ MIT License

Protocol Buffers License
* Protocol Buffers
- protobuf-java-3.19.6.jar -- ../licenses/LICENSE-protobuf.txt
- protobuf-java-3.25.5.jar -- ../licenses/LICENSE-protobuf.txt

CDDL-1.1 -- ../licenses/LICENSE-CDDL-1.1.txt
* Java Annotations API
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ flexible messaging model and an intuitive client API.</description>
<typetools.version>0.5.0</typetools.version>
<byte-buddy.version>1.14.12</byte-buddy.version>
<zt-zip.version>1.17</zt-zip.version>
<protobuf3.version>3.19.6</protobuf3.version>
<protobuf3.version>3.25.5</protobuf3.version>
<protoc3.version>${protobuf3.version}</protoc3.version>
<grpc.version>1.55.3</grpc.version>
<google-http-client.version>1.41.0</google-http-client.version>
Expand All @@ -182,7 +182,7 @@ flexible messaging model and an intuitive client API.</description>
<kafka-client.version>3.4.0</kafka-client.version>
<rabbitmq-client.version>5.18.0</rabbitmq-client.version>
<aws-sdk.version>1.12.638</aws-sdk.version>
<avro.version>1.11.3</avro.version>
<avro.version>1.11.4</avro.version>
<joda.version>2.10.10</joda.version>
<jclouds.version>2.6.0</jclouds.version>
<guice.version>5.1.0</guice.version>
Expand Down Expand Up @@ -216,7 +216,7 @@ flexible messaging model and an intuitive client API.</description>
<jcommander.version>1.82</jcommander.version>
<commons-lang3.version>3.11</commons-lang3.version>
<commons-configuration.version>1.10</commons-configuration.version>
<commons-io.version>2.8.0</commons-io.version>
<commons-io.version>2.14.0</commons-io.version>
<commons-codec.version>1.15</commons-codec.version>
<javax.ws.rs-api.version>2.1</javax.ws.rs-api.version>
<hdrHistogram.version>2.1.9</hdrHistogram.version>
Expand Down
10 changes: 5 additions & 5 deletions pulsar-sql/presto-distribution/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,8 @@ The Apache Software License, Version 2.0
* OpenCSV
- opencsv-2.3.jar
* Avro
- avro-1.11.3.jar
- avro-protobuf-1.11.3.jar
- avro-1.11.4.jar
- avro-protobuf-1.11.4.jar
* Caffeine
- caffeine-2.9.1.jar
* Javax
Expand Down Expand Up @@ -445,7 +445,7 @@ The Apache Software License, Version 2.0
- commons-codec-1.15.jar
- commons-collections4-4.4.jar
- commons-configuration-1.10.jar
- commons-io-2.8.0.jar
- commons-io-2.14.0.jar
- commons-lang-2.6.jar
- commons-logging-1.2.jar
* GSON
Expand Down Expand Up @@ -484,8 +484,8 @@ The Apache Software License, Version 2.0

Protocol Buffers License
* Protocol Buffers
- protobuf-java-3.19.6.jar
- protobuf-java-util-3.19.6.jar
- protobuf-java-3.25.5.jar
- protobuf-java-util-3.25.5.jar
- proto-google-common-protos-2.9.0.jar

BSD 3-clause "New" or "Revised" License
Expand Down
Loading