Skip to content

Update airbase to 149 and airlift to 240 and enable more checks #224

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
mosabua merged 3 commits into from
Jan 31, 2024
Merged

Update airbase to 149 and airlift to 240 and enable more checks #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46dc6f6
Update airbase to 149 and airlift to 240
wendigo Jan 31, 2024
20efde8
Enable dependency and enforcer checks
wendigo Jan 31, 2024
a19649d
Remove duplicated resources and enable check
wendigo Jan 31, 2024
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
142 changes: 107 additions & 35 deletions gateway-ha/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,39 @@
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>${dep.jakarta.mail.version}</version>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>http-client</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-assets</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-auth</artifactId>
<exclusions>
<exclusion>
<!-- pulls in 2.0.1.MR -->
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -107,6 +125,17 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<exclusions>
<exclusion>
<!-- pulls in 2.0.1.MR -->
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -117,16 +146,43 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-jersey</artifactId>
<exclusions>
<exclusion>
<!-- pulls in 2.0.1.MR -->
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-jetty</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-lifecycle</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -137,18 +193,19 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-servlets</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-views</artifactId>
</dependency>

<dependency>
Comment thread
wendigo marked this conversation as resolved.
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-views-freemarker</artifactId>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
Expand All @@ -165,11 +222,6 @@
<version>${dep.jakarta.annotations.version}</version>
</dependency>

<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>

<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
Expand All @@ -180,11 +232,6 @@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
Expand All @@ -195,12 +242,12 @@
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.2</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${dep.bouncycastle.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -245,9 +292,8 @@
</dependency>

<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${dep.ehcache.version}</version>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-jakarta-servlet-api</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -280,23 +326,29 @@
<version>${dep.jeasy.version}</version>
</dependency>

<dependency>
Comment thread
wendigo marked this conversation as resolved.
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.5.1.Final</version>
</dependency>

<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${dep.reflections.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-views-freemarker</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Required for ClusterStatsJdbcMonitor -->
<dependency>
<groupId>io.trino</groupId>
Expand All @@ -312,6 +364,20 @@
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${dep.ehcache.version}</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.5.1.Final</version>
<scope>runtime</scope>
Comment thread
wendigo marked this conversation as resolved.
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down Expand Up @@ -340,6 +406,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
Expand Down
16 changes: 10 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>147</version>
<version>149</version>
</parent>

<groupId>io.trino.gateway</groupId>
Expand Down Expand Up @@ -42,9 +42,6 @@
<project.build.targetJdk>17</project.build.targetJdk>

<air.java.version>17</air.java.version>
<air.check.skip-enforcer>true</air.check.skip-enforcer>
<air.check.skip-dependency>true</air.check.skip-dependency>
<air.check.skip-duplicate-finder>true</air.check.skip-duplicate-finder>
<air.check.skip-spotbugs>true</air.check.skip-spotbugs>
<air.check.skip-pmd>true</air.check.skip-pmd>

Expand All @@ -53,8 +50,9 @@
<dep.apache.commons.version>3.13.0</dep.apache.commons.version>
<dep.apache.httpcomponents>4.5.13</dep.apache.httpcomponents>
<dep.bouncycastle.version>1.70</dep.bouncycastle.version>
<dep.dropwizard.version>4.0.5</dep.dropwizard.version>
<dep.dropwizard.version>4.0.6</dep.dropwizard.version>
<dep.ehcache.version>3.8.1</dep.ehcache.version>
<dep.errorprone.version>2.24.1</dep.errorprone.version>
<dep.h2.version>1.4.192</dep.h2.version>
<dep.jakarta.annotations.version>2.1.1</dep.jakarta.annotations.version>
<dep.jakarta.mail.version>2.0.0</dep.jakarta.mail.version>
Expand All @@ -75,7 +73,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>bom</artifactId>
<version>239</version>
<version>240</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -104,6 +102,12 @@
<scope>import</scope>
</dependency>

<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.2</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down