From 4b0a75606d3d1fd707adc8394ea653691953bcc8 Mon Sep 17 00:00:00 2001 From: Christoph Deppisch Date: Fri, 27 Oct 2023 11:04:20 +0200 Subject: [PATCH] Use next snapshot version 0.18.0-SNAPSHOT --- Makefile | 4 ++-- config/manager/operator-deployment.yaml | 2 +- config/manifests/bases/yaks.clusterserviceversion.yaml | 6 +++--- config/manifests/kustomization.yaml | 2 +- .../yaks.citrusframework.org_instances.yaml | 0 .../yaks.citrusframework.org_tests.yaml | 0 .../yaks.v0.18.0-snapshot.clusterserviceversion.yaml} | 8 ++++---- deploy/olm-catalog/yaks/yaks.package.yaml | 2 +- java/pom.xml | 2 +- java/runtime/pom.xml | 2 +- java/runtime/yaks-runtime-core/pom.xml | 2 +- java/runtime/yaks-runtime-maven/extensions.xml | 2 +- java/runtime/yaks-runtime-maven/pom.xml | 2 +- java/steps/pom.xml | 2 +- java/steps/yaks-camel-k/pom.xml | 2 +- java/steps/yaks-camel/pom.xml | 2 +- java/steps/yaks-groovy/pom.xml | 2 +- java/steps/yaks-http/pom.xml | 2 +- java/steps/yaks-jdbc/pom.xml | 2 +- java/steps/yaks-jms/pom.xml | 2 +- java/steps/yaks-kafka/pom.xml | 2 +- java/steps/yaks-knative/pom.xml | 2 +- java/steps/yaks-kubernetes/pom.xml | 2 +- java/steps/yaks-openapi/pom.xml | 2 +- java/steps/yaks-selenium/pom.xml | 2 +- java/steps/yaks-standard/pom.xml | 2 +- java/steps/yaks-testcontainers/pom.xml | 2 +- java/tools/maven/pom.xml | 2 +- java/tools/maven/yaks-maven-extension/pom.xml | 2 +- java/tools/pom.xml | 2 +- java/tools/yaks-jbang/pom.xml | 2 +- java/tools/yaks-jbang/src/main/java/main/YaksJBang.java | 6 +++--- .../org/citrusframework/yaks/jbang/YaksJBangMain.java | 2 +- pkg/util/defaults/defaults.go | 2 +- 34 files changed, 40 insertions(+), 40 deletions(-) rename deploy/olm-catalog/yaks/{0.17.0-snapshot => 0.18.0-snapshot}/yaks.citrusframework.org_instances.yaml (100%) rename deploy/olm-catalog/yaks/{0.17.0-snapshot => 0.18.0-snapshot}/yaks.citrusframework.org_tests.yaml (100%) rename deploy/olm-catalog/yaks/{0.17.0-snapshot/yaks.v0.17.0-snapshot.clusterserviceversion.yaml => 0.18.0-snapshot/yaks.v0.18.0-snapshot.clusterserviceversion.yaml} (99%) diff --git a/Makefile b/Makefile index 8ee8cbae..2ad0dcfc 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION := 0.17.0-SNAPSHOT -SNAPSHOT_VERSION := 0.17.0-SNAPSHOT +VERSION := 0.18.0-SNAPSHOT +SNAPSHOT_VERSION := 0.18.0-SNAPSHOT OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION)) LAST_RELEASED_IMAGE_NAME := yaks-operator LAST_RELEASED_VERSION := 0.16.0 diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml index a219437c..01710fa3 100644 --- a/config/manager/operator-deployment.yaml +++ b/config/manager/operator-deployment.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: yaks-operator containers: - name: yaks-operator - image: docker.io/citrusframework/yaks:0.17.0-SNAPSHOT + image: docker.io/citrusframework/yaks:0.18.0-SNAPSHOT command: - yaks - operator diff --git a/config/manifests/bases/yaks.clusterserviceversion.yaml b/config/manifests/bases/yaks.clusterserviceversion.yaml index db7cae06..05440f4f 100644 --- a/config/manifests/bases/yaks.clusterserviceversion.yaml +++ b/config/manifests/bases/yaks.clusterserviceversion.yaml @@ -22,7 +22,7 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" - containerImage: docker.io/citrusframework/yaks:0.17.0-SNAPSHOT + containerImage: docker.io/citrusframework/yaks:0.18.0-SNAPSHOT createdAt: 2023-04-26T20:37:25Z description: YAKS is a platform to enable Cloud Native BDD testing on Kubernetes. operators.operatorframework.io/builder: operator-sdk-v1.28.0 @@ -30,7 +30,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 repository: https://github.com/citrusframework/yaks support: Citrus Framework - name: yaks.v0.17.0-SNAPSHOT + name: yaks.v0.18.0-SNAPSHOT namespace: placeholder spec: apiservicedefinitions: {} @@ -123,4 +123,4 @@ spec: selector: matchLabels: name: yaks-operator - version: 0.17.0-SNAPSHOT + version: 0.18.0-SNAPSHOT diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 3db93ebc..13d63d53 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -32,4 +32,4 @@ resources: images: - name: docker.io/citrusframework/yaks newName: docker.io/citrusframework/yaks - newTag: 0.17.0-SNAPSHOT + newTag: 0.18.0-SNAPSHOT diff --git a/deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.citrusframework.org_instances.yaml b/deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.citrusframework.org_instances.yaml similarity index 100% rename from deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.citrusframework.org_instances.yaml rename to deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.citrusframework.org_instances.yaml diff --git a/deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.citrusframework.org_tests.yaml b/deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.citrusframework.org_tests.yaml similarity index 100% rename from deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.citrusframework.org_tests.yaml rename to deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.citrusframework.org_tests.yaml diff --git a/deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.v0.17.0-snapshot.clusterserviceversion.yaml b/deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.v0.18.0-snapshot.clusterserviceversion.yaml similarity index 99% rename from deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.v0.17.0-snapshot.clusterserviceversion.yaml rename to deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.v0.18.0-snapshot.clusterserviceversion.yaml index b89e5969..b415a6fc 100644 --- a/deploy/olm-catalog/yaks/0.17.0-snapshot/yaks.v0.17.0-snapshot.clusterserviceversion.yaml +++ b/deploy/olm-catalog/yaks/0.18.0-snapshot/yaks.v0.18.0-snapshot.clusterserviceversion.yaml @@ -57,7 +57,7 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" - containerImage: docker.io/citrusframework/yaks:0.17.0-SNAPSHOT + containerImage: docker.io/citrusframework/yaks:0.18.0-SNAPSHOT createdAt: "2023-04-26T20:37:31Z" description: YAKS is a platform to enable Cloud Native BDD testing on Kubernetes. operators.operatorframework.io/builder: operator-sdk-v1.28.0 @@ -65,7 +65,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 repository: https://github.com/citrusframework/yaks support: Citrus Framework - name: yaks-operator.v0.17.0-SNAPSHOT + name: yaks-operator.v0.18.0-SNAPSHOT namespace: placeholder spec: apiservicedefinitions: {} @@ -175,7 +175,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/citrusframework/yaks:0.17.0-SNAPSHOT + image: docker.io/citrusframework/yaks:0.18.0-SNAPSHOT imagePullPolicy: IfNotPresent name: yaks-operator resources: {} @@ -435,4 +435,4 @@ spec: selector: matchLabels: name: yaks-operator - version: 0.17.0-SNAPSHOT + version: 0.18.0-SNAPSHOT diff --git a/deploy/olm-catalog/yaks/yaks.package.yaml b/deploy/olm-catalog/yaks/yaks.package.yaml index bc3bdaa4..dd821172 100644 --- a/deploy/olm-catalog/yaks/yaks.package.yaml +++ b/deploy/olm-catalog/yaks/yaks.package.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- channels: -- currentCSV: yaks-operator.v0.17.0-SNAPSHOT +- currentCSV: yaks-operator.v0.18.0-SNAPSHOT name: alpha defaultChannel: alpha packageName: yaks diff --git a/java/pom.xml b/java/pom.xml index 8a786d11..bc58b636 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -27,7 +27,7 @@ 4.0.0 org.citrusframework.yaks yaks-parent - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT YAKS Platform to enable Cloud Native BDD testing on Kubernetes pom diff --git a/java/runtime/pom.xml b/java/runtime/pom.xml index 12ab2067..860b02a7 100644 --- a/java/runtime/pom.xml +++ b/java/runtime/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-parent - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/runtime/yaks-runtime-core/pom.xml b/java/runtime/yaks-runtime-core/pom.xml index e8feead1..4b3e90b8 100644 --- a/java/runtime/yaks-runtime-core/pom.xml +++ b/java/runtime/yaks-runtime-core/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-runtime - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/runtime/yaks-runtime-maven/extensions.xml b/java/runtime/yaks-runtime-maven/extensions.xml index 989c598b..e2fac1fd 100644 --- a/java/runtime/yaks-runtime-maven/extensions.xml +++ b/java/runtime/yaks-runtime-maven/extensions.xml @@ -20,6 +20,6 @@ org.citrusframework.yaks yaks-maven-extension - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT diff --git a/java/runtime/yaks-runtime-maven/pom.xml b/java/runtime/yaks-runtime-maven/pom.xml index 3143f56d..ed3f9623 100644 --- a/java/runtime/yaks-runtime-maven/pom.xml +++ b/java/runtime/yaks-runtime-maven/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-runtime - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/pom.xml b/java/steps/pom.xml index 8131f4b5..c88fd149 100644 --- a/java/steps/pom.xml +++ b/java/steps/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-parent - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT 4.0.0 diff --git a/java/steps/yaks-camel-k/pom.xml b/java/steps/yaks-camel-k/pom.xml index 183ea4f7..ddf866b0 100644 --- a/java/steps/yaks-camel-k/pom.xml +++ b/java/steps/yaks-camel-k/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-camel/pom.xml b/java/steps/yaks-camel/pom.xml index 4ec9d5f4..e3f6945d 100644 --- a/java/steps/yaks-camel/pom.xml +++ b/java/steps/yaks-camel/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-groovy/pom.xml b/java/steps/yaks-groovy/pom.xml index 8830a019..b00902fd 100644 --- a/java/steps/yaks-groovy/pom.xml +++ b/java/steps/yaks-groovy/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-http/pom.xml b/java/steps/yaks-http/pom.xml index f312afaf..9556fb02 100644 --- a/java/steps/yaks-http/pom.xml +++ b/java/steps/yaks-http/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-jdbc/pom.xml b/java/steps/yaks-jdbc/pom.xml index 6e418896..e2cb4cc6 100644 --- a/java/steps/yaks-jdbc/pom.xml +++ b/java/steps/yaks-jdbc/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-jms/pom.xml b/java/steps/yaks-jms/pom.xml index cbfd2d58..c4647c03 100644 --- a/java/steps/yaks-jms/pom.xml +++ b/java/steps/yaks-jms/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-kafka/pom.xml b/java/steps/yaks-kafka/pom.xml index 4169ff2d..9496b69e 100644 --- a/java/steps/yaks-kafka/pom.xml +++ b/java/steps/yaks-kafka/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-knative/pom.xml b/java/steps/yaks-knative/pom.xml index aa55c532..5723c4a0 100644 --- a/java/steps/yaks-knative/pom.xml +++ b/java/steps/yaks-knative/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-kubernetes/pom.xml b/java/steps/yaks-kubernetes/pom.xml index ad1b43b8..c68edc26 100644 --- a/java/steps/yaks-kubernetes/pom.xml +++ b/java/steps/yaks-kubernetes/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-openapi/pom.xml b/java/steps/yaks-openapi/pom.xml index 8824bb18..8c61a39d 100644 --- a/java/steps/yaks-openapi/pom.xml +++ b/java/steps/yaks-openapi/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-selenium/pom.xml b/java/steps/yaks-selenium/pom.xml index c0506e5e..af6c2c77 100644 --- a/java/steps/yaks-selenium/pom.xml +++ b/java/steps/yaks-selenium/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-standard/pom.xml b/java/steps/yaks-standard/pom.xml index d3435172..97f36a59 100644 --- a/java/steps/yaks-standard/pom.xml +++ b/java/steps/yaks-standard/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/steps/yaks-testcontainers/pom.xml b/java/steps/yaks-testcontainers/pom.xml index 0ed2a74b..5528fbf1 100644 --- a/java/steps/yaks-testcontainers/pom.xml +++ b/java/steps/yaks-testcontainers/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-steps - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/tools/maven/pom.xml b/java/tools/maven/pom.xml index 3dee88cc..098cf03d 100644 --- a/java/tools/maven/pom.xml +++ b/java/tools/maven/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-tools - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/tools/maven/yaks-maven-extension/pom.xml b/java/tools/maven/yaks-maven-extension/pom.xml index 33da95c5..188a8bd5 100644 --- a/java/tools/maven/yaks-maven-extension/pom.xml +++ b/java/tools/maven/yaks-maven-extension/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-maven - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/tools/pom.xml b/java/tools/pom.xml index 0a35313e..3e47a8fc 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-parent - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/tools/yaks-jbang/pom.xml b/java/tools/yaks-jbang/pom.xml index e8b55650..a48f06db 100644 --- a/java/tools/yaks-jbang/pom.xml +++ b/java/tools/yaks-jbang/pom.xml @@ -20,7 +20,7 @@ org.citrusframework.yaks yaks-tools - 0.17.0-SNAPSHOT + 0.18.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/tools/yaks-jbang/src/main/java/main/YaksJBang.java b/java/tools/yaks-jbang/src/main/java/main/YaksJBang.java index 3e113d8f..6eb003d4 100755 --- a/java/tools/yaks-jbang/src/main/java/main/YaksJBang.java +++ b/java/tools/yaks-jbang/src/main/java/main/YaksJBang.java @@ -19,9 +19,9 @@ //JAVA 11+ //REPOS mavencentral -//DEPS org.citrusframework.yaks:yaks-parent:${yaks.jbang.version:0.17.0-SNAPSHOT}@pom -//DEPS org.citrusframework.yaks:yaks-jbang:${yaks.jbang.version:0.17.0-SNAPSHOT} -//DEPS org.citrusframework.yaks:yaks-runtime-core:${yaks.jbang.version:0.17.0-SNAPSHOT} +//DEPS org.citrusframework.yaks:yaks-parent:${yaks.jbang.version:0.18.0-SNAPSHOT}@pom +//DEPS org.citrusframework.yaks:yaks-jbang:${yaks.jbang.version:0.18.0-SNAPSHOT} +//DEPS org.citrusframework.yaks:yaks-runtime-core:${yaks.jbang.version:0.18.0-SNAPSHOT} package main; import org.citrusframework.yaks.jbang.YaksJBangMain; diff --git a/java/tools/yaks-jbang/src/main/java/org/citrusframework/yaks/jbang/YaksJBangMain.java b/java/tools/yaks-jbang/src/main/java/org/citrusframework/yaks/jbang/YaksJBangMain.java index 4bc4aa43..665e869b 100644 --- a/java/tools/yaks-jbang/src/main/java/org/citrusframework/yaks/jbang/YaksJBangMain.java +++ b/java/tools/yaks-jbang/src/main/java/org/citrusframework/yaks/jbang/YaksJBangMain.java @@ -38,7 +38,7 @@ public static void run(String... args) { .addSubcommand("ls", new CommandLine(new ListTests(main))) .addSubcommand("completion", new CommandLine(new Complete(main))); - commandLine.getCommandSpec().versionProvider(() -> new String[] { "0.17.0-SNAPSHOT" }); + commandLine.getCommandSpec().versionProvider(() -> new String[] { "0.18.0-SNAPSHOT" }); int exitCode = commandLine.execute(args); System.exit(exitCode); diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index b6c64e6e..843d9775 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -23,7 +23,7 @@ package defaults const ( // Version -- - Version = "0.17.0-SNAPSHOT" + Version = "0.18.0-SNAPSHOT" // LocalRepository -- LocalRepository = "/tmp/artifacts/m2"