Skip to content

Commit

Permalink
[#738]:Dependencies follow alphabetical order (#1703)
Browse files Browse the repository at this point in the history
<!--
1. Title: [#<issue>] <type>(<scope>): <subject>
   Examples:
     - "[#123] feat(operator): support xxx"
     - "[#233] fix: check null before access result in xxx"
     - "[MINOR] refactor: fix typo in variable name"
     - "[MINOR] docs: fix typo in README"
     - "[#255] test: fix flaky test NameOfTheTest"
   Reference: https://www.conventionalcommits.org/en/v1.0.0/
2. If the PR is unfinished, please mark this PR as draft.
-->

### What changes were proposed in this pull request?

Dependencies follow alphabetical order

### Why are the changes needed?
For better readability
Fix: #738 
### Does this PR introduce _any_ user-facing change?
N/A
### How was this patch tested?

N/A

---------

Co-authored-by: Qi Yu <yuqi@datastrato.com>
  • Loading branch information
hiirrxnn and yuqi1129 authored Feb 11, 2024
1 parent f589177 commit fbcd416
Show file tree
Hide file tree
Showing 14 changed files with 170 additions and 171 deletions.
3 changes: 1 addition & 2 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ plugins {
}

dependencies {
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.slf4j.api)
implementation(libs.commons.lang3)

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)

testRuntimeOnly(libs.junit.jupiter.engine)
}

Expand Down
8 changes: 4 additions & 4 deletions catalogs/bundled-catalog/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ plugins {
}

dependencies {
implementation(project(":core"))
implementation(project(":catalogs:catalog-hive"))
implementation(project(":catalogs:catalog-lakehouse-iceberg"))
implementation(project(":catalogs:catalog-jdbc-common"))
implementation(project(":catalogs:catalog-jdbc-mysql"))
implementation(project(":catalogs:catalog-jdbc-postgresql"))
implementation(project(":catalogs:catalog-jdbc-common"))
implementation(project(":catalogs:catalog-lakehouse-iceberg"))
implementation(project(":core"))
implementation(libs.slf4j.api)
}

Expand All @@ -26,8 +26,8 @@ tasks.withType<ShadowJar>(ShadowJar::class.java) {
archiveClassifier.set("")

dependencies {
exclude("org.*")
exclude("javax.*")
exclude("org.*")
}

exclude("**/package-info.class")
Expand Down
2 changes: 1 addition & 1 deletion catalogs/catalog-hadoop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ dependencies {
implementation(project(":core"))
implementation(project(":common"))

implementation(libs.slf4j.api)
implementation(libs.guava)
implementation(libs.hadoop2.common)
implementation(libs.hadoop2.hdfs)
implementation(libs.slf4j.api)

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
Expand Down
53 changes: 26 additions & 27 deletions catalogs/catalog-hive/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,64 +14,63 @@ dependencies {
implementation(project(":api"))
implementation(project(":core"))

compileOnly(libs.immutables.value)
compileOnly(libs.lombok)
annotationProcessor(libs.lombok)

compileOnly(libs.immutables.value)
annotationProcessor(libs.immutables.value)
annotationProcessor(libs.lombok)

implementation(libs.hive2.metastore) {
exclude("org.apache.hbase")
exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager")
exclude("co.cask.tephra")
exclude("org.apache.avro")
exclude("org.apache.zookeeper")
exclude("org.apache.logging.log4j")
exclude("com.github.joshelser")
exclude("com.google.code.findbugs", "jsr305")
exclude("com.google.code.findbugs", "sr305")
exclude("org.eclipse.jetty.aggregate", "jetty-all")
exclude("org.eclipse.jetty.orbit", "javax.servlet")
exclude("org.apache.parquet", "parquet-hadoop-bundle")
exclude("com.tdunning", "json")
exclude("javax.transaction", "transaction-api")
exclude("com.zaxxer", "HikariCP")
exclude("com.google.code.findbugs", "jsr305")
exclude("org.apache.curator")
exclude("com.github.joshelser")
exclude("io.dropwizard.metricss")
exclude("org.slf4j")
exclude("javax.transaction", "transaction-api")
exclude("org.apache.avro")
exclude("org.apache.curator")
exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager")
exclude("org.apache.hbase")
exclude("org.apache.logging.log4j")
exclude("org.apache.parquet", "parquet-hadoop-bundle")
exclude("org.apache.zookeeper")
exclude("org.eclipse.jetty.aggregate", "jetty-all")
exclude("org.eclipse.jetty.orbit", "javax.servlet")
exclude("org.openjdk.jol")
exclude("org.slf4j")
}

implementation(libs.hive2.exec) {
artifact {
classifier = "core"
}
exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager")
exclude("org.apache.avro")
exclude("org.apache.zookeeper")
exclude("com.google.code.findbugs", "jsr305")
exclude("com.google.protobuf")
exclude("org.apache.avro")
exclude("org.apache.calcite")
exclude("org.apache.calcite.avatica")
exclude("org.apache.curator")
exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager")
exclude("org.apache.logging.log4j")
exclude("org.apache.zookeeper")
exclude("org.eclipse.jetty.aggregate", "jetty-all")
exclude("org.eclipse.jetty.orbit", "javax.servlet")
exclude("com.google.code.findbugs", "jsr305")
exclude("org.apache.logging.log4j")
exclude("org.apache.curator")
exclude("org.openjdk.jol")
exclude("org.pentaho")
exclude("org.slf4j")
exclude("org.openjdk.jol")
}

implementation(libs.hadoop2.mapreduce.client.core) {
implementation(libs.caffeine)
implementation(libs.guava)
implementation(libs.hadoop2.common) {
exclude("*")
}
implementation(libs.hadoop2.common) {
implementation(libs.hadoop2.mapreduce.client.core) {
exclude("*")
}

implementation(libs.slf4j.api)
implementation(libs.guava)
implementation(libs.caffeine)

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.mockito.core)
Expand Down
17 changes: 9 additions & 8 deletions catalogs/catalog-jdbc-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,24 @@ plugins {
}

dependencies {
implementation(project(":api"))
implementation(project(":common"))
implementation(project(":core"))
implementation(project(":api"))
implementation(libs.jackson.databind)
implementation(libs.jackson.annotations)
implementation(libs.jackson.datatype.jdk8)
implementation(libs.jackson.datatype.jsr310)
implementation(libs.guava)

implementation(libs.bundles.log4j)
implementation(libs.commons.lang3)
implementation(libs.commons.collections4)
implementation(libs.commons.dbcp2)
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.jackson.annotations)
implementation(libs.jackson.databind)
implementation(libs.jackson.datatype.jdk8)
implementation(libs.jackson.datatype.jsr310)

testImplementation(libs.commons.io)
testImplementation(libs.sqlite.jdbc)
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.sqlite.jdbc)

testRuntimeOnly(libs.junit.jupiter.engine)
compileOnly(libs.lombok)
Expand Down
8 changes: 4 additions & 4 deletions catalogs/catalog-jdbc-mysql/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ plugins {
}

dependencies {
implementation(project(":common"))
implementation(project(":core"))
implementation(project(":api"))
implementation(project(":catalogs:catalog-jdbc-common"))
implementation(libs.guava)
implementation(project(":common"))
implementation(project(":core"))
implementation(libs.bundles.log4j)
implementation(libs.commons.lang3)
implementation(libs.commons.collections4)
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.jsqlparser)

testImplementation(project(":catalogs:catalog-jdbc-common"))
Expand Down
9 changes: 5 additions & 4 deletions catalogs/catalog-jdbc-postgresql/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ plugins {
}

dependencies {
implementation(project(":common"))
implementation(project(":core"))

implementation(project(":api"))
implementation(project(":catalogs:catalog-jdbc-common"))
implementation(libs.guava)
implementation(project(":common"))
implementation(project(":core"))
implementation(libs.bundles.log4j)
implementation(libs.commons.lang3)
implementation(libs.commons.collections4)
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.jsqlparser)

testImplementation(project(":catalogs:catalog-jdbc-common"))
Expand Down
63 changes: 31 additions & 32 deletions catalogs/catalog-lakehouse-iceberg/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,68 +11,67 @@ plugins {
}

dependencies {
implementation(project(":api"))
implementation(project(":common"))
implementation(project(":core"))
implementation(project(":api"))
implementation(project(":server-common"))
implementation(libs.jackson.databind)
implementation(libs.jackson.annotations)
implementation(libs.jackson.datatype.jdk8)
implementation(libs.jackson.datatype.jsr310)
implementation(libs.guava)
implementation(libs.commons.lang3)
implementation(libs.bundles.log4j)
implementation(libs.bundles.iceberg)
implementation(libs.bundles.jetty)
implementation(libs.bundles.jersey)
implementation(libs.bundles.iceberg)
implementation(libs.commons.lang3)
implementation(libs.commons.io)
implementation(libs.bundles.log4j)
implementation(libs.commons.collections4)
implementation(libs.commons.io)
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.iceberg.hive.metastore)
implementation(libs.jackson.annotations)
implementation(libs.jackson.databind)
implementation(libs.jackson.datatype.jdk8)
implementation(libs.jackson.datatype.jsr310)
implementation(libs.sqlite.jdbc)

implementation(libs.hive2.metastore) {
exclude("org.apache.avro", "avro")
exclude("org.slf4j", "slf4j-log4j12")
exclude("org.pentaho") // missing dependency
exclude("org.apache.hbase")
exclude("org.apache.logging.log4j")
exclude("co.cask.tephra")
exclude("com.github.spotbugs")
exclude("com.google.code.findbugs", "jsr305")
exclude("org.eclipse.jetty.aggregate", "jetty-all")
exclude("org.eclipse.jetty.orbit", "javax.servlet")
exclude("org.apache.parquet", "parquet-hadoop-bundle")
exclude("com.tdunning", "json")
exclude("javax.transaction", "transaction-api")
exclude("com.zaxxer", "HikariCP")
exclude("org.apache.zookeeper")
exclude("org.apache.hadoop", "hadoop-yarn-server-common")
exclude("org.apache.hadoop", "hadoop-yarn-server-applicationhistoryservice")
exclude("org.apache.hadoop", "hadoop-yarn-server-web-proxy")
exclude("org.apache.avro", "avro")
exclude("org.apache.hbase")
exclude("org.apache.hadoop", "hadoop-yarn-api")
exclude("org.apache.hadoop", "hadoop-yarn-server-applicationhistoryservice")
exclude("org.apache.hadoop", "hadoop-yarn-server-common")
exclude("org.apache.hadoop", "hadoop-yarn-server-resourcemanager")
exclude("com.github.spotbugs")
exclude("org.apache.hadoop", "hadoop-yarn-server-web-proxy")
exclude("org.apache.logging.log4j")
exclude("org.apache.parquet", "parquet-hadoop-bundle")
exclude("org.apache.zookeeper")
exclude("org.eclipse.jetty.aggregate", "jetty-all")
exclude("org.eclipse.jetty.orbit", "javax.servlet")
exclude("org.pentaho") // missing dependency
exclude("org.slf4j", "slf4j-log4j12")
exclude("com.zaxxer", "HikariCP")
}

implementation(libs.hadoop2.hdfs)
annotationProcessor(libs.lombok)
compileOnly(libs.lombok)

implementation(libs.hadoop2.common) {
exclude("com.github.spotbugs")
}
implementation(libs.hadoop2.hdfs)
implementation(libs.hadoop2.mapreduce.client.core)
implementation(libs.metrics.jersey2)

compileOnly(libs.lombok)
annotationProcessor(libs.lombok)

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mockito.core)
testImplementation(libs.jersey.test.framework.core) {
exclude(group = "org.junit.jupiter")
}
testImplementation(libs.jersey.test.framework.provider.jetty) {
exclude(group = "org.junit.jupiter")
}
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testImplementation(libs.mockito.core)

testRuntimeOnly(libs.junit.jupiter.engine)
}
Expand Down
14 changes: 7 additions & 7 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ plugins {
dependencies {
implementation(project(":api"))

implementation(libs.jackson.databind)
implementation(libs.bundles.log4j)
implementation(libs.commons.collections4)
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.jackson.annotations)
implementation(libs.jackson.datatype.jdk8)
implementation(libs.jackson.datatype.jsr310)
implementation(libs.guava)
implementation(libs.bundles.log4j)
implementation(libs.commons.lang3)
implementation(libs.commons.collections4)
implementation(libs.jackson.databind)
implementation(libs.protobuf.java)

compileOnly(libs.lombok)
annotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)
compileOnly(libs.lombok)
testAnnotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
Expand Down
23 changes: 12 additions & 11 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,26 @@ plugins {

dependencies {
implementation(project(":api"))
implementation(project(":meta"))
implementation(project(":common"))
implementation(project(":meta"))
implementation(libs.bundles.log4j)
implementation(libs.bundles.metrics)
implementation(libs.bundles.prometheus)
implementation(libs.caffeine)
implementation(libs.commons.io)
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.protobuf.java.util) {
exclude("com.google.guava", "guava")
.because("Brings in Guava for Andriod, which we don't want (and breaks multimaps).")
.because("Brings in Guava for Android, which we don't want (and breaks multimaps).")
}
implementation(libs.guava)
implementation(libs.bundles.log4j)
implementation(libs.commons.lang3)
implementation(libs.commons.io)
implementation(libs.caffeine)
implementation(libs.rocksdbjni)
implementation(libs.bundles.metrics)
implementation(libs.bundles.prometheus)

compileOnly(libs.lombok)
annotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)
compileOnly(libs.lombok)

testAnnotationProcessor(libs.lombok)
testCompileOnly(libs.lombok)

testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
Expand Down
Loading

0 comments on commit fbcd416

Please sign in to comment.