Fix apache#1574: fix examples

nicolaferraro · Sep 15, 2020 · 969c86f · 969c86f
1 parent 7be3c75
commit 969c86f
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 40 deletions.
diff --git 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.4.0
-    camel.apache.org/catalog.loader.version: 3.4.0
+    camel.apache.org/catalog.version: 3.5.0-SNAPSHOT
+    camel.apache.org/catalog.loader.version: 3.5.0-SNAPSHOT
     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.4.0
-      quarkus.version: 1.6.0.Final
-      camel-quarkus.version: 1.0.0-CR3
+      camel.version: 3.5.0-SNAPSHOT
+      quarkus.version: 1.7.0.Final
+      camel-quarkus.version: 1.0.0
     dependencies:
     - groupId: org.apache.camel.k
       artifactId: camel-k-runtime-main
@@ -94,6 +94,15 @@ 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
@@ -193,6 +202,15 @@ 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
@@ -299,6 +317,15 @@ 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
@@ -595,6 +622,15 @@ 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
@@ -780,6 +816,15 @@ 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
@@ -1288,6 +1333,15 @@ 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
@@ -2200,6 +2254,15 @@ 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
@@ -2794,6 +2857,15 @@ 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
@@ -21,8 +21,8 @@ metadata:
   name: camel-catalog-1.5.1-snapshot-quarkus
   labels:
     app: camel-k
-    camel.apache.org/catalog.version: 3.4.0
-    camel.apache.org/catalog.loader.version: 3.4.0
+    camel.apache.org/catalog.version: 3.5.0-SNAPSHOT
+    camel.apache.org/catalog.loader.version: 3.5.0-SNAPSHOT
     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.4.0
-      quarkus.version: 1.6.0.Final
-      camel-quarkus.version: 1.0.0-CR3
+      camel.version: 3.5.0-SNAPSHOT
+      quarkus.version: 1.7.0.Final
+      camel-quarkus.version: 1.0.0
     dependencies:
     - groupId: org.apache.camel.k
       artifactId: camel-k-runtime-quarkus
@@ -1045,6 +1045,13 @@ 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
@@ -1128,6 +1135,15 @@ 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
diff --git a/examples/kamelets/fake-usage.groovy b/examples/kamelets/fake-usage.groovy
diff --git a/examples/kamelets/timer.kamelet.yaml b/examples/kamelets/timer.kamelet.yaml
@@ -11,6 +11,11 @@ spec:
     required:
       - message
     properties:
+      period:
+        title: Period
+        description: The time interval between two events
+        type: integer
+        default: 1000
       message:
         title: Message
         description: The message to generate
@@ -24,7 +29,9 @@ spec:
   flow:
     from:
       uri: timer:tick
+      parameters:
+        period: "{{period}}"
       steps:
         - set-body:
-            constant: "Hello [here there'll be the message] !!!"
-        - to: "log:info"
+            constant: "{{message}}"
+        - to: "direct:{{routeId}}"
diff --git a/examples/kamelets/usage.groovy b/examples/kamelets/usage.groovy
@@ -1,4 +1,5 @@
-// camel-k: language=groovy
+// camel-k: language=groovy dependency=mvn:org.apache.camel.k:camel-kamelet:1.5.1-SNAPSHOT
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,5 +17,5 @@
  * limitations under the License.
  */
 
-from('kamelet:timer')
-    .to('log:info')
+from('kamelet:timer?message=Hello+Kamelets&period=1000')
+    .log('${body}')