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

Various code and POM cleanups #17493

Merged
merged 5 commits into from
May 16, 2023
Merged

Various code and POM cleanups #17493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b84a29
Call simpler version of file create method
electrum May 13, 2023
d6a43ee
Add missing plugin groupId declaration
electrum May 14, 2023
52fa5e3
Remove unused duplicate-finder exclusions
electrum May 14, 2023
fb25794
Move duplicate-finder exclusion to root POM
electrum May 14, 2023
14b6991
Update AWS SDK v2 to 2.20.65 and move to root POM
electrum Feb 28, 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
1 change: 1 addition & 0 deletions plugin/trino-accumulo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
electrum marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Expand Down
1 change: 0 additions & 1 deletion plugin/trino-bigquery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,6 @@
<configuration>
<ignoredResourcePatterns>
<ignoredResourcePattern>arrow-git.properties</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down
13 changes: 1 addition & 12 deletions plugin/trino-delta-lake/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,18 +442,7 @@
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
<ignoredResourcePattern>mime.types</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredNonTestScopedDependencies>
Expand Down
8 changes: 0 additions & 8 deletions plugin/trino-exchange-filesystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<awsjavasdk.version>2.20.48</awsjavasdk.version>
<azurejavasdk.version>1.2.11</azurejavasdk.version>
</properties>

Expand All @@ -27,13 +26,6 @@
<version>${azurejavasdk.version}</version>
<scope>import</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<type>pom</type>
<version>${awsjavasdk.version}</version>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 0 additions & 12 deletions plugin/trino-hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,18 +513,6 @@
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
<ignoredResourcePattern>mime.types</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
3 changes: 1 addition & 2 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Iterables.getOnlyElement;
import static io.trino.hdfs.ConfigurationUtils.toJobConf;
import static io.trino.memory.context.AggregatedMemoryContext.newSimpleAggregatedMemoryContext;
import static io.trino.plugin.hive.HiveAnalyzeProperties.getColumnNames;
import static io.trino.plugin.hive.HiveAnalyzeProperties.getPartitionList;
import static io.trino.plugin.hive.HiveApplyProjectionUtil.extractSupportedProjectedColumns;
Expand Down Expand Up @@ -1910,7 +1909,7 @@ private void createEmptyFiles(ConnectorSession session, Path path, Table table,
TrinoOutputFile trinoOutputFile = fileSystem.newOutputFile(Location.of(path.toString()).appendPath(fileName));
try {
// create empty file
trinoOutputFile.create(newSimpleAggregatedMemoryContext()).close();
trinoOutputFile.create().close();
}
catch (IOException e) {
throw new TrinoException(HIVE_WRITER_CLOSE_ERROR, "Error write empty file to Hive", e);
Expand Down
3 changes: 0 additions & 3 deletions plugin/trino-hudi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,6 @@
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
<ignoredResourcePattern>mime.types</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<!-- org.apache.hudi:hudi-client-common and org.apache.hudi:hudi-java-client log4j.properties duplicates -->
<ignoredResourcePattern>log4j.properties</ignoredResourcePattern>
<ignoredResourcePattern>log4j-surefire.properties</ignoredResourcePattern>
Expand Down
5 changes: 0 additions & 5 deletions plugin/trino-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,13 +529,8 @@
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
<ignoredResourcePattern>mime.types</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
<ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down
1 change: 0 additions & 1 deletion plugin/trino-phoenix5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@
<configuration>
<ignoredResourcePatterns>
<ignoredResourcePattern>mrapp-generated-classpath</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<!-- org.apache.commons:commons-math3 french localization file duplicate-->
<ignoredResourcePattern>assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties</ignoredResourcePattern>
<!-- io.airlift:joni and phoenix-client's org.jruby.joni:joni resource duplicates-->
Expand Down
24 changes: 24 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<dep.avro.version>1.11.1</dep.avro.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.aws-sdk.version>1.12.464</dep.aws-sdk.version>
<dep.aws-sdk-v2.version>2.20.65</dep.aws-sdk-v2.version>
<dep.jsonwebtoken.version>0.11.5</dep.jsonwebtoken.version>
<dep.oracle.version>21.9.0.0</dep.oracle.version>
<dep.drift.version>1.14</dep.drift.version>
Expand Down Expand Up @@ -1907,6 +1908,14 @@
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<type>pom</type>
<version>${dep.aws-sdk-v2.version}</version>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -2104,6 +2113,21 @@
<resource>dependencies.properties</resource>
</resources>
</exception>
<exception>
<conflictingDependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sdk-core</artifactId>
</dependency>
</conflictingDependencies>
<resources>
<resource>mime.types</resource>
</resources>
</exception>
</exceptions>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions testing/trino-benchto-benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<plugins>
<!-- Build archive files -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
Expand Down
5 changes: 0 additions & 5 deletions testing/trino-faulttolerant-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,8 @@
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
<ignoredResourcePattern>mime.types</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
<ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down
5 changes: 0 additions & 5 deletions testing/trino-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,8 @@
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredResourcePatterns>
<!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
<ignoredResourcePattern>mime.types</ignoredResourcePattern>
<ignoredResourcePattern>about.html</ignoredResourcePattern>
<ignoredResourcePattern>iceberg-build.properties</ignoredResourcePattern>
<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
<!-- TODO: To be removed https://github.com/trinodb/trino/issues/15371 -->
<ignoredResourcePattern>google/protobuf/.*\.proto$</ignoredResourcePattern>
</ignoredResourcePatterns>
</configuration>
</plugin>
Expand Down