Skip to content

Commit

Permalink
Issue 8558: Upgrade Kubernetes client and remove sundr-codegen (allow…
Browse files Browse the repository at this point in the history
… Pulsar to run on JDK14+) (apache#8576)

Fixes apache#8558

### Motivation
sundr-codegen jar is not needed at runtime and in bundles legacy versions of commons-lang and other libraries, this is polluting the runtime classpath of Pulsar Broker,Bookie,Functions...
The depedency comes from Kubernetes java client, used by Pulsar Functions.
 
sundrio/sundrio#153


### Modifications

- remove sundr-codegen from distribution lib
- **allow Pulsar bookie to run on JDK14+**
- upgrade Kubernetes java client
- upgrade commons-lang3

### Verifying this change

I have verified this change manually.

### Does this pull request potentially affect one of the following parts:

*If `yes` was chosen, please highlight the changes*
  - Dependencies (does it add or upgrade a dependency): yes
  • Loading branch information
eolivelli authored Mar 9, 2021
1 parent d1a6393 commit 1d6aa57
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 28 deletions.
22 changes: 8 additions & 14 deletions distribution/server/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,6 @@ The Apache Software License, Version 2.0
* Gson
- com.google.code.gson-gson-2.8.6.jar
- io.gsonfire-gson-fire-1.8.4.jar
* Sundrio
- io.sundr-builder-annotations-0.21.0.jar
- io.sundr-resourcecify-annotations-0.21.0.jar
- io.sundr-sundr-codegen-0.21.0.jar
- io.sundr-sundr-core-0.21.0.jar
* Guava
- com.google.guava-guava-30.1-jre.jar
- com.google.guava-failureaccess-1.0.1.jar
Expand All @@ -358,7 +353,7 @@ The Apache Software License, Version 2.0
- commons-logging-commons-logging-1.1.1.jar
- org.apache.commons-commons-collections4-4.1.jar
- org.apache.commons-commons-compress-1.19.jar
- org.apache.commons-commons-lang3-3.6.jar
- org.apache.commons-commons-lang3-3.11.jar
* Netty
- io.netty-netty-buffer-4.1.51.Final.jar
- io.netty-netty-codec-4.1.51.Final.jar
Expand Down Expand Up @@ -454,8 +449,10 @@ The Apache Software License, Version 2.0
* RocksDB - org.rocksdb-rocksdbjni-6.10.2.jar
* Google Error Prone Annotations - com.google.errorprone-error_prone_annotations-2.3.4.jar
* Apache Thrifth - org.apache.thrift-libthrift-0.12.0.jar
* OkHttp
- com.squareup.okhttp-okhttp-2.7.4.jar
* OkHttp and OkHttp3
- com.squareup.okhttp-okhttp-2.7.4.jar
- com.squareup.okhttp3-logging-interceptor-3.14.9.jar
- com.squareup.okhttp3-okhttp-3.14.9.jar
* Okio - com.squareup.okio-okio-1.13.0.jar
* Javassist -- org.javassist-javassist-3.25.0-GA.jar
* gRPC
Expand Down Expand Up @@ -494,13 +491,10 @@ The Apache Software License, Version 2.0
- org.apache.yetus-audience-annotations-0.5.0.jar
* @FreeBuilder
- org.inferred-freebuilder-1.14.9.jar
* Squareup
- com.squareup.okhttp3-logging-interceptor-3.14.3.jar
- com.squareup.okhttp3-okhttp-3.14.3.jar
* Kubernetes Client
- io.kubernetes-client-java-9.0.2.jar
- io.kubernetes-client-java-api-9.0.2.jar
- io.kubernetes-client-java-proto-9.0.2.jar
- io.kubernetes-client-java-10.0.0.jar
- io.kubernetes-client-java-api-10.0.0.jar
- io.kubernetes-client-java-proto-10.0.0.jar
* Joda Time
- joda-time-2.10.1.jar
- joda-time-joda-time-2.10.1.jar
Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ flexible messaging model and an intuitive client API.</description>
<aircompressor.version>0.16</aircompressor.version>
<asynchttpclient.version>2.12.1</asynchttpclient.version>
<jcommander.version>1.78</jcommander.version>
<commons-lang3.version>3.6</commons-lang3.version>
<commons-lang3.version>3.11</commons-lang3.version>
<commons-configuration.version>1.10</commons-configuration.version>
<commons-io.version>2.5</commons-io.version>
<commons-codec.version>1.10</commons-codec.version>
Expand All @@ -179,7 +179,8 @@ flexible messaging model and an intuitive client API.</description>
<jaxb-api>2.3.1</jaxb-api>
<javax.activation.version>1.2.0</javax.activation.version>
<jna.version>4.2.0</jna.version>
<kubernetesclient.version>9.0.2</kubernetesclient.version>
<kubernetesclient.version>10.0.0</kubernetesclient.version>
<sundr.version>0.21.0</sundr.version>
<nsq-client.version>1.0</nsq-client.version>
<cron-utils.version>9.1.3</cron-utils.version>
<spring-context.version>5.3.1</spring-context.version>
Expand Down
38 changes: 27 additions & 11 deletions pulsar-functions/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,33 @@
</dependency>

<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<version>${kubernetesclient.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<version>${kubernetesclient.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>io.sundr</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>sundr-codegen</artifactId>
<version>${sundr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>sundr-core</artifactId>
<version>${sundr.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
16 changes: 16 additions & 0 deletions pulsar-functions/secrets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,28 @@
<version>${kubernetesclient.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>io.sundr</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>sundr-codegen</artifactId>
<version>${sundr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>sundr-core</artifactId>
<version>${sundr.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-sql/presto-distribution/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ The Apache Software License, Version 2.0
* Apache Commons
- commons-math3-3.6.1.jar
- commons-compress-1.19.jar
- commons-lang3-3.6.jar
- commons-lang3-3.11.jar
* Netty
- netty-3.10.6.Final.jar
- netty-buffer-4.1.51.Final.jar
Expand Down

0 comments on commit 1d6aa57

Please sign in to comment.