Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(e2e): various cleaning #6019

Merged
merged 2 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
** xref:languages/java.adoc[Java]
** xref:languages/yaml.adoc[YAML]
** xref:languages/xml.adoc[XML]
** xref:languages/groovy.adoc[Groovy]
* xref:configuration/configuration.adoc[Configuration]
** xref:configuration/dependencies.adoc[Dependencies]
** xref:configuration/build-time-properties.adoc[Build time properties]
Expand Down
1 change: 0 additions & 1 deletion docs/modules/ROOT/pages/languages/languages.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Camel K supports multiple languages for writing integrations:
| xref:languages/java.adoc[Java] | Integrations written in Java DSL are supported
| xref:languages/xml.adoc[XML] | Integrations written in plain XML DSL are supported (Spring XML with <beans> or Blueprint XML with <blueprint> not supported)
| xref:languages/yaml.adoc[YAML] | Integrations written in YAML DSL are supported
| xref:languages/groovy.adoc[Groovy] | Groovy `.groovy` files are supported (experimental)
|=======================

More information about each language is located in the language specific sections. Mind that the compatibility of each DSL with Camel will depend on the runtime you'll use to run the Integration.
32 changes: 0 additions & 32 deletions e2e/common/misc/files/registry/FoobarDecryption.java

This file was deleted.

30 changes: 0 additions & 30 deletions e2e/common/misc/files/registry/LaughingRoute.java

This file was deleted.

32 changes: 0 additions & 32 deletions e2e/common/misc/files/registry/classpath/Xslt.java

This file was deleted.

37 changes: 0 additions & 37 deletions e2e/common/misc/files/registry/classpath/cheese.xsl

This file was deleted.

1 change: 0 additions & 1 deletion e2e/common/misc/files/registry/laugh.txt

This file was deleted.

1 change: 0 additions & 1 deletion e2e/common/misc/files/registry/laughs/haha.txt

This file was deleted.

1 change: 0 additions & 1 deletion e2e/common/misc/files/registry/laughs/hehe.txt

This file was deleted.

Binary file not shown.
20 changes: 0 additions & 20 deletions e2e/common/misc/files/registry/sample-decryption-1.0.pom

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions e2e/native/native_with_sources_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,5 @@ func TestNativeHighMemoryIntegrations(t *testing.T) {

})

t.Run("groovy native support", func(t *testing.T) {
name := RandomizedSuffixName("groovy-native")
g.Expect(KamelRun(t, ctx, ns, "files/Groovy.groovy", "--name", name, "-t", "quarkus.build-mode=native", "-t", "builder.tasks-limit-memory=quarkus-native:9.5Gi").Execute()).To(Succeed())

g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutVeryLong).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationPod(t, ctx, ns, name), TestTimeoutShort).
Should(WithTransform(getContainerCommand(), MatchRegexp(".*camel-k-integration-\\d+\\.\\d+\\.\\d+[-A-Za-z]*-runner.*")))
g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))

g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Groovy Magicstring!"))
})

})
}
4 changes: 4 additions & 0 deletions pkg/apis/camel/v1/common_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -502,18 +502,22 @@ const (
// LanguageJavaSource used for Java.
LanguageJavaSource Language = "java"
// LanguageGroovy used for Groovy.
// Deprecated: language no longer supported.
LanguageGroovy Language = "groovy"
// LanguageJavaScript used for Javascript.
// Deprecated: language no longer supported.
LanguageJavaScript Language = "js"
// LanguageXML used for XML.
LanguageXML Language = "xml"
// LanguageKotlin used for Kotlin.
// Deprecated: language no longer supported.
LanguageKotlin Language = "kts"
// LanguageYaml used for YAML.
LanguageYaml Language = "yaml"
// LanguageKamelet used for Kamelets.
LanguageKamelet Language = "kamelet"
// LanguageJavaShell used for Java Shell.
// Deprecated: language no longer supported.
LanguageJavaShell Language = "jsh"
)

Expand Down
Loading