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 b16214ce533bf3b91d4a578e31d7cb9e6ce78e2b
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Wed Sep 2 16:46:38 2020 +0200
Fix #1668: restore catalog
---
deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml | 82 ++----------------------
deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml | 26 ++------
deploy/resources.go | 8 +--
3 files changed, 14 insertions(+), 102 deletions(-)
diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
b/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
index 405b36f..966d5e7 100644
--- a/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
+++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
@@ -21,8 +21,8 @@ metadata:
name: camel-catalog-1.5.1-snapshot-main
labels:
app: camel-k
- camel.apache.org/catalog.version: 3.5.0-SNAPSHOT
- camel.apache.org/catalog.loader.version: 3.5.0-SNAPSHOT
+ camel.apache.org/catalog.version: 3.4.0
+ camel.apache.org/catalog.loader.version: 3.4.0
camel.apache.org/runtime.version: 1.5.1-SNAPSHOT
camel.apache.org/runtime.provider: main
spec:
@@ -31,9 +31,9 @@ spec:
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
- camel.version: 3.5.0-SNAPSHOT
- quarkus.version: 1.7.0.Final
- camel-quarkus.version: 1.0.0
+ 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
@@ -94,15 +94,6 @@ spec:
javaTypes:
- org.apache.camel.component.azure.blob.BlobServiceComponent
- org.apache.camel.component.azure.queue.QueueServiceComponent
- camel-vertx-websocket:
- groupId: org.apache.camel
- artifactId: camel-vertx-websocket
- schemes:
- - id: vertx-websocket
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.vertx.websocket.VertxWebsocketComponent
camel-seda:
groupId: org.apache.camel
artifactId: camel-seda
@@ -202,15 +193,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.sjms2.Sjms2Component
- camel-vertx-http:
- groupId: org.apache.camel
- artifactId: camel-vertx-http
- schemes:
- - id: vertx-http
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.vertx.http.VertxHttpComponent
camel-facebook:
groupId: org.apache.camel
artifactId: camel-facebook
@@ -317,15 +299,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.aws2.iam.IAM2Component
- camel-jsonata:
- groupId: org.apache.camel
- artifactId: camel-jsonata
- schemes:
- - id: jsonata
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.jsonata.JsonataComponent
camel-aws-eks:
groupId: org.apache.camel
artifactId: camel-aws-eks
@@ -622,15 +595,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.weka.WekaComponent
- camel-azure-eventhubs:
- groupId: org.apache.camel
- artifactId: camel-azure-eventhubs
- schemes:
- - id: azure-eventhubs
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.azure.eventhubs.EventHubsComponent
camel-jacksonxml:
groupId: org.apache.camel
artifactId: camel-jacksonxml
@@ -816,15 +780,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.salesforce.SalesforceComponent
- camel-minio:
- groupId: org.apache.camel
- artifactId: camel-minio
- schemes:
- - id: minio
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.minio.MinioComponent
camel-xj:
groupId: org.apache.camel
artifactId: camel-xj
@@ -1333,15 +1288,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.guava.eventbus.GuavaEventBusComponent
- camel-aws2-sts:
- groupId: org.apache.camel
- artifactId: camel-aws2-sts
- schemes:
- - id: aws2-sts
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws2.sts.STS2Component
camel-msv:
groupId: org.apache.camel
artifactId: camel-msv
@@ -2254,15 +2200,6 @@ spec:
- groovy
javaTypes:
- org.apache.camel.language.groovy.GroovyLanguage
- camel-arangodb:
- groupId: org.apache.camel
- artifactId: camel-arangodb
- schemes:
- - id: arangodb
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.arangodb.ArangoDbComponent
camel-saga:
groupId: org.apache.camel
artifactId: camel-saga
@@ -2857,15 +2794,6 @@ spec:
- grok
javaTypes:
- org.apache.camel.component.grok.GrokDataFormat
- camel-oaipmh:
- groupId: org.apache.camel
- artifactId: camel-oaipmh
- schemes:
- - id: oaipmh
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.oaipmh.component.OAIPMHComponent
camel-mvel:
groupId: org.apache.camel
artifactId: camel-mvel
diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
index db61e37..7e18efe 100644
--- a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
+++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
@@ -21,8 +21,8 @@ metadata:
name: camel-catalog-1.5.1-snapshot-quarkus
labels:
app: camel-k
- camel.apache.org/catalog.version: 3.5.0-SNAPSHOT
- camel.apache.org/catalog.loader.version: 3.5.0-SNAPSHOT
+ camel.apache.org/catalog.version: 3.4.0
+ camel.apache.org/catalog.loader.version: 3.4.0
camel.apache.org/runtime.version: 1.5.1-SNAPSHOT
camel.apache.org/runtime.provider: quarkus
spec:
@@ -31,9 +31,9 @@ spec:
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
- camel.version: 3.5.0-SNAPSHOT
- quarkus.version: 1.7.0.Final
- camel-quarkus.version: 1.0.0
+ 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
@@ -1045,13 +1045,6 @@ spec:
- zipfile
javaTypes:
- org.apache.camel.dataformat.zipfile.ZipFileDataFormat
- camel-quarkus-grok:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-grok
- dataformats:
- - grok
- javaTypes:
- - org.apache.camel.component.grok.GrokDataFormat
camel-quarkus-servlet:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-servlet
@@ -1135,15 +1128,6 @@ spec:
- org.apache.camel.component.openstack.neutron.NeutronComponent
- org.apache.camel.component.openstack.nova.NovaComponent
- org.apache.camel.component.openstack.swift.SwiftComponent
- camel-quarkus-jpa:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-jpa
- schemes:
- - id: jpa
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.jpa.JpaComponent
camel-quarkus-consul:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-consul
diff --git a/deploy/resources.go b/deploy/resources.go
index d6b8d97..0741e84 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -91,16 +91,16 @@ var assets = func() http.FileSystem {
"/camel-catalog-1.5.1-SNAPSHOT-main.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel-catalog-1.5.1-SNAPSHOT-main.yaml",
modTime: time.Time{},
- uncompressedSize: 91183,
+ uncompressedSize: 89178,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x35\xdd\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf4\x24\x99\x79\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x92\x65\xff\xfa\xb3\x70\xe1\x55\x10\x24\x12\x86\xd7\xf6\x83\x49\x11\x55\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x34\x79\xbd\xbf\x77\xef\xa3\x6b\x92\xe0\x82\xe3\x34\x12\x34\x12\x4b\x1c\x9d\x96\x28\x59\xe2\x28\xa6\x73\xf1\x84\x18\x8e\x2e\xe8\xba\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x86\x35\xdd\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf2\x24\x99\x79\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x92\x65\xff\xfa\xb3\x70\xe1\x55\x10\x24\x12\x86\xd7\xf6\x83\x49\x11\x55\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x14\xbf\xde\xdf\xbb\xf7\xd1\x35\x49\x70\xc1\x71\x1a\x09\x1a\x89\x25\x8e\x4e\x4b\x94\x2c\x71\x34\xa5\x73\xf1\x84\x18\x8e\x2e\xe8\xba\x
[...]
},
"/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 49504,
+ uncompressedSize: 49034,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\xaa\xd2\xff\x7d\x3e\x85\x56\x73\x73\xce\x5a\x5b\xec\x7d\xd2\xff\xde\xff\xb5\xfa\x5c\x25\x69\xd3\x26\x6d\x5e\x5a\xe7\xb4\xdd\xfb\xa6\x0b\x4b\xd8\x26\x96\x40\x01\x64\x3b\xf9\xf4\xcf\x02\x21\x4b\xb2\x95\xd1\x4b\xc0\x4f\x2e\x22\x59\x0c\xbf\x81\x01\xc1\x68\x98\x81\xe3\x20\x74\xf7\x77\x74\x1c\x7c\xa1\x11\x61\x92\xc4\x81\xe2\x81\x5a\x90\xe0\x34\xc3\xd1\x82\x04\x13\x3e\x53\x6b\x2c\x48\x70\xc1\x73\x16\x63\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\xaa\xf2\xf7\x7d\x3e\x85\x56\x73\x73\xce\x5a\x5b\xec\x7d\xd2\xb3\xf7\x45\x9f\xab\x24\x6d\xda\xa4\x4d\x9a\xc6\x39\x6d\xf7\xbe\xe9\xc2\x12\xb6\x89\x25\x50\x00\xd9\x4e\x3e\xfd\xb3\x40\xc8\x92\x6c\x65\xf4\x12\xf0\x3f\x17\x91\x2c\x86\xdf\xc0\x80\x60\x34\xcc\xc0\x71\x10\xba\xfb\x3b\x3a\x0e\xbe\xd0\x88\x30\x49\xe2\x40\xf1\x40\x2d\x48\x70\x9a\xe1\x68\x41\x82\x09\x9f\xa9\x35\x16\x24\xb8\xe0\x39\x8b\xb1\xa2\x
[...]
},
"/cr-example.yaml": &vfsgen۰CompressedFileInfo{
name: "cr-example.yaml",
