[camel-k] branch master updated: chore(release): fix versions and minor things and prepare for next release

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel-k] branch master updated: chore(release): fix versions and minor things and prepare for next release

nferraro
This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new aed5b16  chore(release): fix versions and minor things and prepare for next release
aed5b16 is described below

commit aed5b1609b236f90805d801a3c879fd4325f9390
Author: Nicola Ferraro <[hidden email]>
AuthorDate: Wed Nov 13 13:49:57 2019 +0100

    chore(release): fix versions and minor things and prepare for next release
---
 ...HOT.yaml => camel-catalog-3.0.0-RC3-1.0.7.yaml} | 70 ++++++++++------
 ...yaml => camel-catalog-quarkus-0.3.1-1.0.7.yaml} | 17 ++--
 deploy/resources.go                                | 92 ++++++++++++++--------
 pkg/builder/runtime/main_test.go                   |  2 -
 pkg/builder/runtime/quarkus.go                     | 17 ++++
 pkg/util/camel/catalog.go                          |  3 +-
 pkg/util/defaults/defaults.go                      | 16 ++--
 release.adoc                                       |  7 +-
 script/Makefile                                    | 20 ++---
 9 files changed, 157 insertions(+), 87 deletions(-)

diff --git a/deploy/camel-catalog-3.0.0-RC1-1.0.7-SNAPSHOT.yaml b/deploy/camel-catalog-3.0.0-RC3-1.0.7.yaml
similarity index 98%
rename from deploy/camel-catalog-3.0.0-RC1-1.0.7-SNAPSHOT.yaml
rename to deploy/camel-catalog-3.0.0-RC3-1.0.7.yaml
index 5ae9694..f0b4455 100644
--- a/deploy/camel-catalog-3.0.0-RC1-1.0.7-SNAPSHOT.yaml
+++ b/deploy/camel-catalog-3.0.0-RC3-1.0.7.yaml
@@ -18,15 +18,15 @@
 apiVersion: camel.apache.org/v1alpha1
 kind: CamelCatalog
 metadata:
-  name: camel-catalog-3.0.0-rc1-1.0.7-snapshot
+  name: camel-catalog-3.0.0-rc3-1.0.7
   labels:
     app: camel-k
-    camel.apache.org/catalog.version: 3.0.0-RC1
-    camel.apache.org/catalog.loader.version: 3.0.0-RC1
-    camel.apache.org/runtime.version: 1.0.7-SNAPSHOT
+    camel.apache.org/catalog.version: 3.0.0-RC3
+    camel.apache.org/catalog.loader.version: 3.0.0-RC3
+    camel.apache.org/runtime.version: 1.0.7
 spec:
-  version: 3.0.0-RC1
-  runtimeVersion: 1.0.7-SNAPSHOT
+  version: 3.0.0-RC3
+  runtimeVersion: 1.0.7
   artifacts:
     camel-activemq:
       groupId: org.apache.camel
@@ -267,6 +267,13 @@ spec:
       - id: aws-swf
         http: false
         passive: false
+    camel-aws-translate:
+      groupId: org.apache.camel
+      artifactId: camel-aws-translate
+      schemes:
+      - id: aws-translate
+        http: false
+        passive: false
     camel-azure:
       groupId: org.apache.camel
       artifactId: camel-azure
@@ -524,6 +531,13 @@ spec:
       - id: dataset-test
         http: false
         passive: false
+    camel-debezium:
+      groupId: org.apache.camel
+      artifactId: camel-debezium
+      schemes:
+      - id: debezium
+        http: false
+        passive: false
     camel-digitalocean:
       groupId: org.apache.camel
       artifactId: camel-digitalocean
@@ -807,6 +821,13 @@ spec:
       - id: grape
         http: false
         passive: false
+    camel-graphql:
+      groupId: org.apache.camel
+      artifactId: camel-graphql
+      schemes:
+      - id: graphql
+        http: false
+        passive: false
     camel-grok:
       groupId: org.apache.camel
       artifactId: camel-grok
@@ -1221,14 +1242,18 @@ spec:
         artifactId: camel-core-engine
       - groupId: org.apache.camel
         artifactId: camel-main
-      - groupId: org.apache.camel
-        artifactId: camel-properties
     camel-k-runtime-servlet:
       groupId: org.apache.camel.k
       artifactId: camel-k-runtime-servlet
       dependencies:
       - groupId: org.apache.camel
         artifactId: camel-servlet
+    camel-k-runtime-webhook:
+      groupId: org.apache.camel.k
+      artifactId: camel-k-runtime-webhook
+      dependencies:
+      - groupId: org.apache.camel
+        artifactId: camel-webhook
     camel-kafka:
       groupId: org.apache.camel
       artifactId: camel-kafka
@@ -1453,13 +1478,6 @@ spec:
       - id: mongodb-gridfs
         http: false
         passive: false
-    camel-mqtt:
-      groupId: org.apache.camel
-      artifactId: camel-mqtt
-      schemes:
-      - id: mqtt
-        http: false
-        passive: false
     camel-msv:
       groupId: org.apache.camel
       artifactId: camel-msv
@@ -1618,13 +1636,6 @@ spec:
       - id: lpr
         http: false
         passive: false
-    camel-properties:
-      groupId: org.apache.camel
-      artifactId: camel-properties
-      schemes:
-      - id: properties
-        http: false
-        passive: true
     camel-protobuf:
       groupId: org.apache.camel
       artifactId: camel-protobuf
@@ -1696,12 +1707,12 @@ spec:
       - id: rest-swagger
         http: false
         passive: false
-    camel-restlet:
+    camel-robotframework:
       groupId: org.apache.camel
-      artifactId: camel-restlet
+      artifactId: camel-robotframework
       schemes:
-      - id: restlet
-        http: true
+      - id: robotframework
+        http: false
         passive: false
     camel-rss:
       groupId: org.apache.camel
@@ -2138,6 +2149,13 @@ spec:
       - id: xchange
         http: false
         passive: false
+    camel-xj:
+      groupId: org.apache.camel
+      artifactId: camel-xj
+      schemes:
+      - id: xj
+        http: false
+        passive: false
     camel-xmlsecurity:
       groupId: org.apache.camel
       artifactId: camel-xmlsecurity
diff --git a/deploy/camel-catalog-quarkus-0.3.0-1.0.7-SNAPSHOT.yaml b/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
similarity index 96%
rename from deploy/camel-catalog-quarkus-0.3.0-1.0.7-SNAPSHOT.yaml
rename to deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
index 9b87bfb..1c77541 100644
--- a/deploy/camel-catalog-quarkus-0.3.0-1.0.7-SNAPSHOT.yaml
+++ b/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
@@ -18,20 +18,20 @@
 apiVersion: camel.apache.org/v1alpha1
 kind: CamelCatalog
 metadata:
-  name: camel-catalog-quarkus-0.3.0-1.0.7-snapshot
+  name: camel-catalog-quarkus-0.3.1-1.0.7
   labels:
     app: camel-k
     camel.apache.org/catalog.version: 3.0.0-RC3
     camel.apache.org/catalog.loader.version: 3.0.0-RC3
-    camel.apache.org/runtime.version: 1.0.7-SNAPSHOT
+    camel.apache.org/runtime.version: 1.0.7
     camel.apache.org/runtime.provider: quarkus
 spec:
   version: 3.0.0-RC3
-  runtimeVersion: 1.0.7-SNAPSHOT
+  runtimeVersion: 1.0.7
   runtimeProvider:
     quarkus:
-      camelQuarkusVersion: 0.3.0
-      quarkusVersion: 0.26.1
+      camelQuarkusVersion: 0.3.1
+      quarkusVersion: 0.27.0
   artifacts:
     camel-k-loader-groovy:
       groupId: org.apache.camel.k
@@ -267,6 +267,13 @@ spec:
       - id: paho
         http: false
         passive: false
+    camel-quarkus-pdf:
+      groupId: org.apache.camel.quarkus
+      artifactId: camel-quarkus-pdf
+      schemes:
+      - id: pdf
+        http: false
+        passive: false
     camel-quarkus-rest:
       groupId: org.apache.camel.quarkus
       artifactId: camel-quarkus-rest
diff --git a/deploy/resources.go b/deploy/resources.go
index 85bc6df..4607011 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -6942,7 +6942,7 @@ spec:
         passive: false
 
 `
- Resources["camel-catalog-3.0.0-RC1-1.0.7-SNAPSHOT.yaml"] =
+ Resources["camel-catalog-3.0.0-RC3-1.0.7.yaml"] =
  `
 # ---------------------------------------------------------------------------
 # Licensed to the Apache Software Foundation (ASF) under one or more
@@ -6964,15 +6964,15 @@ spec:
 apiVersion: camel.apache.org/v1alpha1
 kind: CamelCatalog
 metadata:
-  name: camel-catalog-3.0.0-rc1-1.0.7-snapshot
+  name: camel-catalog-3.0.0-rc3-1.0.7
   labels:
     app: camel-k
-    camel.apache.org/catalog.version: 3.0.0-RC1
-    camel.apache.org/catalog.loader.version: 3.0.0-RC1
-    camel.apache.org/runtime.version: 1.0.7-SNAPSHOT
+    camel.apache.org/catalog.version: 3.0.0-RC3
+    camel.apache.org/catalog.loader.version: 3.0.0-RC3
+    camel.apache.org/runtime.version: 1.0.7
 spec:
-  version: 3.0.0-RC1
-  runtimeVersion: 1.0.7-SNAPSHOT
+  version: 3.0.0-RC3
+  runtimeVersion: 1.0.7
   artifacts:
     camel-activemq:
       groupId: org.apache.camel
@@ -7213,6 +7213,13 @@ spec:
       - id: aws-swf
         http: false
         passive: false
+    camel-aws-translate:
+      groupId: org.apache.camel
+      artifactId: camel-aws-translate
+      schemes:
+      - id: aws-translate
+        http: false
+        passive: false
     camel-azure:
       groupId: org.apache.camel
       artifactId: camel-azure
@@ -7470,6 +7477,13 @@ spec:
       - id: dataset-test
         http: false
         passive: false
+    camel-debezium:
+      groupId: org.apache.camel
+      artifactId: camel-debezium
+      schemes:
+      - id: debezium
+        http: false
+        passive: false
     camel-digitalocean:
       groupId: org.apache.camel
       artifactId: camel-digitalocean
@@ -7753,6 +7767,13 @@ spec:
       - id: grape
         http: false
         passive: false
+    camel-graphql:
+      groupId: org.apache.camel
+      artifactId: camel-graphql
+      schemes:
+      - id: graphql
+        http: false
+        passive: false
     camel-grok:
       groupId: org.apache.camel
       artifactId: camel-grok
@@ -8167,14 +8188,18 @@ spec:
         artifactId: camel-core-engine
       - groupId: org.apache.camel
         artifactId: camel-main
-      - groupId: org.apache.camel
-        artifactId: camel-properties
     camel-k-runtime-servlet:
       groupId: org.apache.camel.k
       artifactId: camel-k-runtime-servlet
       dependencies:
       - groupId: org.apache.camel
         artifactId: camel-servlet
+    camel-k-runtime-webhook:
+      groupId: org.apache.camel.k
+      artifactId: camel-k-runtime-webhook
+      dependencies:
+      - groupId: org.apache.camel
+        artifactId: camel-webhook
     camel-kafka:
       groupId: org.apache.camel
       artifactId: camel-kafka
@@ -8399,13 +8424,6 @@ spec:
       - id: mongodb-gridfs
         http: false
         passive: false
-    camel-mqtt:
-      groupId: org.apache.camel
-      artifactId: camel-mqtt
-      schemes:
-      - id: mqtt
-        http: false
-        passive: false
     camel-msv:
       groupId: org.apache.camel
       artifactId: camel-msv
@@ -8564,13 +8582,6 @@ spec:
       - id: lpr
         http: false
         passive: false
-    camel-properties:
-      groupId: org.apache.camel
-      artifactId: camel-properties
-      schemes:
-      - id: properties
-        http: false
-        passive: true
     camel-protobuf:
       groupId: org.apache.camel
       artifactId: camel-protobuf
@@ -8642,12 +8653,12 @@ spec:
       - id: rest-swagger
         http: false
         passive: false
-    camel-restlet:
+    camel-robotframework:
       groupId: org.apache.camel
-      artifactId: camel-restlet
+      artifactId: camel-robotframework
       schemes:
-      - id: restlet
-        http: true
+      - id: robotframework
+        http: false
         passive: false
     camel-rss:
       groupId: org.apache.camel
@@ -9084,6 +9095,13 @@ spec:
       - id: xchange
         http: false
         passive: false
+    camel-xj:
+      groupId: org.apache.camel
+      artifactId: camel-xj
+      schemes:
+      - id: xj
+        http: false
+        passive: false
     camel-xmlsecurity:
       groupId: org.apache.camel
       artifactId: camel-xmlsecurity
@@ -9159,7 +9177,7 @@ spec:
         passive: false
 
 `
- Resources["camel-catalog-quarkus-0.3.0-1.0.7-SNAPSHOT.yaml"] =
+ Resources["camel-catalog-quarkus-0.3.1-1.0.7.yaml"] =
  `
 # ---------------------------------------------------------------------------
 # Licensed to the Apache Software Foundation (ASF) under one or more
@@ -9181,20 +9199,20 @@ spec:
 apiVersion: camel.apache.org/v1alpha1
 kind: CamelCatalog
 metadata:
-  name: camel-catalog-quarkus-0.3.0-1.0.7-snapshot
+  name: camel-catalog-quarkus-0.3.1-1.0.7
   labels:
     app: camel-k
     camel.apache.org/catalog.version: 3.0.0-RC3
     camel.apache.org/catalog.loader.version: 3.0.0-RC3
-    camel.apache.org/runtime.version: 1.0.7-SNAPSHOT
+    camel.apache.org/runtime.version: 1.0.7
     camel.apache.org/runtime.provider: quarkus
 spec:
   version: 3.0.0-RC3
-  runtimeVersion: 1.0.7-SNAPSHOT
+  runtimeVersion: 1.0.7
   runtimeProvider:
     quarkus:
-      camelQuarkusVersion: 0.3.0
-      quarkusVersion: 0.26.1
+      camelQuarkusVersion: 0.3.1
+      quarkusVersion: 0.27.0
   artifacts:
     camel-k-loader-groovy:
       groupId: org.apache.camel.k
@@ -9430,6 +9448,13 @@ spec:
       - id: paho
         http: false
         passive: false
+    camel-quarkus-pdf:
+      groupId: org.apache.camel.quarkus
+      artifactId: camel-quarkus-pdf
+      schemes:
+      - id: pdf
+        http: false
+        passive: false
     camel-quarkus-rest:
       groupId: org.apache.camel.quarkus
       artifactId: camel-quarkus-rest
@@ -9498,6 +9523,7 @@ spec:
       artifactId: camel-quarkus-zipfile
       dataformats:
       - zipfile
+
 `
  Resources["crd-build.yaml"] =
  `
diff --git a/pkg/builder/runtime/main_test.go b/pkg/builder/runtime/main_test.go
index cbddc8d..f149325 100644
--- a/pkg/builder/runtime/main_test.go
+++ b/pkg/builder/runtime/main_test.go
@@ -144,7 +144,6 @@ func TestGenerateJvmProject(t *testing.T) {
  {GroupID: "org.apache.camel.k", ArtifactID: "camel-k-runtime-main"},
  {GroupID: "org.apache.camel", ArtifactID: "camel-core-engine"},
  {GroupID: "org.apache.camel", ArtifactID: "camel-main"},
- {GroupID: "org.apache.camel", ArtifactID: "camel-properties"},
  },
  )
 }
@@ -205,7 +204,6 @@ func TestGenerateGroovyProject(t *testing.T) {
  {GroupID: "org.apache.camel", ArtifactID: "camel-core-engine"},
  {GroupID: "org.apache.camel", ArtifactID: "camel-main"},
  {GroupID: "org.apache.camel", ArtifactID: "camel-groovy"},
- {GroupID: "org.apache.camel", ArtifactID: "camel-properties"},
  {GroupID: "org.apache.camel", ArtifactID: "camel-endpointdsl"},
  },
  )
diff --git a/pkg/builder/runtime/quarkus.go b/pkg/builder/runtime/quarkus.go
index 480fbac..bd6d92a 100644
--- a/pkg/builder/runtime/quarkus.go
+++ b/pkg/builder/runtime/quarkus.go
@@ -1,3 +1,20 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package runtime
 
 import (
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index 6a9b6da..7da219c 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -55,8 +55,7 @@ func QuarkusCatalog() (*RuntimeCatalog, error) {
  }
  }
 
- // FIXME: to be replaced with catalogForRuntimeProvider when 1.0.7 is released
- return findBestMatch(catalogs, "3.0.0-RC3", "1.0.7-SNAPSHOT", v1alpha1.QuarkusRuntimeProvider{
+ return catalogForRuntimeProvider(v1alpha1.QuarkusRuntimeProvider{
  CamelQuarkusVersion: defaults.CamelQuarkusVersionConstraint,
  QuarkusVersion:      defaults.DefaultQuarkusVersion,
  })
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 6d0fe1c..d677be3 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -25,28 +25,28 @@ const (
  Version = "1.0.0-M4-SNAPSHOT"
 
  // DefaultCamelVersion --
- DefaultCamelVersion = "3.0.0-RC1"
+ DefaultCamelVersion = "3.0.0-RC3"
 
  // CamelVersionConstraint --
- CamelVersionConstraint = ">=3.0.0-RC1"
+ CamelVersionConstraint = ">=3.0.0-RC3"
 
  // DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.0.6"
+ DefaultRuntimeVersion = "1.0.7"
 
  // RuntimeVersionConstraint --
- RuntimeVersionConstraint = ">=1.0.5"
+ RuntimeVersionConstraint = ">=1.0.7"
 
  // DefaultCamelQuarkusVersion --
- DefaultCamelQuarkusVersion = "0.3.0"
+ DefaultCamelQuarkusVersion = "0.3.1"
 
  // CamelQuarkusVersionConstraint --
- CamelQuarkusVersionConstraint = ">=0.3.0"
+ CamelQuarkusVersionConstraint = ">=0.3.1"
 
  // DefaultQuarkusVersion --
- DefaultQuarkusVersion = "0.26.1"
+ DefaultQuarkusVersion = "0.27.0"
 
  // QuarkusVersionConstraint --
- QuarkusVersionConstraint = ">=0.26.1"
+ QuarkusVersionConstraint = ">=0.27.0"
 
  // KanikoVersion --
  KanikoVersion = "0.9.0"
diff --git a/release.adoc b/release.adoc
index da05be0..c6be111 100644
--- a/release.adoc
+++ b/release.adoc
@@ -51,8 +51,13 @@ First thing is to checkout master branch and sync with upstream.
 
 Next, the version of the runtime libraries to use need to be aligned in the Makefile (use the just released camel-k-runtime version if available).
 
+The following tasks need to be done:
+- Align RUNTIME_VERSION and RUNTIME_VERSION_CONSTRAINT in Makefile to latest runtime release
+- Align all libraries to the ones used in the chosen runtime (e.g. CAMEL_QUARKUS_VERSION and QUARKUS_VERSION, plus CONTRAINTs)
+- Set STAGING_RUNTIME_REPO to the URL of the staging repo (if using a staged camel-k-runtime version)
+- Ensure LAST_RELEASED_VERSION points to latest released version of Camel K
+
 ```
-# Align RUNTIME_VERSION and RUNTIME_VERSION_CONSTRAINT with latest runtime release, then
 make clean codegen set-version build-resources check-licenses
 ```
 
diff --git a/script/Makefile b/script/Makefile
index ed86f6b..99e56e8 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -15,15 +15,15 @@
 
 VERSIONFILE := pkg/util/defaults/defaults.go
 VERSION := 1.0.0-M4-SNAPSHOT
-LAST_RELEASED_VERSION := 1.0.0-M2
-RUNTIME_VERSION := 1.0.6
-RUNTIME_VERSION_CONSTRAINT := >=1.0.5
-CAMEL_VERSION := 3.0.0-RC1
-CAMEL_VERSION_CONSTRAINT := >=3.0.0-RC1
-CAMEL_QUARKUS_VERSION := 0.3.0
-CAMEL_QUARKUS_VERSION_CONSTRAINT := >=0.3.0
-QUARKUS_VERSION := 0.26.1
-QUARKUS_VERSION_CONSTRAINT := >=0.26.1
+LAST_RELEASED_VERSION := 1.0.0-M3
+RUNTIME_VERSION := 1.0.7
+RUNTIME_VERSION_CONSTRAINT := >=1.0.7
+CAMEL_VERSION := 3.0.0-RC3
+CAMEL_VERSION_CONSTRAINT := >=3.0.0-RC3
+CAMEL_QUARKUS_VERSION := 0.3.1
+CAMEL_QUARKUS_VERSION_CONSTRAINT := >=0.3.1
+QUARKUS_VERSION := 0.27.0
+QUARKUS_VERSION_CONSTRAINT := >=0.27.0
 KANIKO_VERSION := 0.9.0
 BASE_IMAGE := fabric8/s2i-java:3.0-java8
 LOCAL_REPOSITORY := /tmp/artifacts/m2
@@ -36,7 +36,7 @@ LINT_DEADLINE := 5m
 # Used to push pre-relase artifacts
 STAGING_IMAGE_NAME := docker.io/camelk/camel-k
 
-STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1160
+STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1162
 
 # When packaging artifacts into the docker image, you can "copy" them from local maven
 # or "download" them from Apache Snapshots and Maven Central