Skip to content
Closed
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
18 changes: 3 additions & 15 deletions dev/kyuubi-extension-spark-3-1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,33 +104,21 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already pulled by spark-sql

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can also remove the antlr4-runtime and parent pom.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just make sure we don't miss anything here, Spark-3.1.2 depends antlr4-runtime:4.8-1, but kyuubi generates source code with antlr-maven-plugin:4.7. Is there any compatibility issue?

https://github.com/apache/spark/blob/de351e30a90dd988b133b3d00fa6218bfcaba8b8/pom.xml#L192

    <antlr4.version>4.8-1</antlr4.version>

https://github.com/apache/incubator-kyuubi/blob/4cd83790ae651ee0da92365458b08224d68a6419/pom.xml#L90

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we should bump 4.8-1 to align with spark, 4.7 should work but will print warning messages if the antlr version is not exactly matched.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we should bump antlr 4.8, see apache/spark#32603

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sense

<scope>test</scope>
Copy link
Member Author

@pan3793 pan3793 Sep 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's likely an accident change in #990, reverted.

</dependency>
</dependencies>

<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>

<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${antlr4.version}</version>
<executions>
<execution>
<goals>
<goal>antlr4</goal>
</goals>
</execution>
</executions>
<configuration>
<visitor>true</visitor>
<sourceDirectory>./src/main/antlr4/org/apache/kyuubi/zorder</sourceDirectory>
<treatWarningsAsErrors>true</treatWarningsAsErrors>
<sourceDirectory>${project.basedir}/src/main/antlr4/org/apache/kyuubi/zorder</sourceDirectory>
</configuration>
</plugin>
</plugins>
Expand Down
23 changes: 16 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<scala.version>2.12.14</scala.version>
<scala.binary.version>2.12</scala.binary.version>

<antlr4.version>4.7</antlr4.version>
<antlr4.version>4.8</antlr4.version>
<codahale.metrics.version>4.1.1</codahale.metrics.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
Expand Down Expand Up @@ -261,12 +261,6 @@
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>${antlr4.version}</version>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
Expand Down Expand Up @@ -1565,6 +1559,21 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${antlr4.version}</version>
<executions>
<execution>
<goals>
<goal>antlr4</goal>
</goals>
</execution>
</executions>
<configuration>
<treatWarningsAsErrors>true</treatWarningsAsErrors>
</configuration>
</plugin>
</plugins>
</pluginManagement>

Expand Down