From 4e52afedb9fcd8d18f57071dbe1c6404fe788e0c Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Fri, 7 Jul 2023 11:01:28 +0200 Subject: [PATCH 01/24] chore: rebase on main, keep version intact to reduce distance with main [skip ci] --- .github/workflows/build.yml | 5 ++++- build-parent/pom.xml | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34f180a9..2d8fc343 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,12 @@ name: Build PRs and main when updated on: + schedule: + # daily run + - cron: '0 0 * * *' push: branches: - - "main" + - "next-fabric8-version" paths-ignore: - '.gitignore' - 'CODEOWNERS' diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 9eb2b84b..40de93aa 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -18,6 +18,13 @@ + + io.fabric8 + kubernetes-client-bom + 6.8-SNAPSHOT + pom + import + io.quarkiverse.operatorsdk quarkus-operator-sdk-bom From 512475046b8b24c3c39a4e0a7766c93824629cb6 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 9 Nov 2023 16:15:34 +0100 Subject: [PATCH 02/24] chore: update to proper next fabric8 version Signed-off-by: Chris Laprun --- build-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 40de93aa..d669cbc0 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -21,7 +21,7 @@ io.fabric8 kubernetes-client-bom - 6.8-SNAPSHOT + 6.10-SNAPSHOT pom import From 83521a9a5bf713ea0862a41eba472a51243e8cbe Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 20 Nov 2023 11:09:54 +0100 Subject: [PATCH 03/24] chore: re-add snapshot repositories (NOT TO BE MERGED IN MAIN) Signed-off-by: Chris Laprun --- build-parent/pom.xml | 21 +++++++++++++++++++++ pom.xml | 1 + 2 files changed, 22 insertions(+) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index d669cbc0..5222edc2 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -16,6 +16,27 @@ UTF-8 UTF-8 + + + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + oss-sonatype + oss-sonatype + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + + diff --git a/pom.xml b/pom.xml index b46e3fff..c87fc484 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ https://github.com/quarkiverse/quarkus-operator-sdk HEAD + ossrh From a7ebe73d2deaf4919bd82868447a989fb7f9d4da Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 9 Jan 2024 21:05:05 +0100 Subject: [PATCH 04/24] fix: move fabric8 override to BOM Signed-off-by: Chris Laprun --- bom/pom.xml | 7 +++++++ build-parent/pom.xml | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index b9f70818..c6cb9298 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -40,6 +40,13 @@ + + io.fabric8 + kubernetes-client-bom + 6.10-SNAPSHOT + pom + import + io.quarkus quarkus-bom diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 5222edc2..726e1679 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -39,13 +39,6 @@ - - io.fabric8 - kubernetes-client-bom - 6.10-SNAPSHOT - pom - import - io.quarkiverse.operatorsdk quarkus-operator-sdk-bom From 5383313281e0d731657fd7001444c84926edf4ac Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 10 Jan 2024 11:21:25 +0100 Subject: [PATCH 05/24] fix: add Quarkus snapshots repository Signed-off-by: Chris Laprun --- build-parent/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 726e1679..0b721a21 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -35,6 +35,15 @@ true + + + oss-sonatype-quarkus + oss-sonatype-quarkus + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + true + + From e4f445da6b30ed5e8fc2e705463ab7e4bbdb8032 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 10 Jan 2024 11:54:25 +0100 Subject: [PATCH 06/24] fix: move repository declarations to parent Signed-off-by: Chris Laprun --- build-parent/pom.xml | 29 ----------------------------- pom.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 0b721a21..1b66a367 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -17,35 +17,6 @@ UTF-8 - - - - false - - central - Central Repository - https://repo.maven.apache.org/maven2 - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - oss-sonatype-quarkus - oss-sonatype-quarkus - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - true - - - - diff --git a/pom.xml b/pom.xml index c87fc484..a1ba48af 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,35 @@ HEAD + + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + oss-sonatype + oss-sonatype + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + + + oss-sonatype-quarkus + oss-sonatype-quarkus + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + true + + + + ossrh From 00596fef6d94b0a4d7e2990e38f6bd5ee5d262fa Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 10 Jan 2024 12:00:54 +0100 Subject: [PATCH 07/24] fix: add plugin repository for Quarkus snapshots Signed-off-by: Chris Laprun --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index a1ba48af..f385150d 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,17 @@ + + + oss-sonatype-quarkus + oss-sonatype-quarkus + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + true + + + + ossrh From 668d206e029875a0212d427a283da4729dde0357 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 10 Jan 2024 14:24:51 +0100 Subject: [PATCH 08/24] feat: add dependency check step on failure Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 4 ++++ pom.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index d99b9d72..8a16e874 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -172,6 +172,10 @@ jobs: - name: Build with Maven (JVM) run: mvn -B formatter:validate install -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' --file pom.xml + - name: Dependency tree on failure + if: failure() + run: mvn -B dependency:tree -Dverbose + - name: Kubernetes KinD Cluster uses: container-tools/kind-action@v2 with: diff --git a/pom.xml b/pom.xml index f385150d..2347f145 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ https://oss.sonatype.org/content/repositories/snapshots/ true + never @@ -47,6 +48,7 @@ https://s01.oss.sonatype.org/content/repositories/snapshots/ true + never From 4814276ff0a9855c2f69b64239540db5ac1d0fe8 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 10 Jan 2024 16:14:29 +0100 Subject: [PATCH 09/24] fix: use Quarkus 3.7.1 Signed-off-by: Chris Laprun --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d8fc343..252042e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,8 @@ jobs: java-version: [ 17, 21 ] uses: ./.github/workflows/build-for-quarkus-version.yml with: - quarkus-version: ${{ needs.extract-project-metadata.outputs.latest_stable_quarkus }} +# quarkus-version: ${{ needs.extract-project-metadata.outputs.latest_stable_quarkus }} + quarkus-version: 999-SNAPSHOT java-version: ${{ matrix.java-version }} branch: ${{ needs.extract-project-metadata.outputs.branch_name }} native-modules: "integration-tests" From 5ce2184de86f28db075b69793331869554854ab2 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 22 Jan 2024 14:06:33 +0100 Subject: [PATCH 10/24] chore: update to Fabric8 client to 6.11 Signed-off-by: Chris Laprun --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index c6cb9298..bbe75c7a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ io.fabric8 kubernetes-client-bom - 6.10-SNAPSHOT + 6.11-SNAPSHOT pom import From 1b95a449cbd2a80be259b9deeb51df12b494eef9 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 24 Jan 2024 11:47:15 +0100 Subject: [PATCH 11/24] chore(build): remove now unneeded repository configurations Signed-off-by: Chris Laprun --- pom.xml | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/pom.xml b/pom.xml index 2347f145..b46e3fff 100644 --- a/pom.xml +++ b/pom.xml @@ -21,49 +21,6 @@ https://github.com/quarkiverse/quarkus-operator-sdk HEAD - - - - - false - - central - Central Repository - https://repo.maven.apache.org/maven2 - - - - oss-sonatype - oss-sonatype - https://oss.sonatype.org/content/repositories/snapshots/ - - true - never - - - - - oss-sonatype-quarkus - oss-sonatype-quarkus - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - true - never - - - - - - - oss-sonatype-quarkus - oss-sonatype-quarkus - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - true - - - - ossrh From 5050cb01de070aa90a03df6c5d10329a15965df5 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 27 Mar 2024 10:02:52 +0100 Subject: [PATCH 12/24] chore: update to Fabric8 6.12-SNAPSHOT Signed-off-by: Chris Laprun --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index bbe75c7a..1c05a9f9 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -43,7 +43,7 @@ io.fabric8 kubernetes-client-bom - 6.11-SNAPSHOT + 6.12-SNAPSHOT pom import From 273ee8f9c75e52acb6a8389e94db70dd9da66c73 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 29 Apr 2024 16:01:06 +0200 Subject: [PATCH 13/24] feat: make it possible to build from a fabric8 client PR Signed-off-by: Chris Laprun --- .../workflows/build-for-quarkus-version.yml | 29 +++++++++++++++++++ bom/pom.xml | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 8a16e874..3894fe23 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -38,6 +38,10 @@ on: description: 'Quarkus PR number to use to run a QOSDK build with' type: string required: true + fkc-pr: + description: 'Fabric8 client PR number to use to run a QOSDK build with' + type: string + required: true java-version: description: 'Java version to build with' type: string @@ -123,6 +127,25 @@ jobs: mvn -Dquickly cd - + - name: Check-out Fabric8 client PR if requested + uses: actions/checkout@v4 + if: "${{ inputs.fkc-pr != '' }}" + with: + repository: fabric8io/kubernetes-client + path: fkc + + - name: Build Quarkus PR if requested + if: "${{ inputs.fkc-pr != '' }}" + id: build-fkc-pr + run: | + cd fkc + git fetch origin pull/${{ github.event.inputs.fkc-pr }}/head:pr-to-check + git switch pr-to-check + ./update-version.sh 999.${{ github.event.inputs.fkc-pr }}-SNAPSHOT + echo "f8_pr_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT + mvn clean install -DskipTests + cd - + - name: Retrieve Quarkus version from platform if: "${{ inputs.quarkus-version == '' && inputs.quarkus-pr == ''}}" id: get-quarkus-version @@ -160,6 +183,12 @@ jobs: echo "Using Quarkus ${{ steps.quarkus-version.outputs.quarkus_version }}" mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=quarkus.version -DnewVersion=${{ steps.quarkus-version.outputs.quarkus_version }} + - name: Change Fabric8 client version + if: "${{ inputs.fkc-pr != '' }}" + run: | + echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" + mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + - name: Output versions being used run: | echo "QOSDK version: $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" diff --git a/bom/pom.xml b/bom/pom.xml index 1c05a9f9..bb18cf95 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -38,12 +38,16 @@ https://github.com/quarkiverse/quarkus-operator-sdk/issues/ + + 6.12-SNAPSHOT + + io.fabric8 kubernetes-client-bom - 6.12-SNAPSHOT + ${fabric8-client.version} pom import From f1254af98443bf48925a1102342c5fdaa9f122f9 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 29 Apr 2024 16:05:01 +0200 Subject: [PATCH 14/24] fix: make Quarkus and Fabric8 client PR numbers optional Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 3894fe23..12e30443 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -37,11 +37,11 @@ on: quarkus-pr: description: 'Quarkus PR number to use to run a QOSDK build with' type: string - required: true + required: false fkc-pr: description: 'Fabric8 client PR number to use to run a QOSDK build with' type: string - required: true + required: false java-version: description: 'Java version to build with' type: string From 521d12702eb3430c914436fcd1d5b75b2c46bc81 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 29 Apr 2024 16:11:26 +0200 Subject: [PATCH 15/24] fix: properly update FKC version Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 12e30443..940922b4 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -134,14 +134,14 @@ jobs: repository: fabric8io/kubernetes-client path: fkc - - name: Build Quarkus PR if requested + - name: Build Fabrtic8 client PR if requested if: "${{ inputs.fkc-pr != '' }}" id: build-fkc-pr run: | cd fkc git fetch origin pull/${{ github.event.inputs.fkc-pr }}/head:pr-to-check git switch pr-to-check - ./update-version.sh 999.${{ github.event.inputs.fkc-pr }}-SNAPSHOT + mvn versions:set -DnewVersion=999.${{ github.event.inputs.fkc-pr }}-SNAPSHOT versions:commit echo "f8_pr_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT mvn clean install -DskipTests cd - From c0e303c7a81e5291d0adf44de1bfcfb9623bbf41 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 29 Apr 2024 16:56:48 +0200 Subject: [PATCH 16/24] fix: retrieve latest Quarkus version from registry by default Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 940922b4..594bfbfc 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -4,6 +4,7 @@ on: workflow_call: inputs: quarkus-version-jq-cmd: + description: 'jq command to extract which Quarkus version to use from https://registry.quarkus.io/client/platforms' type: string required: false quarkus-version: @@ -30,6 +31,11 @@ on: default: 'default' workflow_dispatch: inputs: + quarkus-version-jq-cmd: + description: 'jq command to extract which Quarkus version to use from https://registry.quarkus.io/client/platforms' + type: string + required: false + default: '.platforms[0]."current-stream-id" as $current | .platforms[0].streams[] | select(.id == $current) | .releases[0].version' josdk-pr: description: 'JOSDK PR number (or main) to use to build QOSDK with' type: string From ca490c4ccd4fdc8698391e90f0f8d113bcd860de Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 30 Apr 2024 21:46:17 +0200 Subject: [PATCH 17/24] wip: meant to test fabric8io/kubernetes-client#5949 Signed-off-by: Chris Laprun --- bom/pom.xml | 2 +- core/deployment/pom.xml | 2 +- .../io/quarkiverse/operatorsdk/deployment/CRDGeneration.java | 4 ++-- .../operatorsdk/deployment/ResourceControllerMapping.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index bb18cf95..613325a4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ - 6.12-SNAPSHOT + 6.13.crd-SNAPSHOT diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml index 12e7ac0c..231f61c3 100644 --- a/core/deployment/pom.xml +++ b/core/deployment/pom.xml @@ -44,7 +44,7 @@ io.fabric8 - crd-generator-api + crd-generator-api-v2 org.semver4j diff --git a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java index 270e959f..a0e7b3bc 100644 --- a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java +++ b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java @@ -12,8 +12,8 @@ import org.jboss.logging.Logger; -import io.fabric8.crd.generator.CRDGenerator; -import io.fabric8.crd.generator.CustomResourceInfo; +import io.fabric8.crdv2.generator.CRDGenerator; +import io.fabric8.crdv2.generator.CustomResourceInfo; import io.fabric8.kubernetes.client.CustomResource; import io.quarkiverse.operatorsdk.common.CustomResourceAugmentedClassInfo; import io.quarkiverse.operatorsdk.common.FileUtils; diff --git a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java index 2141d1b9..07106b7d 100644 --- a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java +++ b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/ResourceControllerMapping.java @@ -17,7 +17,7 @@ public Map getResourceInfos(String resourceFullName) { return infos; } - public void add(io.fabric8.crd.generator.CustomResourceInfo info, String crdName, String associatedControllerName) { + public void add(io.fabric8.crdv2.generator.CustomResourceInfo info, String crdName, String associatedControllerName) { final var version = info.version(); final var versionsForCR = resourceFullNameToVersionToInfos.computeIfAbsent(crdName, s -> new HashMap<>()); final var cri = versionsForCR.get(version); @@ -41,7 +41,7 @@ public void add(io.fabric8.crd.generator.CustomResourceInfo info, String crdName versionsForCR.put(version, converted); } - private static ResourceInfo augment(io.fabric8.crd.generator.CustomResourceInfo info, + private static ResourceInfo augment(io.fabric8.crdv2.generator.CustomResourceInfo info, String crdName, String associatedControllerName) { return new ResourceInfo( info.group(), info.version(), info.kind(), info.singular(), info.plural(), info.shortNames(), From bf728d9a268c116cb20d4fe7e88dd2452ae49479 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 30 Apr 2024 22:10:15 +0200 Subject: [PATCH 18/24] fix: change fabric8 version as soon as PR is built if needed Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 594bfbfc..31818d69 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -140,7 +140,7 @@ jobs: repository: fabric8io/kubernetes-client path: fkc - - name: Build Fabrtic8 client PR if requested + - name: Build Fabric8 client PR if requested if: "${{ inputs.fkc-pr != '' }}" id: build-fkc-pr run: | @@ -152,6 +152,12 @@ jobs: mvn clean install -DskipTests cd - + - name: Change Fabric8 client version + if: "${{ inputs.fkc-pr != '' }}" + run: | + echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" + mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + - name: Retrieve Quarkus version from platform if: "${{ inputs.quarkus-version == '' && inputs.quarkus-pr == ''}}" id: get-quarkus-version @@ -189,12 +195,6 @@ jobs: echo "Using Quarkus ${{ steps.quarkus-version.outputs.quarkus_version }}" mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=quarkus.version -DnewVersion=${{ steps.quarkus-version.outputs.quarkus_version }} - - name: Change Fabric8 client version - if: "${{ inputs.fkc-pr != '' }}" - run: | - echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" - mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} - - name: Output versions being used run: | echo "QOSDK version: $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" From 334d7ec918317f9f50eee926346a91236abb2b63 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 30 Apr 2024 22:25:56 +0200 Subject: [PATCH 19/24] fix: should use existing version Signed-off-by: Chris Laprun --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 613325a4..bb18cf95 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ - 6.13.crd-SNAPSHOT + 6.12-SNAPSHOT From 1a9c187727e25196dfdcb1dd5471f59a64c5d9d7 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 30 Apr 2024 23:29:56 +0200 Subject: [PATCH 20/24] fix: change versions after profiles have been set Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 31818d69..7bcfd2b6 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -152,12 +152,6 @@ jobs: mvn clean install -DskipTests cd - - - name: Change Fabric8 client version - if: "${{ inputs.fkc-pr != '' }}" - run: | - echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" - mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} - - name: Retrieve Quarkus version from platform if: "${{ inputs.quarkus-version == '' && inputs.quarkus-pr == ''}}" id: get-quarkus-version @@ -195,6 +189,12 @@ jobs: echo "Using Quarkus ${{ steps.quarkus-version.outputs.quarkus_version }}" mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=quarkus.version -DnewVersion=${{ steps.quarkus-version.outputs.quarkus_version }} + - name: Change Fabric8 client version + if: "${{ inputs.fkc-pr != '' }}" + run: | + echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" + mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + - name: Output versions being used run: | echo "QOSDK version: $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" From 9d15aa682d711259932afd79ae08d015f142daae Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 1 May 2024 00:21:19 +0200 Subject: [PATCH 21/24] fix: change f8 version before anything else for new deps to resolve Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 7bcfd2b6..249feb1d 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -184,17 +184,17 @@ jobs: echo "Computed Maven profiles: ${maven_profiles}" echo "maven_profiles=${maven_profiles}" >> $GITHUB_OUTPUT - - name: Change Quarkus version - run: | - echo "Using Quarkus ${{ steps.quarkus-version.outputs.quarkus_version }}" - mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=quarkus.version -DnewVersion=${{ steps.quarkus-version.outputs.quarkus_version }} - - name: Change Fabric8 client version if: "${{ inputs.fkc-pr != '' }}" run: | echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + - name: Change Quarkus version + run: | + echo "Using Quarkus ${{ steps.quarkus-version.outputs.quarkus_version }}" + mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=quarkus.version -DnewVersion=${{ steps.quarkus-version.outputs.quarkus_version }} + - name: Output versions being used run: | echo "QOSDK version: $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" From fcefa026284faa3ed2bad8761ef25a5180ac525b Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 1 May 2024 00:54:09 +0200 Subject: [PATCH 22/24] fix: properly use profiles Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 249feb1d..bd1904de 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -188,7 +188,7 @@ jobs: if: "${{ inputs.fkc-pr != '' }}" run: | echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" - mvn versions:set-property -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + mvn versions:set-property --P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} - name: Change Quarkus version run: | From c8bff6cb9d4d2d9c72aaf1ad8b0af49f644e0682 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 1 May 2024 01:14:14 +0200 Subject: [PATCH 23/24] fix: typo Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index bd1904de..06443fee 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -188,7 +188,7 @@ jobs: if: "${{ inputs.fkc-pr != '' }}" run: | echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" - mvn versions:set-property --P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} - name: Change Quarkus version run: | From 26f5914478b7f8a972b31c085af0a34c2f00df09 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 1 May 2024 01:49:33 +0200 Subject: [PATCH 24/24] fix: change f8 version using sed instead of mvn Signed-off-by: Chris Laprun --- .github/workflows/build-for-quarkus-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-quarkus-version.yml b/.github/workflows/build-for-quarkus-version.yml index 06443fee..93902613 100644 --- a/.github/workflows/build-for-quarkus-version.yml +++ b/.github/workflows/build-for-quarkus-version.yml @@ -188,7 +188,7 @@ jobs: if: "${{ inputs.fkc-pr != '' }}" run: | echo "Using Fabric8 ${{ steps.build-fkc-pr.outputs.f8_pr_version }}" - mvn versions:set-property -P'${{steps.set-mvn-profiles.outputs.maven_profiles}}' -Dproperty=fabric8-client.version -DnewVersion=${{ steps.build-fkc-pr.outputs.f8_pr_version }} + sed -r -i "s@[^<]+@${{ steps.build-fkc-pr.outputs.f8_pr_version }}@" bom/pom.xml - name: Change Quarkus version run: |