Skip to content
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

Jump to bottom

Improve project setup #29

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Improve project setup #29

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
21 changes: 12 additions & 9 deletions baseapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.trino.gateway</groupId>
<artifactId>trinogateway-parent</artifactId>
<artifactId>trino-gateway-parent</artifactId>
<version>3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>baseapp</artifactId>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<dropwizard.version>1.3.29</dropwizard.version>
<guice.version>4.1.0</guice.version>
<reflections.version>0.9.10</reflections.version>
</properties>

<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
Expand All @@ -38,6 +30,10 @@
<artifactId>guice</artifactId>
<version>${guice.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
Expand Down Expand Up @@ -85,6 +81,13 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
16 changes: 2 additions & 14 deletions gateway-ha/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<parent>
<groupId>io.trino.gateway</groupId>
<artifactId>trinogateway-parent</artifactId>
<artifactId>trino-gateway-parent</artifactId>
<version>3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Expand All @@ -17,17 +17,6 @@
<name>gateway-ha</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jetty.version>9.4.48.v20220622</jetty.version>
<dropwizard.version>1.3.29</dropwizard.version>
<guice.version>4.1.0</guice.version>
<guava.version>23.0</guava.version>
<jeasy.version>4.1.0</jeasy.version>
<reflections.version>0.9.10</reflections.version>
<ehcache.version>3.8.1</ehcache.version>
<activejdbc.version>2.3</activejdbc.version>
<mysqlconnector.version>8.0.17</mysqlconnector.version>
<environments>development</environments>
<app.main.class>io.trino.gateway.ha.HaGatewayLauncher</app.main.class>
</properties>
Expand All @@ -51,7 +40,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>io.trino.gateway</groupId>
Expand Down Expand Up @@ -140,7 +128,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.17</version>
<version>${mysqlconnector.version}</version>
mosabua marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
104 changes: 52 additions & 52 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,70 @@

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>144</version>
</parent>

<groupId>io.trino.gateway</groupId>
<artifactId>trinogateway-parent</artifactId>
<name>trinogateway-parent</name>
<artifactId>trino-gateway-parent</artifactId>
<packaging>pom</packaging>
<version>3-SNAPSHOT</version>

<name>trino-gateway-parent</name>
<description>A smart load balancer and query router for Trino</description>
<url>https://github.com/trinodb/trino-gateway</url>
<inceptionYear>2018</inceptionYear>

<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/trinodb/trino-gateway.git</connection>
<tag>HEAD</tag>
<url>https://github.com/trinodb/trino-gateway</url>
</scm>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<project.build.targetJdk>17</project.build.targetJdk>
<air.java.version>17</air.java.version>
<air.check.skip-checkstyle>true</air.check.skip-checkstyle>
<air.check.skip-enforcer>true</air.check.skip-enforcer>
<air.check.skip-license>true</air.check.skip-license>
<air.check.skip-dependency>true</air.check.skip-dependency>
<air.check.skip-duplicate-finder>true</air.check.skip-duplicate-finder>
<air.check.skip-modernizer>true</air.check.skip-modernizer>
<air.check.fail-spotbugs>false</air.check.fail-spotbugs>
<air.check.skip-pmd>true</air.check.skip-pmd>

<!-- overriding version from airbase -->
<dep.jackson.version>2.10.1</dep.jackson.version>
mosabua marked this conversation as resolved.
Show resolved Hide resolved
<dep.logback.version>1.2.12</dep.logback.version>
mosabua marked this conversation as resolved.
Show resolved Hide resolved
<dep.slf4j.version>${slf4j.version}</dep.slf4j.version>
mosabua marked this conversation as resolved.
Show resolved Hide resolved

<!-- dependency versions -->
<activejdbc.version>2.3</activejdbc.version>
<dropwizard.version>1.3.29</dropwizard.version>
<ehcache.version>3.8.1</ehcache.version>
<guava.version>23.0</guava.version>
mosabua marked this conversation as resolved.
Show resolved Hide resolved
<guice.version>4.1.0</guice.version>
mosabua marked this conversation as resolved.
Show resolved Hide resolved
<jeasy.version>4.1.0</jeasy.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<slf4j.version>1.7.25</slf4j.version>
<lombok.version>1.18.22</lombok.version>
<testng.version>6.10</testng.version>
<mockwebserver.version>1.2.1</mockwebserver.version>
<mysqlconnector.version>8.0.17</mysqlconnector.version>
<reflections.version>0.9.10</reflections.version>
<slf4j.version>1.7.25</slf4j.version>
<testng.version>6.10</testng.version>

<!-- remove these when airbase is merged -->
<dep.plugin.surefire.version>3.1.2</dep.plugin.surefire.version>
<dep.junit.version>5.10.0</dep.junit.version>
<!---->

<maven.checkstyle.plugin.version>3.0.0</maven.checkstyle.plugin.version>
<puppycrawl.tools.checkstyle.version>7.7</puppycrawl.tools.checkstyle.version>
<checkstyle.violation.ignore>NonEmptyAtclauseDescription,JavadocMethod,AbbreviationAsWordInName,MemberName
</checkstyle.violation.ignore>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -114,43 +151,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Copy link
Member Author

@mosabua mosabua Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This is removed because we want to move to the Trino/Airlift style and validation anyway

<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven.checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.tools.checkstyle.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>google_checks.xml</configLocation>
<consoleOutput>true</consoleOutput>
<logViolationsToConsole>true</logViolationsToConsole>
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
<violationIgnore>${checkstyle.violation.ignore}</violationIgnore>
<violationSeverity>warning</violationSeverity>
<includeResources>false</includeResources>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<!--
Execute checkstyle after compilation but before tests.
This ensures that any parsing or type checking errors are from
javac, so they look as expected. Beyond that, we want to
fail as early as possible.
-->
<execution>
<phase>test-compile</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
7 changes: 1 addition & 6 deletions proxyserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@

<parent>
<groupId>io.trino.gateway</groupId>
<artifactId>trinogateway-parent</artifactId>
<artifactId>trino-gateway-parent</artifactId>
<version>3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>proxyserver</artifactId>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down