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
commit d25af5749569cc48cb66b3749ce14b1913a1ee12
Author: Nicola Ferraro <ni.ferr...@gmail.com>
AuthorDate: Thu Jul 16 15:29:23 2020 +0200
Upgrade to staged Camel K runtime 1.4.0 (Camel 3.4.0,Camel-Quarkus
1.0.0-CR3, Quarkus 1.6.0.Final)
---
...3.0-main.yaml => camel-catalog-1.4.0-main.yaml} | 34 ++++++++---
...arkus.yaml => camel-catalog-1.4.0-quarkus.yaml} | 70 +++++++++++++++++++---
pkg/metadata/metadata_dependencies_test.go | 1 +
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 4 +-
5 files changed, 92 insertions(+), 19 deletions(-)
diff --git a/deploy/camel-catalog-1.3.0-main.yaml
b/deploy/camel-catalog-1.4.0-main.yaml
similarity index 99%
rename from deploy/camel-catalog-1.3.0-main.yaml
rename to deploy/camel-catalog-1.4.0-main.yaml
index 8923ce8..3a45448 100644
--- a/deploy/camel-catalog-1.3.0-main.yaml
+++ b/deploy/camel-catalog-1.4.0-main.yaml
@@ -18,22 +18,22 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.3.0-main
+ name: camel-catalog-1.4.0-main
labels:
app: camel-k
- camel.apache.org/catalog.version: 3.3.0
- camel.apache.org/catalog.loader.version: 3.3.0
- camel.apache.org/runtime.version: 1.3.0
+ camel.apache.org/catalog.version: 3.4.0
+ camel.apache.org/catalog.loader.version: 3.4.0
+ camel.apache.org/runtime.version: 1.4.0
camel.apache.org/runtime.provider: main
spec:
runtime:
- version: 1.3.0
+ version: 1.4.0
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
- camel.version: 3.3.0
- quarkus.version: 1.5.0.Final
- camel-quarkus.version: 1.0.0-CR2
+ camel.version: 3.4.0
+ quarkus.version: 1.6.0.Final
+ camel-quarkus.version: 1.0.0-CR3
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime-main
@@ -2072,6 +2072,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.undertow.UndertowComponent
+ camel-resteasy:
+ groupId: org.apache.camel
+ artifactId: camel-resteasy
+ schemes:
+ - id: resteasy
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.resteasy.ResteasyComponent
camel-robotframework:
groupId: org.apache.camel
artifactId: camel-robotframework
@@ -3086,6 +3095,15 @@ spec:
passive: true
javaTypes:
- org.apache.camel.component.validator.ValidatorComponent
+ camel-aws2-athena:
+ groupId: org.apache.camel
+ artifactId: camel-aws2-athena
+ schemes:
+ - id: aws2-athena
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.aws2.athena.Athena2Component
camel-k-loader-yaml:
groupId: org.apache.camel.k
artifactId: camel-k-loader-yaml
diff --git a/deploy/camel-catalog-1.3.0-quarkus.yaml
b/deploy/camel-catalog-1.4.0-quarkus.yaml
similarity index 96%
rename from deploy/camel-catalog-1.3.0-quarkus.yaml
rename to deploy/camel-catalog-1.4.0-quarkus.yaml
index 044b526..973c68c 100644
--- a/deploy/camel-catalog-1.3.0-quarkus.yaml
+++ b/deploy/camel-catalog-1.4.0-quarkus.yaml
@@ -18,22 +18,22 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.3.0-quarkus
+ name: camel-catalog-1.4.0-quarkus
labels:
app: camel-k
- camel.apache.org/catalog.version: 3.3.0
- camel.apache.org/catalog.loader.version: 3.3.0
- camel.apache.org/runtime.version: 1.3.0
+ camel.apache.org/catalog.version: 3.4.0
+ camel.apache.org/catalog.loader.version: 3.4.0
+ camel.apache.org/runtime.version: 1.4.0
camel.apache.org/runtime.provider: quarkus
spec:
runtime:
- version: 1.3.0
+ version: 1.4.0
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
- camel.version: 3.3.0
- quarkus.version: 1.5.0.Final
- camel-quarkus.version: 1.0.0-CR2
+ camel.version: 3.4.0
+ quarkus.version: 1.6.0.Final
+ camel-quarkus.version: 1.0.0-CR3
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime-quarkus
@@ -135,6 +135,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.influxdb.InfluxDbComponent
+ camel-quarkus-mock:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-mock
+ schemes:
+ - id: mock
+ http: false
+ passive: true
+ javaTypes:
+ - org.apache.camel.component.mock.MockComponent
camel-quarkus-kubernetes:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-kubernetes
@@ -232,6 +241,24 @@ spec:
- soapjaxb
javaTypes:
- org.apache.camel.dataformat.soap.SoapJaxbDataFormat
+ camel-quarkus-tika:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-tika
+ schemes:
+ - id: tika
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.tika.TikaComponent
+ camel-quarkus-jolt:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-jolt
+ schemes:
+ - id: jolt
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.jolt.JoltComponent
camel-quarkus-validator:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-validator
@@ -429,6 +456,15 @@ spec:
- tarfile
javaTypes:
- org.apache.camel.dataformat.tarfile.TarFileDataFormat
+ camel-quarkus-vertx:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-vertx
+ schemes:
+ - id: vertx
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.vertx.VertxComponent
camel-quarkus-jira:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-jira
@@ -984,6 +1020,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.aws2.sqs.Sqs2Component
+ camel-quarkus-aws2-athena:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-aws2-athena
+ schemes:
+ - id: aws2-athena
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.aws2.athena.Athena2Component
camel-quarkus-cassandraql:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-cassandraql
@@ -1018,6 +1063,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.servicenow.ServiceNowComponent
+ camel-quarkus-json-validator:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-json-validator
+ schemes:
+ - id: json-validator
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.jsonvalidator.JsonValidatorComponent
camel-quarkus-grpc:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-grpc
diff --git a/pkg/metadata/metadata_dependencies_test.go
b/pkg/metadata/metadata_dependencies_test.go
index 5f1b93e..0a3e8cc 100644
--- a/pkg/metadata/metadata_dependencies_test.go
+++ b/pkg/metadata/metadata_dependencies_test.go
@@ -185,6 +185,7 @@ func TestDependenciesQuarkus(t *testing.T) {
[]string{
"camel-quarkus:http",
"camel-quarkus:log",
+ "camel-quarkus:mock",
"camel-quarkus:timer",
"camel-quarkus:twitter",
"camel-quarkus:direct",
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 51d7270..e0135d9 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.1.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.3.0"
+ DefaultRuntimeVersion = "1.4.0"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 91583d5..4352f09 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.1.0-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.0
-RUNTIME_VERSION := 1.3.0
+RUNTIME_VERSION := 1.4.0
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk11:slim
@@ -30,7 +30,7 @@ LINT_DEADLINE := 10m
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO :=
+STAGING_RUNTIME_REPO :=
https://repository.apache.org/content/repositories/orgapachecamel-1228
# When packaging artifacts into the docker image, you can "copy" them from
local maven
# or "download" them from Apache Snapshots and Maven Central
