From c9d1453b85a6e62700768005ea4f67937701cb9b Mon Sep 17 00:00:00 2001 From: Hongxin Liang Date: Tue, 16 Aug 2022 12:20:01 +0200 Subject: [PATCH 1/3] Add bom module --- operator-framework-bom/pom.xml | 43 ++++++++++++++++++++++++++++++++++ pom.xml | 1 + 2 files changed, 44 insertions(+) create mode 100644 operator-framework-bom/pom.xml diff --git a/operator-framework-bom/pom.xml b/operator-framework-bom/pom.xml new file mode 100644 index 0000000000..7dc440bc3c --- /dev/null +++ b/operator-framework-bom/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + io.javaoperatorsdk + operator-framework-bom + 3.1.2-SNAPSHOT + Operator SDK for Java Bill of Materials + pom + + + + + io.javaoperatorsdk + operator-framework-core + ${project.version} + + + io.javaoperatorsdk + operator-framework + ${project.version} + + + io.javaoperatorsdk + micrometer-support + ${project.version} + + + io.javaoperatorsdk + operator-framework-junit-5 + ${project.version} + + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + diff --git a/pom.xml b/pom.xml index 12447e1d33..79c8fceede 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,7 @@ + operator-framework-bom operator-framework-core operator-framework-junit5 operator-framework From babaa6f106d16281039a98e671fba2a41cd0583b Mon Sep 17 00:00:00 2001 From: Honnix Date: Tue, 16 Aug 2022 16:27:43 +0200 Subject: [PATCH 2/3] Skip operator-framework-bom --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 82e1d3f828..6c0a888325 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -25,8 +25,8 @@ jobs: cache: 'maven' - name: Check code format run: | - ./mvnw ${MAVEN_ARGS} formatter:validate -Dconfigfile=$PWD/contributing/eclipse-google-style.xml --file pom.xml - ./mvnw ${MAVEN_ARGS} impsort:check --file pom.xml + ./mvnw ${MAVEN_ARGS} formatter:validate -Dconfigfile=$PWD/contributing/eclipse-google-style.xml -pl '!operator-framework-bom' --file pom.xml + ./mvnw ${MAVEN_ARGS} impsort:check -pl '!operator-framework-bom' --file pom.xml - name: Run unit tests run: ./mvnw ${MAVEN_ARGS} -B test --file pom.xml From f02ed4d73a608c33cf5b1bafeea6c95cb6836252 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 18 Aug 2022 11:53:36 +0200 Subject: [PATCH 3/3] fix: naming --- operator-framework-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-bom/pom.xml b/operator-framework-bom/pom.xml index 7dc440bc3c..8628195c6b 100644 --- a/operator-framework-bom/pom.xml +++ b/operator-framework-bom/pom.xml @@ -6,7 +6,7 @@ io.javaoperatorsdk operator-framework-bom 3.1.2-SNAPSHOT - Operator SDK for Java Bill of Materials + Operator SDK for Java - Bill of Materials pom