diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 317a7d23af8..bca31f55e75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,7 +98,7 @@ jobs: if: always() - name: Create artifacts and push run: | - mvn verify -PtemplatesRelease,splunkDeps,missing-artifact-repos \ + mvn verify -PtemplatesRelease \ -DprojectId="dataflow-templates" \ -DbucketName="dataflow-templates-staging" \ -DlibrariesBucketName="dataflow-templates-libraries" \ diff --git a/cicd/internal/workflows/maven-workflows.go b/cicd/internal/workflows/maven-workflows.go index 2eabf31f8cd..f786eacb43c 100644 --- a/cicd/internal/workflows/maven-workflows.go +++ b/cicd/internal/workflows/maven-workflows.go @@ -106,15 +106,15 @@ func (*mvnFlags) FailAtTheEnd() string { } func (*mvnFlags) RunIntegrationTests() string { - return "-PtemplatesIntegrationTests,splunkDeps,missing-artifact-repos" + return "-PtemplatesIntegrationTests" } func (*mvnFlags) RunIntegrationSmokeTests() string { - return "-PtemplatesIntegrationSmokeTests,splunkDeps,missing-artifact-repos" + return "-PtemplatesIntegrationSmokeTests" } func (*mvnFlags) RunLoadTests() string { - return "-PtemplatesLoadTests,splunkDeps,missing-artifact-repos" + return "-PtemplatesLoadTests" } // The number of modules Maven is going to build in parallel in a multi-module project. diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java index 1e56a5b211d..d51d428c1ac 100644 --- a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java +++ b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java @@ -393,7 +393,7 @@ private String[] buildMavenStageCommand( "-pl", moduleBuild, "-am", - "-PtemplatesStage,pluginOutputDir,splunkDeps,missing-artifact-repos", + "-PtemplatesStage,pluginOutputDir", "-DpluginRunId=" + RandomStringUtils.randomAlphanumeric(16), // Skip shading for now due to flakiness / slowness in the process. "-DskipShade=" + skipShade, diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManager.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManager.java index 204692415cf..3c15c850950 100644 --- a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManager.java +++ b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManager.java @@ -218,7 +218,7 @@ String[] buildMavenStageCommand( "-pl", moduleBuild, "-am", - "-PtemplatesStage,pluginOutputDir,splunkDeps,missing-artifact-repos", + "-PtemplatesStage,pluginOutputDir", // Skip shading for now due to flakiness / slowness in the process. "-DskipShade=" + true, "-DskipTests", diff --git a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManagerTest.java b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManagerTest.java index 3fbc2eefc2a..210192c11b5 100644 --- a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManagerTest.java +++ b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateDataflowJobResourceManagerTest.java @@ -49,7 +49,7 @@ public void testBuildMavenStageCommand() { assertThat(String.join(" ", Arrays.copyOfRange(actual, 0, 5))) .isEqualTo("mvn compile package -q -f"); String expected = - "-pl metadata,v2/common,v2/spanner-change-streams-to-sharded-file-sink -am -PtemplatesStage,pluginOutputDir,splunkDeps,missing-artifact-repos -DskipShade=true -DskipTests -Dmaven.test.skip -Dcheckstyle.skip -Dmdep.analyze.skip -Dspotless.check.skip -Denforcer.skip -DprojectId=testProject -Dregion=us-central1 -DbucketName=TestBucketName -DgcpTempLocation=TestBucketName -DstagePrefix=TestClassName -DtemplateName=Spanner_Change_Streams_to_Sharded_File_Sink -DunifiedWorker=true -e"; + "-pl metadata,v2/common,v2/spanner-change-streams-to-sharded-file-sink -am -PtemplatesStage,pluginOutputDir -DskipShade=true -DskipTests -Dmaven.test.skip -Dcheckstyle.skip -Dmdep.analyze.skip -Dspotless.check.skip -Denforcer.skip -DprojectId=testProject -Dregion=us-central1 -DbucketName=TestBucketName -DgcpTempLocation=TestBucketName -DstagePrefix=TestClassName -DtemplateName=Spanner_Change_Streams_to_Sharded_File_Sink -DunifiedWorker=true -e"; assertThat(String.join(" ", Arrays.copyOfRange(actual, 6, 25))).isEqualTo(expected); assertThat(actual[5]).endsWith("pom.xml"); assertThat(actual[25]).isNotEmpty(); diff --git a/pom.xml b/pom.xml index 4102c6bf86f..9968b75d843 100644 --- a/pom.xml +++ b/pom.xml @@ -392,6 +392,13 @@ + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.0 + + @@ -600,10 +607,37 @@ + + internalMaven + + false + + + + central + Maven Central remote repository + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p + default + + true + + + true + + + + internal-maven + Internal Maven Release + file://${rootDir}/../../../maven/repository/central/ + + + splunkDeps - true + + !skipSplunkDeps + @@ -623,6 +657,21 @@ + + confluentDeps + + + !skipConfluentDeps + + + + + + confluent + https://packages.confluent.io/maven/ + + + release diff --git a/v1/pom.xml b/v1/pom.xml index 582cee14d3e..9ed8fbb5b92 100644 --- a/v1/pom.xml +++ b/v1/pom.xml @@ -948,19 +948,6 @@ - - missing-artifact-repos - - true - - - - - confluent - https://packages.confluent.io/maven/ - - - shade diff --git a/v2/pom.xml b/v2/pom.xml index c02146e1e29..b8001738fe7 100644 --- a/v2/pom.xml +++ b/v2/pom.xml @@ -467,19 +467,6 @@ - - missing-artifact-repos - - true - - - - - confluent - https://packages.confluent.io/maven/ - - - shade