Skip to content

Inline dependency version #235

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
ebyhr merged 1 commit into from
Feb 6, 2024
Merged

Inline dependency version #235

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
27 changes: 17 additions & 10 deletions gateway-ha/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
<properties>
<environments>development</environments>
<app.main.class>io.trino.gateway.ha.HaGatewayLauncher</app.main.class>

<!-- dependency versions -->
<dep.activejdbc.version>2.3</dep.activejdbc.version>
<dep.jdbi.version>3.44.0</dep.jdbi.version>
<dep.jeasy.version>4.1.0</dep.jeasy.version>
<dep.mockito.version>5.8.0</dep.mockito.version>
<dep.mysqlconnector.version>8.0.33</dep.mysqlconnector.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -75,13 +82,13 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${dep.okhttp.version}</version>
<version>3.14.9</version>
</dependency>

<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>${dep.jakarta.mail.version}</version>
<version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
Expand Down Expand Up @@ -219,7 +226,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${dep.jakarta.annotations.version}</version>
<version>2.1.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -253,7 +260,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${dep.bouncycastle.version}</version>
<version>1.70</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -341,7 +348,7 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${dep.reflections.version}</version>
<version>0.9.10</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -365,7 +372,7 @@
<dependency>
<groupId>io.trino</groupId>
<artifactId>trino-jdbc</artifactId>
<version>${dep.trino.version}</version>
<version>433</version>
<scope>runtime</scope>
</dependency>

Expand All @@ -379,7 +386,7 @@
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${dep.ehcache.version}</version>
<version>3.8.1</version>
<scope>runtime</scope>
</dependency>

Expand All @@ -393,15 +400,15 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${dep.postgresql.version}</version>
<version>42.7.1</version>
<scope>runtime</scope>
</dependency>

<!-- Test deps -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${dep.h2.version}</version>
<version>1.4.192</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -471,7 +478,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>${dep.wiremock.version}</version>
<version>3.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
26 changes: 2 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,6 @@
<air.java.version>17</air.java.version>
<air.check.skip-spotbugs>true</air.check.skip-spotbugs>
<air.check.skip-pmd>true</air.check.skip-pmd>

<!-- dependency versions -->
Copy link
Copy Markdown
Member

@mosabua mosabua Feb 3, 2024

Choose a reason for hiding this comment

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

Some of these were needed as overrides since there were different versions coming in between dropwizard and airbase .. and now also airlift

Copy link
Copy Markdown
Member

@mosabua mosabua Feb 5, 2024

Choose a reason for hiding this comment

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

And we might have to check that our override works and potentially enforce via depMgt

Copy link
Copy Markdown
Contributor

@wendigo wendigo Feb 5, 2024

Choose a reason for hiding this comment

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

Airlift comes with latest :)

<dep.activejdbc.version>2.3</dep.activejdbc.version>
<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.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>
<dep.jdbi.version>3.44.0</dep.jdbi.version>
<dep.jeasy.version>4.1.0</dep.jeasy.version>
<dep.mockito.version>5.8.0</dep.mockito.version>
<dep.mysqlconnector.version>8.0.33</dep.mysqlconnector.version>
<dep.okhttp.version>3.14.9</dep.okhttp.version>
<dep.postgresql.version>42.7.1</dep.postgresql.version>
<dep.reflections.version>0.9.10</dep.reflections.version>
<dep.trino.version>433</dep.trino.version>
<dep.wiremock.version>3.3.1</dep.wiremock.version>

</properties>

<dependencyManagement>
Copy link
Copy Markdown
Member

@mosabua mosabua Feb 3, 2024

Choose a reason for hiding this comment

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

If we stick with one module .. we could get rid of dependency management altogether

Expand All @@ -81,7 +59,7 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-dependencies</artifactId>
<version>${dep.dropwizard.version}</version>
<version>4.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -103,7 +81,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${dep.apache.commons.version}</version>
<version>3.13.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down