From 3ceec5a63fb583c326dcd2d28816dd5f429a96a5 Mon Sep 17 00:00:00 2001 From: Jeff Registre <8570494+jregistr@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:30:14 -0500 Subject: [PATCH] Use Multi project pom.xml (#61) * Add a parent pom.xml for shared dependencies. --- .github/workflows/verify.yml | 5 +- aws-qbusiness-application/pom.xml | 83 ++--------------------- aws-qbusiness-datasource/pom.xml | 78 ++-------------------- aws-qbusiness-index/pom.xml | 78 ++-------------------- aws-qbusiness-plugin/pom.xml | 78 ++-------------------- aws-qbusiness-retriever/pom.xml | 78 ++-------------------- aws-qbusiness-webexperience/pom.xml | 78 ++-------------------- pom.xml | 100 ++++++++++++++++++++++++++++ 8 files changed, 137 insertions(+), 441 deletions(-) create mode 100644 pom.xml diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index cc87819..01357ed 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -32,7 +32,4 @@ jobs: run: pre-commit run --all-files - name: Verify Resources run: | - for dir in application datasource index plugin retriever webexperience; do - echo "Running Build and Test for $dir" - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean verify --no-transfer-progress --file aws-qbusiness-$dir/pom.xml - done + mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean verify --no-transfer-progress diff --git a/aws-qbusiness-application/pom.xml b/aws-qbusiness-application/pom.xml index 0d6c66a..524ff73 100644 --- a/aws-qbusiness-application/pom.xml +++ b/aws-qbusiness-application/pom.xml @@ -11,6 +11,12 @@ 1.0-SNAPSHOT jar + + software.amazon.qbusiness + aws-qbusiness-cloudformation-handlers + 1.0-SNAPSHOT + + 17 17 @@ -20,83 +26,6 @@ - - - software.amazon.cloudformation - aws-cloudformation-rpdk-java-plugin - [2.0.0,3.0.0) - - - - org.projectlombok - lombok - 1.18.30 - provided - - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - - - - software.amazon.awssdk - qbusiness - 2.28.24 - - - - software.amazon.awssdk - aws-core - 2.25.42 - - - - software.amazon.awssdk - sdk-core - 2.25.42 - - - - org.assertj - assertj-core - 3.25.2 - test - - - - org.junit.jupiter - junit-jupiter - 5.10.0 - test - - - - org.mockito - mockito-core - 5.10.0 - test - - - - org.mockito - mockito-junit-jupiter - 5.10.0 - test - diff --git a/aws-qbusiness-datasource/pom.xml b/aws-qbusiness-datasource/pom.xml index b3cb0eb..d5e1281 100644 --- a/aws-qbusiness-datasource/pom.xml +++ b/aws-qbusiness-datasource/pom.xml @@ -11,6 +11,12 @@ 1.0-SNAPSHOT jar + + software.amazon.qbusiness + aws-qbusiness-cloudformation-handlers + 1.0-SNAPSHOT + + 17 17 @@ -20,78 +26,6 @@ - - - software.amazon.cloudformation - aws-cloudformation-rpdk-java-plugin - [2.0.0,3.0.0) - - - - software.amazon.awssdk - qbusiness - 2.28.24 - - - - software.amazon.awssdk - sdk-core - 2.25.42 - - - - org.projectlombok - lombok - 1.18.30 - provided - - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - - - - - org.assertj - assertj-core - 3.25.2 - test - - - - org.junit.jupiter - junit-jupiter - 5.10.0 - test - - - - org.mockito - mockito-core - 5.10.0 - test - - - - org.mockito - mockito-junit-jupiter - 5.10.0 - test - diff --git a/aws-qbusiness-index/pom.xml b/aws-qbusiness-index/pom.xml index b6959c7..48d9761 100644 --- a/aws-qbusiness-index/pom.xml +++ b/aws-qbusiness-index/pom.xml @@ -11,6 +11,12 @@ 1.0-SNAPSHOT jar + + software.amazon.qbusiness + aws-qbusiness-cloudformation-handlers + 1.0-SNAPSHOT + + 17 17 @@ -20,78 +26,6 @@ - - - software.amazon.cloudformation - aws-cloudformation-rpdk-java-plugin - [2.0.0,3.0.0) - - - - org.projectlombok - lombok - 1.18.30 - provided - - - - software.amazon.awssdk - qbusiness - 2.28.24 - - - - software.amazon.awssdk - sdk-core - 2.25.42 - - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - - - - - org.assertj - assertj-core - 3.25.2 - test - - - - org.junit.jupiter - junit-jupiter - 5.10.0 - test - - - - org.mockito - mockito-core - 5.10.0 - test - - - - org.mockito - mockito-junit-jupiter - 5.10.0 - test - diff --git a/aws-qbusiness-plugin/pom.xml b/aws-qbusiness-plugin/pom.xml index 96d6bfa..91d37e4 100644 --- a/aws-qbusiness-plugin/pom.xml +++ b/aws-qbusiness-plugin/pom.xml @@ -11,6 +11,12 @@ 1.0-SNAPSHOT jar + + software.amazon.qbusiness + aws-qbusiness-cloudformation-handlers + 1.0-SNAPSHOT + + 17 17 @@ -20,78 +26,6 @@ - - - software.amazon.cloudformation - aws-cloudformation-rpdk-java-plugin - [2.0.0,3.0.0) - - - - org.projectlombok - lombok - 1.18.30 - provided - - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - software.amazon.awssdk - qbusiness - 2.28.24 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - - - - - org.assertj - assertj-core - 3.25.2 - test - - - - org.junit.jupiter - junit-jupiter - 5.10.0 - test - - - - org.mockito - mockito-core - 5.10.0 - test - - - - org.mockito - mockito-junit-jupiter - 5.10.0 - test - - - - software.amazon.awssdk - sdk-core - 2.25.42 - diff --git a/aws-qbusiness-retriever/pom.xml b/aws-qbusiness-retriever/pom.xml index 101cfa7..9fec619 100644 --- a/aws-qbusiness-retriever/pom.xml +++ b/aws-qbusiness-retriever/pom.xml @@ -11,6 +11,12 @@ 1.0-SNAPSHOT jar + + software.amazon.qbusiness + aws-qbusiness-cloudformation-handlers + 1.0-SNAPSHOT + + 17 17 @@ -20,78 +26,6 @@ - - - software.amazon.cloudformation - aws-cloudformation-rpdk-java-plugin - [2.0.0,3.0.0) - - - - org.projectlombok - lombok - 1.18.30 - provided - - - - software.amazon.awssdk - qbusiness - 2.28.24 - - - - software.amazon.awssdk - sdk-core - 2.25.42 - - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - - - - - org.assertj - assertj-core - 3.25.2 - test - - - - org.junit.jupiter - junit-jupiter - 5.10.0 - test - - - - org.mockito - mockito-core - 5.10.0 - test - - - - org.mockito - mockito-junit-jupiter - 5.10.0 - test - diff --git a/aws-qbusiness-webexperience/pom.xml b/aws-qbusiness-webexperience/pom.xml index 717ad00..ab3f675 100644 --- a/aws-qbusiness-webexperience/pom.xml +++ b/aws-qbusiness-webexperience/pom.xml @@ -11,6 +11,12 @@ 1.0-SNAPSHOT jar + + software.amazon.qbusiness + aws-qbusiness-cloudformation-handlers + 1.0-SNAPSHOT + + 17 17 @@ -20,78 +26,6 @@ - - - software.amazon.cloudformation - aws-cloudformation-rpdk-java-plugin - [2.0.0,3.0.0) - - - - org.projectlombok - lombok - 1.18.30 - provided - - - - software.amazon.awssdk - qbusiness - 2.28.24 - - - - software.amazon.awssdk - sdk-core - 2.25.42 - - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - - - - - org.assertj - assertj-core - 3.25.2 - test - - - - org.junit.jupiter - junit-jupiter - 5.10.0 - test - - - - org.mockito - mockito-core - 5.10.0 - test - - - - org.mockito - mockito-junit-jupiter - 5.10.0 - test - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a4fb00f --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ + + + 4.0.0 + aws-qbusiness-cloudformation-handlers + software.amazon.qbusiness + 1.0-SNAPSHOT + pom + + + aws-qbusiness-application + aws-qbusiness-datasource + aws-qbusiness-index + aws-qbusiness-plugin + aws-qbusiness-retriever + aws-qbusiness-webexperience + + + + + + software.amazon.cloudformation + aws-cloudformation-rpdk-java-plugin + [2.0.0,3.0.0) + + + + org.projectlombok + lombok + 1.18.30 + provided + + + + org.apache.logging.log4j + log4j-api + 2.17.1 + + + + org.apache.logging.log4j + log4j-core + 2.17.1 + + + + org.apache.logging.log4j + log4j-slf4j-impl + 2.17.1 + + + + software.amazon.awssdk + qbusiness + 2.28.24 + + + + software.amazon.awssdk + aws-core + 2.25.42 + + + + software.amazon.awssdk + sdk-core + 2.25.42 + + + + org.assertj + assertj-core + 3.25.2 + test + + + + org.junit.jupiter + junit-jupiter + 5.10.0 + test + + + + org.mockito + mockito-core + 5.10.0 + test + + + + org.mockito + mockito-junit-jupiter + 5.10.0 + test + + +