Fix tests related to recent camel-k-runtime changes

This PR brought knative from camel-quarkus apache/camel-k-runtime#927
squakez · Nov 24, 2022 · 6653a21 · 6653a21
1 parent 80cdea5
commit 6653a21
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 50 deletions.
diff --git a/pkg/metadata/metadata_dependencies_test.go b/pkg/metadata/metadata_dependencies_test.go
@@ -309,7 +309,7 @@ func TestLanguageDependencies(t *testing.T) {
 			"camel:jsonpath",
 			"camel:groovy",
 			"camel:saxon",
-			"camel:xml-jaxp",
+			"camel:stax",
 		},
 		meta.Dependencies.List())
 }
@@ -662,7 +662,7 @@ func TestXMLLanguageDependencies(t *testing.T) {
 			"camel:mvel",
 			"camel:ognl",
 			"camel:xpath",
-			"camel:xml-jaxp",
+			"camel:stax",
 			"camel:jsonpath",
 			"camel:saxon",
 			"camel:groovy",
@@ -787,7 +787,7 @@ func TestYAMLLanguageDependencies(t *testing.T) {
 			"camel:jsonpath",
 			"camel:groovy",
 			"camel:saxon",
-			"camel:xml-jaxp",
+			"camel:stax",
 		},
 		meta.Dependencies.List())
 }
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
diff --git a/pkg/util/source/inspector_yaml_test.go b/pkg/util/source/inspector_yaml_test.go
@@ -111,53 +111,48 @@ func TestYAMLDependencies(t *testing.T) {
 		missingDependencies []string
 	}{
 		{
-			name:                "consumer",
-			source:              YAMLRouteConsumer,
-			dependencies:        []string{`mvn:org.apache.camel.k:camel-k-knative-consumer`},
-			missingDependencies: []string{`mvn:org.apache.camel.k:camel-k-knative-producer`},
+			name:         "consumer",
+			source:       YAMLRouteConsumer,
+			dependencies: []string{`camel:knative`},
 		},
 		{
-			name:                "producer",
-			source:              YAMLRouteProducer,
-			dependencies:        []string{`mvn:org.apache.camel.k:camel-k-knative-producer`},
-			missingDependencies: []string{`mvn:org.apache.camel.k:camel-k-knative-consumer`},
+			name:         "producer",
+			source:       YAMLRouteProducer,
+			dependencies: []string{`camel:knative`},
 		},
 		{
 			name:   "transformer",
 			source: YAMLRouteTransformer,
 			dependencies: []string{
-				`mvn:org.apache.camel.k:camel-k-knative-producer`,
-				`mvn:org.apache.camel.k:camel-k-knative-consumer`,
+				`camel:knative`,
 			},
 		},
 		{
 			name:   "invalid",
 			source: YAMLInvalid,
 			dependencies: []string{
-				`mvn:org.apache.camel.k:camel-k-knative-consumer`,
+				`camel:knative`,
 			},
 		},
 		{
 			name:   "in-depth",
 			source: YAMLInDepthChannel,
 			dependencies: []string{
-				`mvn:org.apache.camel.k:camel-k-knative-producer`,
-				`mvn:org.apache.camel.k:camel-k-knative-consumer`,
+				`camel:knative`,
 			},
 		},
 		{
 			name:   "wire-tap-knative",
 			source: YAMLWireTapKnativeEIP,
 			dependencies: []string{
-				`mvn:org.apache.camel.k:camel-k-knative-producer`,
-				`mvn:org.apache.camel.k:camel-k-knative-consumer`,
+				`camel:knative`,
 			},
 		},
 		{
 			name:   "wire-tap-jms",
 			source: YAMLWireTapJmsEIP,
 			dependencies: []string{
-				`mvn:org.apache.camel.k:camel-k-knative-consumer`,
+				`camel:knative`,
 				`camel:jms`,
 			},
 		},

diff --git a/pkg/util/test/catalog_test.go b/pkg/util/test/catalog_test.go
@@ -34,8 +34,8 @@ func TestRuntimeContainsEmbeddedArtifacts(t *testing.T) {
 
 	artifact := catalog.GetArtifactByScheme("knative")
 	assert.Equal(t, 1, len(artifact.Schemes))
-	assert.Equal(t, "org.apache.camel.k", artifact.GroupID)
-	assert.Equal(t, "camel-k-knative", artifact.ArtifactID)
+	assert.Equal(t, "org.apache.camel.quarkus", artifact.GroupID)
+	assert.Equal(t, "camel-quarkus-knative", artifact.ArtifactID)
 
 	scheme, found := catalog.GetScheme("knative")
 	assert.True(t, found)

diff --git a/resources/camel-catalog-1.16.0-SNAPSHOT.yaml b/resources/camel-catalog-1.16.0-SNAPSHOT.yaml
@@ -21,18 +21,18 @@ metadata:
   name: camel-catalog-1.16.0-snapshot
   labels:
     app: camel-k
-    camel.apache.org/catalog.loader.version: 3.18.3
-    camel.apache.org/catalog.version: 3.18.3
+    camel.apache.org/catalog.loader.version: 3.19.0
+    camel.apache.org/catalog.version: 3.19.0
     camel.apache.org/runtime.version: 1.16.0-SNAPSHOT
 spec:
   runtime:
     version: 1.16.0-SNAPSHOT
     provider: quarkus
     applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
     metadata:
-      camel-quarkus.version: 2.13.1
-      camel.version: 3.18.3
-      quarkus.version: 2.13.4.Final
+      camel-quarkus.version: 2.14.0
+      camel.version: 3.19.0
+      quarkus.version: 2.14.0.Final
     dependencies:
     - groupId: org.apache.camel.k
       artifactId: camel-k-runtime
@@ -75,21 +75,6 @@ spec:
     camel-k-cron:
       groupId: org.apache.camel.k
       artifactId: camel-k-cron
-    camel-k-knative:
-      groupId: org.apache.camel.k
-      artifactId: camel-k-knative
-      schemes:
-      - id: knative
-        http: true
-        passive: false
-        producer:
-          dependencies:
-          - groupId: org.apache.camel.k
-            artifactId: camel-k-knative-producer
-        consumer:
-          dependencies:
-          - groupId: org.apache.camel.k
-            artifactId: camel-k-knative-consumer
     camel-k-master:
       groupId: org.apache.camel.k
       artifactId: camel-k-master
@@ -1630,6 +1615,15 @@ spec:
         passive: false
       javaTypes:
       - org.apache.camel.component.kamelet.KameletComponent
+    camel-quarkus-knative:
+      groupId: org.apache.camel.quarkus
+      artifactId: camel-quarkus-knative
+      schemes:
+      - id: knative
+        http: true
+        passive: false
+      javaTypes:
+      - org.apache.camel.component.knative.KnativeComponent
     camel-quarkus-kubernetes:
       groupId: org.apache.camel.quarkus
       artifactId: camel-quarkus-kubernetes
@@ -2428,8 +2422,11 @@ spec:
       - id: stax
         http: false
         passive: false
+      languages:
+      - xtokenize
       javaTypes:
       - org.apache.camel.component.stax.StAXComponent
+      - org.apache.camel.language.xtokenizer.XMLTokenizeLanguage
     camel-quarkus-stitch:
       groupId: org.apache.camel.quarkus
       artifactId: camel-quarkus-stitch
@@ -2673,13 +2670,6 @@ spec:
         passive: false
       javaTypes:
       - org.apache.camel.component.xj.XJComponent
-    camel-quarkus-xml-jaxp:
-      groupId: org.apache.camel.quarkus
-      artifactId: camel-quarkus-xml-jaxp
-      languages:
-      - xtokenize
-      javaTypes:
-      - org.apache.camel.language.xtokenizer.XMLTokenizeLanguage
     camel-quarkus-xmlsecurity:
       groupId: org.apache.camel.quarkus
       artifactId: camel-quarkus-xmlsecurity