Skip to content

Commit

Permalink
Upgrade dependent versions and fix plugin settings for building Graal…
Browse files Browse the repository at this point in the history
…VM Native Image (#22169)

- Update native-maven-plugin to bump metadata repo version.
- Upgrade and separate HikariCP version to match native-image metadata in https://github.com/oracle/graalvm-reachability-metadata/tree/master/metadata/com.zaxxer/HikariCP/5.0.1 .
- Upgrade Netty version to use the recommended directory layout for native-image metadata. Refer to netty/netty#12934 .
- Update LICENSE.
- Add Missing OCI tag information of `docker.native` profile.
  • Loading branch information
linghengqian authored Nov 16, 2022
1 parent 0632530 commit 00793b4
Show file tree
Hide file tree
Showing 36 changed files with 265 additions and 257 deletions.
9 changes: 8 additions & 1 deletion distribution/proxy-native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<native.image.name>apache-shardingsphere-proxy-native</native.image.name>
<native.image.repository>apache/shardingsphere-proxy-native</native.image.repository>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<native.maven.plugin.version>0.9.16</native.maven.plugin.version>
<native.maven.plugin.version>0.9.17</native.maven.plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -98,6 +98,9 @@
</profile>
<profile>
<id>native</id>
<properties>
<hikari-cp.version>5.0.1</hikari-cp.version>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -177,6 +180,10 @@
<argument>--build-arg</argument>
<argument>APP_NAME=${native.image.name}</argument>
<argument>.</argument>
<argument>-t</argument>
<argument>${proxy.image.repository}:${proxy.image.tag}</argument>
<argument>-t</argument>
<argument>${proxy.image.repository}:latest</argument>
</arguments>
</configuration>
</execution>
Expand Down
34 changes: 17 additions & 17 deletions distribution/proxy-native/src/main/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ The text of each license is the standard Apache 2.0 license.
grpc-stub 1.48.0: https://github.com/grpc/grpc-java, Apache 2.0
gson 2.9.1: https://github.com/google/gson, Apache 2.0
guava 30.0-jre: https://github.com/google/guava, Apache 2.0
HikariCP 3.4.2: https://github.com/brettwooldridge/HikariCP, Apache 2.0
HikariCP 5.0.1: https://github.com/brettwooldridge/HikariCP, Apache 2.0
httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
Expand All @@ -268,22 +268,22 @@ The text of each license is the standard Apache 2.0 license.
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
netty-buffer 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-dns 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-http 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-http2 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-socks 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-common 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-handler 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.84.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.84.Final-linux-x86_64: https://github.com/netty, Apache 2.0
netty-transport-native-unix-common 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-buffer 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-dns 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-http 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-http2 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-socks 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-common 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-handler 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-transport 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.85.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.85.Final-linux-x86_64: https://github.com/netty, Apache 2.0
netty-transport-native-unix-common 4.1.85.Final: https://github.com/netty, Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.0.1: https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
Expand Down
34 changes: 17 additions & 17 deletions distribution/proxy/src/main/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ The text of each license is the standard Apache 2.0 license.
grpc-stub 1.48.0: https://github.com/grpc/grpc-java, Apache 2.0
gson 2.9.1: https://github.com/google/gson, Apache 2.0
guava 30.0-jre: https://github.com/google/guava, Apache 2.0
HikariCP 3.4.2: https://github.com/brettwooldridge/HikariCP, Apache 2.0
HikariCP 4.0.3: https://github.com/brettwooldridge/HikariCP, Apache 2.0
httpclient5 5.1.3: https://hc.apache.org/httpcomponents-client-5.1.x, Apache 2.0
httpcore5-h2 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
httpcore5 5.1.3: https://hc.apache.org/httpcomponents-core-5.1.x, Apache 2.0
Expand All @@ -268,22 +268,22 @@ The text of each license is the standard Apache 2.0 license.
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
netty-buffer 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-dns 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-http 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-http2 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-codec-socks 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-common 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-handler 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.84.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.84.Final-linux-x86_64: https://github.com/netty, Apache 2.0
netty-transport-native-unix-common 4.1.84.Final: https://github.com/netty, Apache 2.0
netty-buffer 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-dns 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-http 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-http2 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-codec-socks 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-common 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-handler 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-handler-proxy 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-resolver 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-resolver-dns 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-transport 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-transport-classes-epoll 4.1.85.Final: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.85.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
netty-transport-native-epoll 4.1.85.Final-linux-x86_64: https://github.com/netty, Apache 2.0
netty-transport-native-unix-common 4.1.85.Final: https://github.com/netty, Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.0.1: https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ private static void buildDefaultProperties() {
DEFAULT_PROPS.put("maximumPoolSize", 50);
DEFAULT_PROPS.put("minimumIdle", 1);
DEFAULT_PROPS.put("readOnly", false);
DEFAULT_PROPS.put("keepaliveTime", 0);
}

private static void buildInvalidProperties() {
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,16 @@
<gson.version>2.9.1</gson.version>
<jackson.version>2.13.4</jackson.version>
<groovy.version>4.0.6</groovy.version>
<freemarker.version>2.3.31</freemarker.version>
<caffeine.version>2.9.3</caffeine.version>

<jaxb.version>2.3.0</jaxb.version>
<annotation-api.version>1.3.2</annotation-api.version>
<activation-api.version>1.2.0</activation-api.version>

<calcite.version>1.32.0</calcite.version>
<vertx.version>4.3.3</vertx.version>
<netty.version>4.1.84.Final</netty.version>
<netty.version>4.1.85.Final</netty.version>

<javax.transaction.version>1.1</javax.transaction.version>

Expand Down Expand Up @@ -111,7 +113,7 @@
<h2.version>2.1.214</h2.version>
<mssql.version>6.1.7.jre8-preview</mssql.version>

<hikari-cp.version>3.4.2</hikari-cp.version>
<hikari-cp.version>4.0.3</hikari-cp.version>
<commons-dbcp2.version>2.2.0</commons-dbcp2.version>

<junit5.version>5.9.1</junit5.version>
Expand Down Expand Up @@ -152,9 +154,7 @@
<checksum-maven-plugin.version>1.10</checksum-maven-plugin.version>
<templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<freemarker.version>2.3.31</freemarker.version>
<spotless-maven-plugin.version>2.22.1</spotless-maven-plugin.version>
<caffeine.version>2.9.3</caffeine.version>
</properties>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<column name="read_only" />
<column name="other_attributes" />
</metadata>
<row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0| 30000| 60000| 1800000| 2| 2| false| &#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&quot;useLocalSessionState&quot;&#58;&quot;true&quot;&#44;&quot;maintainTimeStats&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSize&quot;&#58;&quot;8192&quot;&#44;&quot;tinyInt1isBit&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSqlLimit&quot;&#58;&quot;2048&quot;&#44;&quot;netTimeoutForStreamingResults&quot;&#58;&quot;0&quot;&#44;&quot;zeroDateTimeBehavior&quot;&#58;&quot;round&quot;&#125;&#44;&quot;healthCheckProperties&quot;&#58;&#123;&#125;&#44;&quot;initializationFailTimeout&quot;&#58;1&#44;&quot;validationTimeout&quot;&#58;5000&#44;&quot;leakDetectionThreshold&quot;&#58;0&#44;&quot;registerMbeans&quot;&#58;false&#44;&quot;allowPoolSuspension&quot;&#58;false&#44;&quot;autoCommit&quot;&#58;true&#44;&quot;isolateInternalQueries&quot;&#58;false&#125;" />
<row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1| 30000| 60000| 1800000| 2| 2| false| &#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&quot;useLocalSessionState&quot;&#58;&quot;true&quot;&#44;&quot;maintainTimeStats&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSize&quot;&#58;&quot;8192&quot;&#44;&quot;tinyInt1isBit&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSqlLimit&quot;&#58;&quot;2048&quot;&#44;&quot;netTimeoutForStreamingResults&quot;&#58;&quot;0&quot;&#44;&quot;zeroDateTimeBehavior&quot;&#58;&quot;round&quot;&#125;&#44;&quot;healthCheckProperties&quot;&#58;&#123;&#125;&#44;&quot;initializationFailTimeout&quot;&#58;1&#44;&quot;validationTimeout&quot;&#58;5000&#44;&quot;leakDetectionThreshold&quot;&#58;0&#44;&quot;registerMbeans&quot;&#58;false&#44;&quot;allowPoolSuspension&quot;&#58;false&#44;&quot;autoCommit&quot;&#58;true&#44;&quot;isolateInternalQueries&quot;&#58;false&#125;" />
<row values="ds_2| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_2| 30000| 60000| 1800000| 2| 2| false| &#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&quot;useLocalSessionState&quot;&#58;&quot;true&quot;&#44;&quot;maintainTimeStats&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSize&quot;&#58;&quot;8192&quot;&#44;&quot;tinyInt1isBit&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSqlLimit&quot;&#58;&quot;2048&quot;&#44;&quot;netTimeoutForStreamingResults&quot;&#58;&quot;0&quot;&#44;&quot;zeroDateTimeBehavior&quot;&#58;&quot;round&quot;&#125;&#44;&quot;healthCheckProperties&quot;&#58;&#123;&#125;&#44;&quot;initializationFailTimeout&quot;&#58;1&#44;&quot;validationTimeout&quot;&#58;5000&#44;&quot;leakDetectionThreshold&quot;&#58;0&#44;&quot;registerMbeans&quot;&#58;false&#44;&quot;allowPoolSuspension&quot;&#58;false&#44;&quot;autoCommit&quot;&#58;true&#44;&quot;isolateInternalQueries&quot;&#58;false&#125;" />
<row values="ds_0| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_0| 30000| 60000| 1800000| 2| 2| false| &#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&quot;useLocalSessionState&quot;&#58;&quot;true&quot;&#44;&quot;maintainTimeStats&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSize&quot;&#58;&quot;8192&quot;&#44;&quot;tinyInt1isBit&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSqlLimit&quot;&#58;&quot;2048&quot;&#44;&quot;netTimeoutForStreamingResults&quot;&#58;&quot;0&quot;&#44;&quot;zeroDateTimeBehavior&quot;&#58;&quot;round&quot;&#125;&#44;&quot;healthCheckProperties&quot;&#58;&#123;&#125;&#44;&quot;initializationFailTimeout&quot;&#58;1&#44;&quot;validationTimeout&quot;&#58;5000&#44;&quot;keepaliveTime&quot;&#58;0&#44;&quot;leakDetectionThreshold&quot;&#58;0&#44;&quot;registerMbeans&quot;&#58;false&#44;&quot;allowPoolSuspension&quot;&#58;false&#44;&quot;autoCommit&quot;&#58;true&#44;&quot;isolateInternalQueries&quot;&#58;false&#125;" />
<row values="ds_1| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_1| 30000| 60000| 1800000| 2| 2| false| &#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&quot;useLocalSessionState&quot;&#58;&quot;true&quot;&#44;&quot;maintainTimeStats&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSize&quot;&#58;&quot;8192&quot;&#44;&quot;tinyInt1isBit&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSqlLimit&quot;&#58;&quot;2048&quot;&#44;&quot;netTimeoutForStreamingResults&quot;&#58;&quot;0&quot;&#44;&quot;zeroDateTimeBehavior&quot;&#58;&quot;round&quot;&#125;&#44;&quot;healthCheckProperties&quot;&#58;&#123;&#125;&#44;&quot;initializationFailTimeout&quot;&#58;1&#44;&quot;validationTimeout&quot;&#58;5000&#44;&quot;keepaliveTime&quot;&#58;0&#44;&quot;leakDetectionThreshold&quot;&#58;0&#44;&quot;registerMbeans&quot;&#58;false&#44;&quot;allowPoolSuspension&quot;&#58;false&#44;&quot;autoCommit&quot;&#58;true&#44;&quot;isolateInternalQueries&quot;&#58;false&#125;" />
<row values="ds_2| MySQL| mysql.rdl_empty_rules.host| 3306| rdl_ds_2| 30000| 60000| 1800000| 2| 2| false| &#123;&quot;dataSourceProperties&quot;&#58;&#123;&quot;cacheServerConfiguration&quot;&#58;&quot;true&quot;&#44;&quot;elideSetAutoCommits&quot;&#58;&quot;true&quot;&#44;&quot;useServerPrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;cachePrepStmts&quot;&#58;&quot;true&quot;&#44;&quot;rewriteBatchedStatements&quot;&#58;&quot;true&quot;&#44;&quot;cacheResultSetMetadata&quot;&#58;&quot;false&quot;&#44;&quot;useLocalSessionState&quot;&#58;&quot;true&quot;&#44;&quot;maintainTimeStats&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSize&quot;&#58;&quot;8192&quot;&#44;&quot;tinyInt1isBit&quot;&#58;&quot;false&quot;&#44;&quot;prepStmtCacheSqlLimit&quot;&#58;&quot;2048&quot;&#44;&quot;netTimeoutForStreamingResults&quot;&#58;&quot;0&quot;&#44;&quot;zeroDateTimeBehavior&quot;&#58;&quot;round&quot;&#125;&#44;&quot;healthCheckProperties&quot;&#58;&#123;&#125;&#44;&quot;initializationFailTimeout&quot;&#58;1&#44;&quot;validationTimeout&quot;&#58;5000&#44;&quot;keepaliveTime&quot;&#58;0&#44;&quot;leakDetectionThreshold&quot;&#58;0&#44;&quot;registerMbeans&quot;&#58;false&#44;&quot;allowPoolSuspension&quot;&#58;false&#44;&quot;autoCommit&quot;&#58;true&#44;&quot;isolateInternalQueries&quot;&#58;false&#125;" />
</dataset>
Loading

0 comments on commit 00793b4

Please sign in to comment.