You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2021/04/09 10:49:06 UTC
[camel-k] 01/03: Align to camel-quarkus 1.8.0
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 10137d6edd0348fedb47649f56ee0f6cb5ebf226
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Mon Mar 29 15:44:02 2021 +0200
Align to camel-quarkus 1.8.0
---
deploy/camel-catalog-1.7.0-SNAPSHOT.yaml | 209 ++++++++-----------------------
pkg/resources/resources.go | 8 +-
pkg/trait/dependencies_test.go | 8 +-
3 files changed, 59 insertions(+), 166 deletions(-)
diff --git a/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml b/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
index 492c513..1c0f03f 100644
--- a/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
+++ b/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
@@ -21,8 +21,8 @@ metadata:
name: camel-catalog-1.7.0-snapshot
labels:
app: camel-k
- camel.apache.org/catalog.loader.version: 3.8.0
- camel.apache.org/catalog.version: 3.8.0
+ camel.apache.org/catalog.loader.version: 3.9.0
+ camel.apache.org/catalog.version: 3.9.0
camel.apache.org/runtime.version: 1.7.0-SNAPSHOT
spec:
runtime:
@@ -30,9 +30,9 @@ spec:
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- camel-quarkus.version: 1.7.0
- camel.version: 3.8.0
- quarkus.version: 1.12.0.Final
+ camel-quarkus.version: 1.8.0
+ camel.version: 3.9.0
+ quarkus.version: 1.13.0.Final
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime
@@ -253,127 +253,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.avro.AvroComponent
- camel-quarkus-aws-ec2:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-ec2
- schemes:
- - id: aws-ec2
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.ec2.EC2Component
- camel-quarkus-aws-ecs:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-ecs
- schemes:
- - id: aws-ecs
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.ecs.ECSComponent
- camel-quarkus-aws-eks:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-eks
- schemes:
- - id: aws-eks
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.eks.EKSComponent
- camel-quarkus-aws-iam:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-iam
- schemes:
- - id: aws-iam
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.iam.IAMComponent
- camel-quarkus-aws-kinesis:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-kinesis
- schemes:
- - id: aws-kinesis
- http: false
- passive: false
- - id: aws-kinesis-firehose
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.firehose.KinesisFirehoseComponent
- - org.apache.camel.component.aws.kinesis.KinesisComponent
- camel-quarkus-aws-kms:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-kms
- schemes:
- - id: aws-kms
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.kms.KMSComponent
- camel-quarkus-aws-lambda:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-lambda
- schemes:
- - id: aws-lambda
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.lambda.LambdaComponent
- camel-quarkus-aws-s3:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-s3
- schemes:
- - id: aws-s3
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.s3.S3Component
- camel-quarkus-aws-sdb:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-sdb
- schemes:
- - id: aws-sdb
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.sdb.SdbComponent
- camel-quarkus-aws-sns:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-sns
- schemes:
- - id: aws-sns
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.sns.SnsComponent
- camel-quarkus-aws-sqs:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-sqs
- schemes:
- - id: aws-sqs
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.sqs.SqsComponent
- camel-quarkus-aws-swf:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-swf
- schemes:
- - id: aws-swf
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.swf.SWFComponent
- camel-quarkus-aws-translate:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-aws-translate
- schemes:
- - id: aws-translate
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.aws.translate.TranslateComponent
camel-quarkus-aws2-athena:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-aws2-athena
@@ -553,19 +432,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.aws2.translate.Translate2Component
- camel-quarkus-azure:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-azure
- schemes:
- - id: azure-blob
- http: false
- passive: false
- - id: azure-queue
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.component.azure.blob.BlobServiceComponent
- - org.apache.camel.component.azure.queue.QueueServiceComponent
camel-quarkus-azure-eventhubs:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-azure-eventhubs
@@ -584,6 +450,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.azure.storage.blob.BlobComponent
+ camel-quarkus-azure-storage-datalake:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-azure-storage-datalake
+ schemes:
+ - id: azure-storage-datalake
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.azure.storage.datalake.DataLakeComponent
camel-quarkus-azure-storage-queue:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-azure-storage-queue
@@ -1412,6 +1287,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.http.HttpComponent
+ camel-quarkus-huaweicloud-smn:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-huaweicloud-smn
+ schemes:
+ - id: hwcloud-smn
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.huaweicloud.smn.SimpleNotificationComponent
camel-quarkus-ical:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-ical
@@ -2163,6 +2047,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.paho.PahoComponent
+ camel-quarkus-paho-mqtt5:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-paho-mqtt5
+ schemes:
+ - id: paho-mqtt5
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.paho.mqtt5.PahoMqtt5Component
camel-quarkus-pdf:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-pdf
@@ -2570,6 +2463,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.stax.StAXComponent
+ camel-quarkus-stitch:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-stitch
+ schemes:
+ - id: stitch
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.stitch.StitchComponent
camel-quarkus-stomp:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-stomp
@@ -2784,15 +2686,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.web3j.Web3jComponent
- camel-quarkus-websocket-jsr356:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-websocket-jsr356
- schemes:
- - id: websocket-jsr356
- http: false
- passive: false
- javaTypes:
- - org.apache.camel.websocket.jsr356.JSR356WebSocketComponent
camel-quarkus-weka:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-weka
@@ -2958,22 +2851,22 @@ spec:
- org.apache.camel.component.zookeepermaster.MasterComponent
loaders:
groovy:
- groupId: org.apache.camel.k
- artifactId: camel-k-loader-groovy
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-groovy-dsl
languages:
- groovy
metadata:
native: "false"
java:
- groupId: org.apache.camel.k
- artifactId: camel-k-loader-java
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-java-joor-dsl
languages:
- java
metadata:
native: "false"
js:
- groupId: org.apache.camel.k
- artifactId: camel-k-loader-js
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-js-dsl
languages:
- js
metadata:
@@ -2986,15 +2879,15 @@ spec:
metadata:
native: "false"
kts:
- groupId: org.apache.camel.k
- artifactId: camel-k-loader-kotlin
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-kotlin-dsl
languages:
- kts
metadata:
native: "false"
xml:
- groupId: org.apache.camel.k
- artifactId: camel-k-loader-xml
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-xml-io-dsl
languages:
- xml
metadata:
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index a99a3eb..6c1391c 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -467,16 +467,16 @@ var assets = func() http.FileSystem {
"/camel-catalog-1.7.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{
name: "camel-catalog-1.7.0-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 90737,
+ uncompressedSize: 87684,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\xcb\x76\xdb\x38\xb6\xf6\xdc\x4f\xc1\x55\x99\x9c\xb3\xfe\x16\xba\x4a\xe9\xd3\x75\x56\xfd\x23\x5b\x8e\x13\x3b\xb6\xe3\x44\xee\x24\x5d\x93\x5a\x10\x09\x49\xb0\x48\x82\x06\x40\x49\xce\xd3\x9f\x85\x0b\xaf\x52\x36\x2f\x06\xd4\x1e\x98\x14\xb1\xf1\x6d\xec\x0f\x17\x12\x1b\xb7\x37\xc1\xc4\xdd\xdf\xd9\x9b\xe0\x96\x86\x24\x15\x24\x0a\x24\x0b\xe4\x9a\x04\xe7\x19\x0e\xd7\x24\x98\xb3\xa5\xdc\x61\x4e\x82\x2b\x96\xa7\x11\x96\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\x96\xee\xdc\xbf\x82\xeb\x64\xd2\xbd\x6e\x09\x75\x4e\x52\xb7\x4f\xdf\xdc\x91\x2d\xc7\x89\x1d\xcb\x76\x22\x57\x92\xaa\xc9\x59\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\xef\x85\x07\x9f\x52\x36\x1f\x02\xd4\x1a\x88\x20\xb1\xf1\x6d\xec\x0f\x0f\x12\xef\x37\xc1\xc4\xdd\xef\xec\x4d\x70\x4b\x43\x92\x0a\x12\x05\x92\x05\x72\x4d\x82\xf3\x0c\x87\x6b\x12\xcc\xd9\x52\xbe\x60\x4e\x82\x2b\x96\xa7\x11\x96\x94\x [...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 37013,
+ uncompressedSize: 36939,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xed\x72\x1c\xb7\x11\xe0\x7f\x3d\x05\x8a\xb9\x2a\x7e\xd4\xee\x90\x72\xca\xb1\xc3\x3b\x5d\x8a\x96\x94\x84\xb6\x25\xf1\x44\xd9\xa9\x2b\x9f\x2b\x8b\x9d\xe9\xdd\x85\x88\x01\x26\x00\x66\xa9\xf5\xd5\xbd\xfb\x15\xba\x01\x0c\x66\x76\xb8\x5c\xca\xa6\xcb\xbc\xba\xe4\x87\x45\x72\xa6\xd1\x68\x34\xfa\xbb\x7b\x9c\xe1\xc2\xd9\xf3\x67\x53\xa6\x78\x0d\xe7\x8c\x2f\x16\x42\x09\xb7\x79\xc6\x58\x23\xb9\x5b\x68\x53\x9f\xb3\x05\x97\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xed\x72\x1c\xb7\x11\xe0\x7f\x3d\x05\x8a\xb9\x2a\x7e\xd4\xee\x90\x72\xca\xb1\xb3\x77\xba\x14\x2d\x29\x09\x6d\x4b\xe2\x89\x8a\x53\x57\x3a\x57\x16\x3b\xd3\xbb\x0b\x11\x03\x4c\x00\x0c\xa9\xcd\xd5\xbd\xfb\x15\xba\x01\x0c\x66\x76\xb8\x5c\xca\xa6\xcb\xbc\xba\xe4\x87\x45\x72\xa6\xd1\x68\x34\xfa\xbb\x7b\x9c\xe1\xc2\xd9\xd9\xb3\x29\x53\xbc\x86\x19\xe3\xcb\xa5\x50\xc2\x6d\x9e\x31\xd6\x48\xee\x96\xda\xd4\x33\xb6\xe4\xd2\x [...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/pkg/trait/dependencies_test.go b/pkg/trait/dependencies_test.go
index c627362..8f8b0ac 100644
--- a/pkg/trait/dependencies_test.go
+++ b/pkg/trait/dependencies_test.go
@@ -85,7 +85,7 @@ func TestIntegrationDefaultDeps(t *testing.T) {
[]string{
"camel-quarkus:direct",
"camel-quarkus:log",
- "mvn:org.apache.camel.k:camel-k-loader-java",
+ "mvn:org.apache.camel.quarkus:camel-quarkus-java-joor-dsl",
"mvn:org.apache.camel.k:camel-k-runtime"},
e.Integration.Status.Dependencies,
)
@@ -133,7 +133,7 @@ func TestIntegrationCustomDeps(t *testing.T) {
"camel-quarkus:log",
"camel:netty-http",
"org.foo:bar",
- "mvn:org.apache.camel.k:camel-k-loader-java",
+ "mvn:org.apache.camel.quarkus:camel-quarkus-java-joor-dsl",
"mvn:org.apache.camel.k:camel-k-runtime"},
e.Integration.Status.Dependencies,
)
@@ -190,8 +190,8 @@ func TestIntegrationAutoGeneratedDeps(t *testing.T) {
"camel-quarkus:direct",
"camel-quarkus:log",
"mvn:org.apache.camel.quarkus:camel-quarkus-rest",
- "mvn:org.apache.camel.k:camel-k-loader-java",
- "mvn:org.apache.camel.k:camel-k-loader-xml",
+ "mvn:org.apache.camel.quarkus:camel-quarkus-java-joor-dsl",
+ "mvn:org.apache.camel.quarkus:camel-quarkus-xml-io-dsl",
"mvn:org.apache.camel.k:camel-k-runtime",
"mvn:org.apache.camel.quarkus:camel-quarkus-platform-http"},
e.Integration.Status.Dependencies,