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

Unignore re2j dependency conflicts #20244

Merged
merged 6 commits into from
Dec 30, 2023
Merged

Unignore re2j dependency conflicts #20244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f6f95d
Unignore re2j dependency conflicts
findepi Dec 29, 2023
eca0daf
Prune dependency management for alluxio-shaded-client
findepi Dec 29, 2023
47cc3c9
Put related modernizer exclusions together
findepi Dec 29, 2023
ad0a2fe
Remove unused test helper method
findepi Dec 29, 2023
128240e
empty: roll the dice 🎲
findepi Dec 29, 2023
c77efcb
empty: roll the dice 🎲
findepi Dec 30, 2023
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
12 changes: 12 additions & 0 deletions client/trino-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@
<groupId>io.trino</groupId>
<artifactId>trino-main</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -237,6 +243,12 @@
<groupId>io.trino</groupId>
<artifactId>trino-testing</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
2 changes: 0 additions & 2 deletions client/trino-jdbc/src/test/java/io/trino/jdbc/BaseTestJdbcResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ public abstract class BaseTestJdbcResultSet
protected abstract Connection createConnection()
throws SQLException;

protected abstract int getTestedServerVersion();

@Test
public void testDuplicateColumnLabels()
throws Exception
Expand Down
7 changes: 0 additions & 7 deletions client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,4 @@ protected Connection createConnection()
String url = format("jdbc:trino://%s", server.getAddress());
return DriverManager.getConnection(url, "test", null);
}

@Override
protected int getTestedServerVersion()
{
// Latest version
return Integer.MAX_VALUE;
}
}
12 changes: 12 additions & 0 deletions plugin/trino-geospatial/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,25 @@
<groupId>io.trino</groupId>
<artifactId>trino-main</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.trino</groupId>
<artifactId>trino-main</artifactId>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
12 changes: 12 additions & 0 deletions plugin/trino-hudi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,25 @@
<groupId>io.trino</groupId>
<artifactId>trino-main</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.trino</groupId>
<artifactId>trino-main</artifactId>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
12 changes: 12 additions & 0 deletions plugin/trino-session-property-managers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,24 @@
<groupId>io.trino</groupId>
<artifactId>trino-main</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.trino</groupId>
<artifactId>trino-testing</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
100 changes: 1 addition & 99 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1645,30 +1645,6 @@
<version>2.3</version>
</dependency>

<dependency>
<groupId>org.alluxio</groupId>
<artifactId>alluxio-shaded-client</artifactId>
<version>2.9.3</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
Expand Down Expand Up @@ -2206,6 +2182,7 @@
<exclusions>
<!-- getOnlyElement is more readable than the stream analogue -->
<exclusion>com/google/common/collect/Iterables.getOnlyElement:(Ljava/lang/Iterable;)Ljava/lang/Object;</exclusion>
<exclusion>com/google/common/collect/Iterables.getOnlyElement:(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;</exclusion>
<!-- getLast has lower complexity for array based lists than the stream analogue (O(1) vs O(log(N)) -->
<exclusion>com/google/common/collect/Iterables.getLast:(Ljava/lang/Iterable;)Ljava/lang/Object;</exclusion>
<exclusion>com/google/common/collect/Iterables.getLast:(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;</exclusion>
Expand All @@ -2226,7 +2203,6 @@
<exclusion>com/google/common/collect/Iterables.getLast:(Ljava/lang/Iterable;)Ljava/lang/Object;</exclusion>
<exclusion>com/google/common/collect/Iterables.cycle:(Ljava/lang/Iterable;)Ljava/lang/Iterable;</exclusion>
<exclusion>com/google/common/collect/Iterables.cycle:([Ljava/lang/Object;)Ljava/lang/Iterable;</exclusion>
<exclusion>com/google/common/collect/Iterables.getOnlyElement:(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object;</exclusion>
<!-- com.google.common.io.BaseEncoding.base64 provides more reach interfaces than java.util.Base64 -->
<exclusion>com/google/common/io/BaseEncoding.base64:()Lcom/google/common/io/BaseEncoding;</exclusion>

Expand Down Expand Up @@ -2400,80 +2376,6 @@
<resource>opencensus/proto/trace/v1/trace_config.proto</resource>
</resources>
</exception>
<exception>
<conflictingDependencies>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
</dependency>
<dependency>
<groupId>org.alluxio</groupId>
<artifactId>alluxio-shaded-client</artifactId>
</dependency>
</conflictingDependencies>
<resources>
<resource>grpc/binlog/v1/binarylog.proto</resource>
<resource>grpc/health/v1/health.proto</resource>
<resource>grpc/reflection/v1alpha/reflection.proto</resource>
<resource>grpc/channelz/v1/channelz.proto</resource>
</resources>
</exception>
<exception>
<conflictingDependencies>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>org.alluxio</groupId>
<artifactId>alluxio-shaded-client</artifactId>
</dependency>
</conflictingDependencies>
<classes>
<class>android.annotation.SuppressLint</class>
<class>android.annotation.TargetApi</class>
</classes>
</exception>
<exception>
<conflictingDependencies>
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
</dependency>
<dependency>
<groupId>io.trino</groupId>
<artifactId>re2j</artifactId>
</dependency>
</conflictingDependencies>
<packages>
<package>com.google.re2j</package>
</packages>
</exception>
Comment on lines -2437 to -2451
Copy link
Member Author

Choose a reason for hiding this comment

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

Main change. You can start reviewing from here.

<exception>
<conflictingDependencies>
<dependency>
<groupId>org.alluxio</groupId>
<artifactId>alluxio-shaded-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
</conflictingDependencies>
<resources>
<resource>google/protobuf/any.proto</resource>
<resource>google/protobuf/api.proto</resource>
<resource>google/protobuf/descriptor.proto</resource>
<resource>google/protobuf/duration.proto</resource>
<resource>google/protobuf/empty.proto</resource>
<resource>google/protobuf/field_mask.proto</resource>
<resource>google/protobuf/source_context.proto</resource>
<resource>google/protobuf/struct.proto</resource>
<resource>google/protobuf/timestamp.proto</resource>
<resource>google/protobuf/type.proto</resource>
<resource>google/protobuf/wrappers.proto</resource>
</resources>
</exception>
</exceptions>
</configuration>
</plugin>
Expand Down
6 changes: 0 additions & 6 deletions ...patibility-old-server/src/test/java/io/trino/TestJdbcResultSetCompatibilityOldServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,6 @@ protected Connection createConnection()
return DriverManager.getConnection(trinoContainer.getJdbcUrl(), "test", null);
}

@Override
protected int getTestedServerVersion()
{
return parseInt(getTestedTrinoVersion());
}

@Override
public String toString()
{
Expand Down
Loading