Skip to content

Commit

Permalink
[pulsar-sql] Bump presto.version to run PrestoServer on JDK11+
Browse files Browse the repository at this point in the history
This is another attempt to fix #14951 without introduce workaround.

Signed-off-by: tison <[email protected]>
  • Loading branch information
tisonkun committed Jun 21, 2022
1 parent b0828aa commit e989ca8
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 151 deletions.
3 changes: 1 addition & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ github:
- CI - System - Schema
- CI - System - Tiered FileSystem
- CI - System - Tiered JCloud
# Sql integration tests are disabled until https://github.com/apache/pulsar/issues/14951 has been resolved
# - CI - System - Sql
- CI - System - Sql

required_pull_request_reviews:
dismiss_stale_reviews: false
Expand Down
1 change: 0 additions & 1 deletion conf/presto/jvm.config
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
-XX:+ExitOnOutOfMemoryError
-Dpresto-temporarily-allow-java8=true
-Djdk.attach.allowAttachSelf=true
-javaagent:java-version-trim-agent.jar
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ flexible messaging model and an intuitive client API.</description>
<json-smart.version>2.4.7</json-smart.version>
<opensearch.version>1.2.4</opensearch.version>
<elasticsearch-java.version>8.1.0</elasticsearch-java.version>
<presto.version>332</presto.version>
<presto.version>334</presto.version>
<scala.binary.version>2.13</scala.binary.version>
<scala-library.version>2.13.6</scala-library.version>
<debezium.version>1.7.2.Final</debezium.version>
Expand Down
58 changes: 0 additions & 58 deletions pulsar-sql/java-version-trim-agent/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions pulsar-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
<modules>
<module>presto-pulsar</module>
<module>presto-pulsar-plugin</module>
<module>java-version-trim-agent</module>
<module>presto-distribution</module>
</modules>
</profile>
Expand All @@ -192,7 +191,6 @@
<modules>
<module>presto-pulsar</module>
<module>presto-pulsar-plugin</module>
<module>java-version-trim-agent</module>
<module>presto-distribution</module>
</modules>
</profile>
Expand Down
7 changes: 0 additions & 7 deletions pulsar-sql/presto-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,6 @@
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>java-version-trim-agent</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

</dependencies>

<dependencyManagement>
Expand Down
5 changes: 0 additions & 5 deletions pulsar-sql/presto-distribution/src/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
<outputDirectory>bin/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>${basedir}/../java-version-trim-agent/target/java-version-trim-agent.jar</source>
<destName>java-version-trim-agent.jar</destName>
<outputDirectory>/</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
Expand Down
2 changes: 1 addition & 1 deletion src/check-binary-license.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ done

if [ "$NO_PRESTO" -ne 1 ]; then
# check pulsar sql jars
JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v pulsar-client | grep -v bouncy-castle-bc | grep -v pulsar-metadata | grep -v 'managed-ledger' | grep -v 'pulsar-client-admin' | grep -v 'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v 'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' | grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v 'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v 'pulsar-transaction-common' | grep -v 'pulsar-package-core' | grep -v 'java-version-trim-agent' | sed 's!.*/!!' | sort)
JARS=$(tar -tf $TARBALL | grep '\.jar' | grep 'lib/presto/' | grep -v pulsar-client | grep -v bouncy-castle-bc | grep -v pulsar-metadata | grep -v 'managed-ledger' | grep -v 'pulsar-client-admin' | grep -v 'pulsar-client-api' | grep -v 'pulsar-functions-api' | grep -v 'pulsar-presto-connector-original' | grep -v 'pulsar-presto-distribution' | grep -v 'pulsar-common' | grep -v 'pulsar-functions-proto' | grep -v 'pulsar-functions-utils' | grep -v 'pulsar-io-core' | grep -v 'pulsar-transaction-common' | grep -v 'pulsar-package-core' | sed 's!.*/!!' | sort)
if [ -n "$JARS" ]; then
LICENSEPATH=$(tar -tf $TARBALL | awk '/^[^\/]*\/lib\/presto\/LICENSE/')
LICENSE=$(tar -O -xf $TARBALL "$LICENSEPATH")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@
-XX:+ExitOnOutOfMemoryError
-Dpresto-temporarily-allow-java8=true
-Djdk.attach.allowAttachSelf=true
-javaagent:java-version-trim-agent.jar

0 comments on commit e989ca8

Please sign in to comment.