[pulsar-sql] Bump presto.version to run PrestoServer on JDK11+ (apach…

…e#16163)

.asf.yaml

@@ -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

conf/presto/config.properties

@@ -37,6 +37,4 @@ scheduler.http-client.idle-timeout=1m
 query.client.timeout=5m
 query.min-expire-age=30m
 
-presto.version=testversion
-
 node-scheduler.include-coordinator=true

conf/presto/jvm.config

@@ -26,4 +26,3 @@
 -XX:+ExitOnOutOfMemoryError
 -Dpresto-temporarily-allow-java8=true
 -Djdk.attach.allowAttachSelf=true
--javaagent:java-version-trim-agent.jar

pom.xml

@@ -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>

pulsar-sql/pom.xml

@@ -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>
@@ -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>

pulsar-sql/presto-distribution/LICENSE

@@ -394,17 +394,18 @@ The Apache Software License, Version 2.0
   * Okio
     - okio-1.17.2.jar
   * Presto
-    - presto-array-332.jar
-    - presto-cli-332.jar
-    - presto-client-332.jar
-    - presto-geospatial-toolkit-332.jar
-    - presto-main-332.jar
-    - presto-matching-332.jar
-    - presto-memory-context-332.jar
-    - presto-parser-332.jar
-    - presto-plugin-toolkit-332.jar
-    - presto-spi-332.jar
-    - presto-record-decoder-332.jar
+    - presto-array-334.jar
+    - presto-cli-334.jar
+    - presto-client-334.jar
+    - presto-geospatial-toolkit-334.jar
+    - presto-main-334.jar
+    - presto-matching-334.jar
+    - presto-memory-context-334.jar
+    - presto-parser-334.jar
+    - presto-plugin-toolkit-334.jar
+    - presto-server-main-334.jar
+    - presto-spi-334.jar
+    - presto-record-decoder-334.jar
   * RocksDB JNI
     - rocksdbjni-6.10.2.jar
   * SnakeYAML

pulsar-sql/presto-distribution/pom.xml

@@ -81,7 +81,7 @@
 
     <dependency>
       <groupId>io.prestosql</groupId>
-      <artifactId>presto-main</artifactId>
+      <artifactId>presto-server-main</artifactId>
       <version>${presto.version}</version>
       <exclusions>
         <!-- exclude openjdk because of GPL license -->
@@ -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>

pulsar-sql/presto-distribution/src/assembly/assembly.xml

@@ -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>

src/check-binary-license.sh

@@ -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")

tests/docker-images/latest-version-image/conf/presto/jvm.config

@@ -27,4 +27,3 @@
 -XX:+ExitOnOutOfMemoryError
 -Dpresto-temporarily-allow-java8=true
 -Djdk.attach.allowAttachSelf=true
--javaagent:java-version-trim-agent.jar

tests/integration/src/test/resources/presto-coordinator-config.properties

@@ -39,6 +39,4 @@ scheduler.http-client.idle-timeout=1m
 query.client.timeout=5m
 query.min-expire-age=30m
 
-presto.version=testversion
-
 node-scheduler.include-coordinator=true

tests/integration/src/test/resources/presto-follow-worker-config.properties

@@ -25,5 +25,3 @@ discovery.uri=http://presto-worker:8081
 
 query.client.timeout=5m
 query.min-expire-age=30m
-
-presto.version=testversion