From 3f340ff98aa5bd9c9e928ae69557d24cab4e831f Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Fri, 22 Jul 2022 13:26:05 -0700 Subject: [PATCH 1/7] bump java operator sdk version to latest 3.1.0 --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 2 +- testdata/quarkus/memcached-quarkus-operator/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index cd33136..6ccbbe9 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -57,7 +57,7 @@ const pomxmlTemplate = ` 11 UTF-8 UTF-8 - 3.0.7 + 3.1.0 2.7.5.Final diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 8fb0940..1df2838 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -15,7 +15,7 @@ 11 UTF-8 UTF-8 - 3.0.7 + 3.1.0 2.7.5.Final From d700cd6067c693439805c7de5549d19e29508692 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Mon, 15 Aug 2022 09:11:03 -0700 Subject: [PATCH 2/7] updated version --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 2 +- testdata/quarkus/memcached-quarkus-operator/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index 6ccbbe9..f3e4d3d 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -57,7 +57,7 @@ const pomxmlTemplate = ` 11 UTF-8 UTF-8 - 3.1.0 + 4.0.0 2.7.5.Final diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 1df2838..1145345 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -15,7 +15,7 @@ 11 UTF-8 UTF-8 - 3.1.0 + 4.0.0 2.7.5.Final From 64922e075904624abdaff7a08401d50fedd4d3fc Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 16 Aug 2022 11:48:32 +0200 Subject: [PATCH 3/7] fix: remove now obsolete property --- .../scaffolds/internal/templates/applicationproperties.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go index 647ea3a..b7a76a7 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go @@ -49,6 +49,4 @@ const ApplicationPropertiesTemplate = `quarkus.container-image.build=true quarkus.container-image.name={{ .ProjectName }}-operator # set to true to automatically apply CRDs to the cluster when they get regenerated quarkus.operator-sdk.crd.apply=false -# set to true to automatically generate CSV from your code -quarkus.operator-sdk.generate-csv=false ` From db92b2b63cb2e192f847cf096e11abc8e1720278 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 16 Aug 2022 11:49:13 +0200 Subject: [PATCH 4/7] fix: update wrong dependency --- testdata/quarkus/memcached-quarkus-operator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 1145345..507a528 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -37,7 +37,7 @@ io.quarkiverse.operatorsdk - quarkus-operator-sdk-csv-generator + quarkus-operator-sdk-bundle-generator io.quarkus From aaad88beb80507f9f365acb89b0095e2360017fb Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 16 Aug 2022 11:49:46 +0200 Subject: [PATCH 5/7] chore(deps): update Quarkus version --- testdata/quarkus/memcached-quarkus-operator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 507a528..242bfe5 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -16,7 +16,7 @@ UTF-8 UTF-8 4.0.0 - 2.7.5.Final + 2.11.2.Final From b7dc0f2fba104459cd24967da48f38d5a97db31e Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 16 Aug 2022 11:50:02 +0200 Subject: [PATCH 6/7] chore(deps): update Quarkus version --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index f3e4d3d..95ac7b9 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -58,7 +58,7 @@ const pomxmlTemplate = ` UTF-8 UTF-8 4.0.0 - 2.7.5.Final + 2.11.2.Final From 313824e3ce74e0a4dd3ff4a50fe0d7557f0bd519 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 16 Aug 2022 11:50:29 +0200 Subject: [PATCH 7/7] fix: update outdated dependency, add comment --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index 95ac7b9..1ae4de2 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -77,9 +77,10 @@ const pomxmlTemplate = ` io.quarkiverse.operatorsdk quarkus-operator-sdk + io.quarkiverse.operatorsdk - quarkus-operator-sdk-csv-generator + quarkus-operator-sdk-bundle-generator io.quarkus