Skip to content

Bump dependencies and add JavaCC21 #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2022
Merged

Bump dependencies and add JavaCC21 #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 27 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,38 +80,39 @@

<annotations-api.version>6.0.53</annotations-api.version>
<asm.version>9.3</asm.version>
<byte-buddy.version>1.12.10</byte-buddy.version>
<caffeine.version>3.1.0</caffeine.version>
<byte-buddy.version>1.12.13</byte-buddy.version>
<caffeine.version>3.1.1</caffeine.version>
<compress.version>1.21</compress.version>
<disruptor.version>3.4.4</disruptor.version>
<dnsjava.version>3.5.1</dnsjava.version>
<fastutil.version>8.5.8</fastutil.version>
<grpc.version>1.45.1</grpc.version>
<gson.version>2.9.0</gson.version>
<grpc.version>1.48.1</grpc.version>
<gson.version>2.9.1</gson.version>
<httpclient.version>4.5.13</httpclient.version>
<protobuf.version>3.19.2</protobuf.version>
<protobuf.version>3.21.4</protobuf.version>
<lz4.version>1.8.0</lz4.version>
<roaring-bitmap.version>0.9.25</roaring-bitmap.version>
<slf4j.version>2.0.0-alpha5</slf4j.version>
<roaring-bitmap.version>0.9.31</roaring-bitmap.version>
<slf4j.version>2.0.0-beta0</slf4j.version>
<mockito.version>3.12.4</mockito.version>
<wiremock.version>2.33.2</wiremock.version>
<testcontainers.version>1.17.1</testcontainers.version>
<testng.version>7.5</testng.version>
<testcontainers.version>1.17.3</testcontainers.version>
<testng.version>7.6.1</testng.version>

<mariadb-driver.version>3.0.4</mariadb-driver.version>
<mysql-driver.version>8.0.29</mysql-driver.version>
<postgresql-driver.version>42.3.5</postgresql-driver.version>
<mariadb-driver.version>3.0.7</mariadb-driver.version>
<mysql-driver.version>8.0.30</mysql-driver.version>
<postgresql-driver.version>42.4.1</postgresql-driver.version>

<repackaged.version>1.2.0</repackaged.version>
<repackaged.version>1.3.0</repackaged.version>
<shade.base>${project.groupId}.client.internal</shade.base>

<assembly-plugin.version>3.3.0</assembly-plugin.version>
<antrun-plugin.version>3.1.0</antrun-plugin.version>
<assembly-plugin.version>3.4.2</assembly-plugin.version>
<compiler-plugin.version>3.10.1</compiler-plugin.version>
<deploy-plugin.version>3.0.0-M2</deploy-plugin.version>
<enforcer-plugin.version>3.0.0</enforcer-plugin.version>
<failsafe-plugin.version>3.0.0-M6</failsafe-plugin.version>
<deploy-plugin.version>3.0.0</deploy-plugin.version>
<enforcer-plugin.version>3.1.0</enforcer-plugin.version>
<failsafe-plugin.version>3.0.0-M7</failsafe-plugin.version>
<flatten-plugin.version>1.2.7</flatten-plugin.version>
<git-plugin.version>4.9.9</git-plugin.version>
<git-plugin.version>5.0.0</git-plugin.version>
<gpg-plugin.version>3.0.1</gpg-plugin.version>
<helper-plugin.version>3.3.0</helper-plugin.version>
<jacoco-plugin.version>0.8.8</jacoco-plugin.version>
Expand All @@ -122,9 +123,9 @@
<shade-plugin.version>3.3.0</shade-plugin.version>
<source-plugin.version>3.2.1</source-plugin.version>
<staging-plugin.version>1.6.13</staging-plugin.version>
<surefire-plugin.version>3.0.0-M6</surefire-plugin.version>
<toolchains-plugin.version>3.0.0</toolchains-plugin.version>
<versions-plugin.version>2.10.0</versions-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<toolchains-plugin.version>3.1.0</toolchains-plugin.version>
<versions-plugin.version>2.11.0</versions-plugin.version>

<minJdk>1.8</minJdk>
<skipTests>false</skipTests>
Expand Down Expand Up @@ -313,6 +314,11 @@
<artifactId>os-maven-plugin</artifactId>
<version>${os-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
69 changes: 69 additions & 0 deletions third-party-libraries/com.javacc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.clickhouse</groupId>
<artifactId>third-party-libraries</artifactId>
<version>${revision}</version>
</parent>

<artifactId>com.javacc</artifactId>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
<description>Repackaged JavaCC for generating SQL parser</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/com.javacc</url>

<properties>
<javacc.dir>javacc21-master</javacc.dir>
<javacc.src.zip>https://github.com/javacc21/javacc21/archive/refs/heads/master.zip</javacc.src.zip>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>get-javacc</id>
<phase>clean</phase>
<configuration>
<target>
<get src="${javacc.src.zip}" dest="${project.build.directory}/javacc.zip" />
<unzip src="${project.build.directory}/javacc.zip" dest="${project.build.directory}" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>build-javacc</id>
<phase>initialize</phase>
<configuration>
<target>
<ant antfile="${project.build.directory}/${javacc.dir}/build.xml" dir="${project.build.directory}/${javacc.dir}">
<target name="full-jar" />
</ant>
<unzip src="${project.build.directory}/${javacc.dir}/javacc-full.jar" dest="${project.build.directory}/classes" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.directory}/classes/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
36 changes: 22 additions & 14 deletions third-party-libraries/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
</developers>

<modules>
<module>com.javacc</module>
<module>io.grpc</module>
<module>org.roaringbitmap</module>
</modules>
Expand Down Expand Up @@ -68,25 +69,27 @@
</distributionManagement>

<properties>
<revision>1.2.0</revision>
<revision>1.3.0</revision>
<project.current.year>2022</project.current.year>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<grpc.version>1.45.1</grpc.version>
<gson.version>2.9.0</gson.version>
<opencensus.version>0.28.3</opencensus.version>
<roaring-bitmap.version>0.9.27</roaring-bitmap.version>
<assembly-plugin.version>3.3.0</assembly-plugin.version>
<deploy-plugin.version>3.0.0-M1</deploy-plugin.version>

<grpc.version>1.48.1</grpc.version>
<gson.version>2.9.1</gson.version>
<opencensus.version>0.31.1</opencensus.version>
<roaring-bitmap.version>0.9.31</roaring-bitmap.version>

<antrun-plugin.version>3.1.0</antrun-plugin.version>
<compiler-plugin.version>3.10.1</compiler-plugin.version>
<deploy-plugin.version>3.0.0</deploy-plugin.version>
<flatten-plugin.version>1.2.7</flatten-plugin.version>
<staging-plugin.version>1.6.8</staging-plugin.version>
<gpg-plugin.version>1.6</gpg-plugin.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<moditect-plugin.version>1.0.0.RC1</moditect-plugin.version>
<shade-plugin.version>3.2.4</shade-plugin.version>
<gpg-plugin.version>3.0.1</gpg-plugin.version>
<jar-plugin.version>3.2.2</jar-plugin.version>
<javadoc-plugin.version>3.4.0</javadoc-plugin.version>
<moditect-plugin.version>1.0.0.RC2</moditect-plugin.version>
<shade-plugin.version>3.3.0</shade-plugin.version>
<source-plugin.version>3.2.1</source-plugin.version>
<jar-plugin.version>3.2.0</jar-plugin.version>
<javadoc-plugin.version>3.2.0</javadoc-plugin.version>
<staging-plugin.version>1.6.13</staging-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -162,6 +165,11 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${antrun-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down