From c925d99a2d72b15d8392b58a947c7a361aac8f3a Mon Sep 17 00:00:00 2001 From: Honnix Date: Fri, 29 Sep 2023 12:18:50 +0200 Subject: [PATCH] Refactor pom (#253) Signed-off-by: Hongxin Liang --- .github/workflows/build.yaml | 5 +- .github/workflows/release.yaml | 3 +- flyteidl-protos/pom.xml | 47 +---- flytekit-api/pom.xml | 1 + flytekit-bom/pom.xml | 2 +- flytekit-examples-scala/pom.xml | 34 +++- flytekit-examples/pom.xml | 14 +- flytekit-jackson/pom.xml | 5 + flytekit-java/pom.xml | 9 +- .../flyte/localengine/LocalEngineTest.java | 2 + flytekit-scala-tests/pom.xml | 54 +++++- flytekit-scala_2.12/pom.xml | 55 ++++-- flytekit-scala_2.13/pom.xml | 46 +++-- integration-tests/pom.xml | 83 ++++----- jflyte-aws/pom.xml | 15 -- .../org/flyte/jflyte/aws/S3FileSystemIT.java | 5 +- jflyte-google-cloud/pom.xml | 27 +-- jflyte-utils/pom.xml | 24 --- jflyte/pom.xml | 38 ++-- pom.xml | 163 ++++++++++++++---- spotless.xmlformat.prefs | 7 - 21 files changed, 365 insertions(+), 274 deletions(-) delete mode 100644 spotless.xmlformat.prefs diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7f6aefd60..b66cef7a6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,7 +38,7 @@ jobs: - name: Verify with Maven if: ${{ github.ref != 'refs/heads/master' }} - run: mvn --batch-mode verify + run: mvn --batch-mode verify -Pci - name: Release snapshot with Maven if: ${{ github.ref == 'refs/heads/master' }} @@ -50,8 +50,9 @@ jobs: echo "test" | gpg --batch --clearsign --pinentry-mode loopback || true echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" - mvn --batch-mode deploy + mvn --batch-mode deploy -Pci env: + CI: true MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.SONATYPE_PASSPHRASE }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 17dae49c2..4eabc40bf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,9 +51,10 @@ jobs: mvn --batch-mode release:prepare -DgenerateBackupPoms=false echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" - mvn --batch-mode release:perform -Prelease + mvn --batch-mode release:perform -Prelease -Pci env: + CI: true MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.SONATYPE_PASSPHRASE }} diff --git a/flyteidl-protos/pom.xml b/flyteidl-protos/pom.xml index 4472a8b8d..93829461f 100644 --- a/flyteidl-protos/pom.xml +++ b/flyteidl-protos/pom.xml @@ -52,9 +52,8 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.6.1 - com.google.protobuf:protoc:3.21.1:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} true @@ -70,53 +69,11 @@ maven-compiler-plugin - 3.8.1 - 8 - 8 - true - true - true + false - - - false - utf-8 - - - -parameters - -Xlint:all - - -Xlint:-path - -Xlint:-processing - - -Xlint:-serial - -implicit:class - - -Xpkginfo:always - - - - com.google.auto.value - auto-value - ${auto-value.version} - - - com.google.auto.service - auto-service - ${auto-service.version} - - - com.google.errorprone - error_prone_core - ${error_prone.version} - - - - maven-jar-plugin - maven-dependency-plugin diff --git a/flytekit-api/pom.xml b/flytekit-api/pom.xml index 92e348ca1..38630c447 100644 --- a/flytekit-api/pom.xml +++ b/flytekit-api/pom.xml @@ -44,6 +44,7 @@ com.google.errorprone error_prone_annotations + provided diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml index 4e667c6f2..4008ddf45 100644 --- a/flytekit-bom/pom.xml +++ b/flytekit-bom/pom.xml @@ -107,7 +107,7 @@ org.flyte - flytekit-examples-scala + flytekit-examples-scala_2.13 ${project.version} diff --git a/flytekit-examples-scala/pom.xml b/flytekit-examples-scala/pom.xml index 4d12638c4..eecab605f 100644 --- a/flytekit-examples-scala/pom.xml +++ b/flytekit-examples-scala/pom.xml @@ -24,23 +24,47 @@ 0.4.25-SNAPSHOT - flytekit-examples-scala + flytekit-examples-scala_2.13 Flytekit Java Examples in Scala Examples of Tasks, Workflows and Launch plans written in Scala. - 2.13 - 2.13.10 - true + + + + org.scala-lang + scala-library + ${scala213.version} + + + org.scala-lang + scala-reflect + ${scala213.version} + + + + org.flyte - flytekit-scala_${scala.baseVersion} + flytekit-api + + + org.scala-lang + scala-library + + + org.scala-lang + scala-reflect + + + org.flyte + flytekit-scala_2.13 diff --git a/flytekit-examples/pom.xml b/flytekit-examples/pom.xml index 0e233ac21..2b9a1b563 100644 --- a/flytekit-examples/pom.xml +++ b/flytekit-examples/pom.xml @@ -55,6 +55,12 @@ auto-service-annotations provided + + com.google.errorprone + error_prone_annotations + provided + + org.junit.jupiter @@ -66,11 +72,6 @@ flytekit-testing test - - com.google.errorprone - error_prone_annotations - provided - @@ -100,9 +101,6 @@ - - maven-compiler-plugin - diff --git a/flytekit-jackson/pom.xml b/flytekit-jackson/pom.xml index 98ee3a80e..3bfb001ce 100644 --- a/flytekit-jackson/pom.xml +++ b/flytekit-jackson/pom.xml @@ -68,6 +68,11 @@ jsr305 provided + + com.google.errorprone + error_prone_annotations + provided + diff --git a/flytekit-java/pom.xml b/flytekit-java/pom.xml index 13dda4de4..bf3e8430b 100644 --- a/flytekit-java/pom.xml +++ b/flytekit-java/pom.xml @@ -29,10 +29,6 @@ Flytekit Java Classes used by developers to build Flyte's Tasks, Workflows and Launch plans. - - 2.13.10 - - @@ -82,17 +78,16 @@ mockito-junit-jupiter test - org.scala-lang scala-reflect - ${scala.version} + ${scala213.version} test org.scala-lang scala-library - ${scala.version} + ${scala213.version} test diff --git a/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java b/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java index b2814c814..7123b0a64 100644 --- a/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java +++ b/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java @@ -185,6 +185,7 @@ public void testStructWorkflow() { assertEquals(expectedOutput, outputs.get("outputStructData")); }*/ + @SuppressWarnings("LockOnNonEnclosingClassLiteral") @Test public void testRetryableTask_completed() { String workflowName = new RetryableWorkflow().getName(); @@ -221,6 +222,7 @@ public void testRetryableTask_completed() { } } + @SuppressWarnings("LockOnNonEnclosingClassLiteral") @Test public void testRetryableTask_failed() { WorkflowTemplate workflow = new RetryableWorkflow().toIdlTemplate(); diff --git a/flytekit-scala-tests/pom.xml b/flytekit-scala-tests/pom.xml index 2ad1db28d..9371a41f4 100644 --- a/flytekit-scala-tests/pom.xml +++ b/flytekit-scala-tests/pom.xml @@ -33,15 +33,42 @@ in the same module. - 2.13 - 2.13.10 - true + + + + org.scala-lang + scala-library + ${scala213.version} + + + org.scala-lang + scala-reflect + ${scala213.version} + + + + + + org.flyte + flytekit-api + test + + + org.scala-lang + scala-library + test + + + org.scala-lang + scala-reflect + test + org.flyte flytekit-examples @@ -49,7 +76,7 @@ org.flyte - flytekit-scala_${scala.baseVersion} + flytekit-scala_2.13 test @@ -81,10 +108,27 @@ testCompile + + attach-javadocs + + doc-jar + + + - maven-jar-plugin + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + none + + diff --git a/flytekit-scala_2.12/pom.xml b/flytekit-scala_2.12/pom.xml index b42dcb505..5ac90186a 100644 --- a/flytekit-scala_2.12/pom.xml +++ b/flytekit-scala_2.12/pom.xml @@ -32,15 +32,25 @@ Scala 2.12. - 2.12 - 2.12.11 - - 1.0.0-M4 - true + + + + org.scala-lang + scala-library + ${scala212.version} + + + org.scala-lang + scala-reflect + ${scala212.version} + + + + @@ -49,8 +59,7 @@ com.softwaremill.magnolia - magnolia-core_${scala.baseVersion} - ${magnolia.version} + magnolia-core_2.12 @@ -59,10 +68,14 @@ flytekit-api provided + + org.scala-lang + scala-library + provided + org.scala-lang scala-reflect - ${scala.version} provided @@ -74,7 +87,8 @@ scala-maven-plugin ../flytekit-scala_2.13/src/main/scala - ${scala.version} + ../flytekit-scala_2.13/src/test/scala + ${scala212.version} -language:experimental.macros @@ -84,19 +98,30 @@ compile testCompile + + + + attach-javadocs + doc-jar + - maven-jar-plugin - - - maven-source-plugin + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + none + + - ../flytekit-scala_2.13/src/main/scala - ../flytekit-scala_2.13/src/test/scala diff --git a/flytekit-scala_2.13/pom.xml b/flytekit-scala_2.13/pom.xml index 2531422e8..86c6a53bc 100644 --- a/flytekit-scala_2.13/pom.xml +++ b/flytekit-scala_2.13/pom.xml @@ -32,15 +32,25 @@ Scala 2.13. - 2.13 - 2.13.11 - - 1.0.0-M4 - true + + + + org.scala-lang + scala-reflect + ${scala213.version} + + + org.scala-lang + scala-library + ${scala213.version} + + + + @@ -49,8 +59,7 @@ com.softwaremill.magnolia - magnolia-core_${scala.baseVersion} - ${magnolia.version} + magnolia-core_2.13 @@ -62,13 +71,11 @@ org.scala-lang scala-reflect - ${scala.version} provided org.scala-lang scala-library - ${scala.version} provided @@ -88,16 +95,29 @@ compile testCompile + + + + attach-javadocs + doc-jar + - maven-jar-plugin - - - maven-source-plugin + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + none + + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index aa22da893..930386f3e 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -29,28 +29,6 @@ Flytekit Java - Integration tests Tests for Flytekit Java project. - - true - - - - - - org.testcontainers - testcontainers-bom - 1.15.3 - pom - import - - - - net.java.dev.jna - jna - 5.8.0 - - - - @@ -74,22 +52,16 @@ provided - + org.flyte flytekit-examples test - - org.flyte - flytekit-examples-scala - test - org.flyte jflyte test - true @@ -137,28 +109,37 @@ - - maven-compiler-plugin - - - maven-surefire-plugin - - - - test - - integration-test - - - none - - - **/*IT - - - - - + + + it + + true + + + + + maven-surefire-plugin + + + + test + + integration-test + + + none + + + **/*IT + + + + + + + + + diff --git a/jflyte-aws/pom.xml b/jflyte-aws/pom.xml index 36a314b4f..81d96a873 100644 --- a/jflyte-aws/pom.xml +++ b/jflyte-aws/pom.xml @@ -29,18 +29,6 @@ JFlyte - AWS Filesystem extension Stages jars in S3. - - - - org.testcontainers - testcontainers-bom - 1.14.3 - pom - import - - - - @@ -95,9 +83,6 @@ - - maven-jar-plugin - maven-dependency-plugin diff --git a/jflyte-aws/src/test/java/org/flyte/jflyte/aws/S3FileSystemIT.java b/jflyte-aws/src/test/java/org/flyte/jflyte/aws/S3FileSystemIT.java index 1b02d7b89..2e8300fff 100644 --- a/jflyte-aws/src/test/java/org/flyte/jflyte/aws/S3FileSystemIT.java +++ b/jflyte-aws/src/test/java/org/flyte/jflyte/aws/S3FileSystemIT.java @@ -36,12 +36,15 @@ import org.testcontainers.containers.localstack.LocalStackContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.utility.DockerImageName; @Testcontainers public class S3FileSystemIT { @Container - public final LocalStackContainer localStack = new LocalStackContainer().withServices(S3); + public final LocalStackContainer localStack = + new LocalStackContainer(DockerImageName.parse("localstack/localstack").withTag("0.11.2")) + .withServices(S3); private AmazonS3 s3; diff --git a/jflyte-google-cloud/pom.xml b/jflyte-google-cloud/pom.xml index 366abe9a1..9f0fa8aed 100644 --- a/jflyte-google-cloud/pom.xml +++ b/jflyte-google-cloud/pom.xml @@ -29,11 +29,6 @@ JFlyte - Gcloud Filesystem and IdToken extension Stages jars in GCS. - - 3.3.3 - 5.7.0 - - @@ -57,49 +52,43 @@ jsr305 provided + + com.google.errorprone + error_prone_annotations + provided + org.junit.jupiter - junit-jupiter-api - ${junit.version} + junit-jupiter test org.junit.jupiter junit-jupiter-params - ${junit.version} test org.hamcrest - hamcrest-core - 2.2 + hamcrest test org.mockito mockito-core - ${mockito.version} test org.mockito mockito-junit-jupiter - ${mockito.version} test - - com.google.errorprone - error_prone_annotations - + - - maven-jar-plugin - maven-dependency-plugin diff --git a/jflyte-utils/pom.xml b/jflyte-utils/pom.xml index dc927fa80..04431c57b 100644 --- a/jflyte-utils/pom.xml +++ b/jflyte-utils/pom.xml @@ -47,20 +47,6 @@ org.flyte jflyte-api - - org.flyte - jflyte-aws - - provided - - - org.flyte - jflyte-google-cloud - - provided - org.slf4j slf4j-api @@ -90,13 +76,6 @@ netty-tcnative-boringssl-static - - - org.slf4j - slf4j-simple - runtime - - com.google.auto.value @@ -171,9 +150,6 @@ - - maven-jar-plugin - maven-dependency-plugin diff --git a/jflyte/pom.xml b/jflyte/pom.xml index 2204c66e9..978ae26af 100644 --- a/jflyte/pom.xml +++ b/jflyte/pom.xml @@ -58,20 +58,6 @@ org.flyte jflyte-utils - - org.flyte - jflyte-aws - - provided - - - org.flyte - jflyte-google-cloud - - provided - org.slf4j slf4j-api @@ -109,6 +95,20 @@ + + org.flyte + jflyte-aws + + provided + + + org.flyte + jflyte-google-cloud + + provided + com.google.auto.value auto-value-annotations @@ -171,20 +171,10 @@ memoryfilesystem test - - - ch.qos.logback - logback-classic - test - - - maven-jar-plugin - maven-dependency-plugin diff --git a/pom.xml b/pom.xml index 8502c0bd2..3b18cbabf 100644 --- a/pom.xml +++ b/pom.xml @@ -85,8 +85,18 @@ - 1.0.1 - 1.10.1 + + 1.0.2 + 1.10.4 2.14.3 1.46.0 @@ -98,10 +108,8 @@ 2.21.0 spotbugs-exclude.xml - 2.19.1 - - 9+181-r4173-1 - 5.6.2 + 2.22.0 + 5.7.0 @@ -111,6 +119,9 @@ ${maven.compiler.release} ${maven.compiler.release} 3.3.3 + 2.12.17 + 2.13.10 + 1.0.0-M4 @@ -163,7 +174,7 @@ org.flyte - flytekit-examples-scala + flytekit-examples-scala_2.13 ${project.version} @@ -200,7 +211,7 @@ com.google.guava guava - 31.1-jre + 32.1.2-jre io.grpc @@ -224,6 +235,11 @@ error_prone_annotations ${error_prone.version} + + com.google.j2objc + j2objc-annotations + 2.8 + org.slf4j slf4j-api @@ -254,11 +270,21 @@ auto-value-annotations ${auto-value.version} + + com.google.auto.value + auto-value + ${auto-value.version} + com.google.auto.service auto-service-annotations ${auto-service.version} + + com.google.auto.service + auto-service + ${auto-service.version} + info.picocli picocli @@ -269,6 +295,11 @@ junit-jupiter ${junit.version} + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + org.junit.vintage junit-vintage-engine @@ -315,6 +346,36 @@ javax.annotation-api 1.3.2 + + com.google.errorprone + error_prone_annotation + ${error_prone.version} + + + com.google.errorprone + error_prone_core + ${error_prone.version} + + + com.softwaremill.magnolia + magnolia-core_2.12 + ${magnolia.version} + + + com.softwaremill.magnolia + magnolia-core_2.13 + ${magnolia.version} + + + org.checkerframework + checker-qual + 3.33.0 + + + net.java.dev.jna + jna + 5.8.0 + com.fasterxml.jackson jackson-bom @@ -336,6 +397,13 @@ pom import + + org.testcontainers + testcontainers-bom + 1.15.3 + pom + import + @@ -366,7 +434,7 @@ maven-compiler-plugin - 3.8.1 + 3.11.0 true true @@ -543,8 +611,10 @@ maven-javadoc-plugin - 3.2.0 + 3.3.1 + 8 + all,-missing private utf-8 @@ -778,7 +897,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -788,23 +906,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.1 - - 8 - all,-missing - - - - attach-javadocs - - jar - - - - org.sonatype.plugins nexus-staging-maven-plugin diff --git a/spotless.xmlformat.prefs b/spotless.xmlformat.prefs deleted file mode 100644 index dfb77de08..000000000 --- a/spotless.xmlformat.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -indentationChar=space -indentationSize=2 -lineWidth=100 -formatCommentJoinLines=False -preserveCDATAContent=True -formatCommentText=False