Skip to content

Commit

Permalink
CAMEL-21203: Remove camel-jsh-dsl
Browse files Browse the repository at this point in the history
  • Loading branch information
davsclaus committed Oct 7, 2024
1 parent 95b3301 commit ff89854
Show file tree
Hide file tree
Showing 28 changed files with 11 additions and 750 deletions.
5 changes: 0 additions & 5 deletions bom/camel-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1212,11 +1212,6 @@
<artifactId>camel-jsch</artifactId>
<version>4.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jsh-dsl</artifactId>
<version>4.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jslt</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jasypt
java-joor-dsl
jfr
js-dsl
jsh-dsl
jta
kamelet-main
langchain4j-tokenizer
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public static void prepareSourceLocation(Resource resource, NamedNode node) {
node.setLocation(resource.getLocation());

String ext = FileUtil.onlyExt(resource.getLocation(), true);
if ("groovy".equals(ext) || "js".equals(ext) || "jsh".equals(ext)) {
if ("groovy".equals(ext) || "js".equals(ext)) {
// we cannot get line number for groovy/java-script/java-shell
return;
}
Expand Down
1 change: 0 additions & 1 deletion docs/components/modules/others/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*** xref:groovy-dsl.adoc[Groovy DSL]
*** xref:java-joor-dsl.adoc[Java DSL (runtime compiled)]
*** xref:js-dsl.adoc[JavaScript DSL]
*** xref:jsh-dsl.adoc[JavaShell DSL]
*** xref:java-xml-jaxb-dsl.adoc[Jaxb XML Dsl]
*** xref:kamelet-main.adoc[Kamelet Main]
*** xref:java-xml-io-dsl.adoc[XML Io Dsl]
Expand Down
1 change: 0 additions & 1 deletion docs/components/modules/others/pages/jsh-dsl.adoc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ via `@TestInstance(TestInstance.Lifecycle.PER_CLASS)`), as this is considered a
future.
The logs will print a warning message if this behavior is detected.

=== Removed deprecated components

The following components has been removed

- `camel-jsh-dsl` - This DSL was an experiment. The Camel team is only focusing on Java, XML and YAML DSL.

=== Removed API

==== Kotlin DSL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,6 @@ protected Set<String> resolveDependencies(File settings, File profile) throws Ex
answer.add("mvn:org.apache.camel:camel-groovy-dsl");
} else if ("js".equals(ext)) {
answer.add("mvn:org.apache.camel:camel-js-dsl");
} else if ("jsh".equals(ext)) {
answer.add("mvn:org.apache.camel:camel-jsh-dsl");
} else if ("xml".equals(ext)) {
answer.add("mvn:org.apache.camel:camel-xml-io-dsl");
} else if ("yaml".equals(ext)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private static void resolveGistAsRawFiles(
} else if (routes != null) {
if ("java".equalsIgnoreCase(ext) || "xml".equalsIgnoreCase(ext)
|| "yaml".equalsIgnoreCase(ext)
|| "groovy".equalsIgnoreCase(ext) || "js".equalsIgnoreCase(ext) || "jsh".equalsIgnoreCase(ext)) {
|| "groovy".equalsIgnoreCase(ext) || "js".equalsIgnoreCase(ext)) {
String rawUrl = c.get("raw_url").asText();
String u = asGistSingleUrl(rawUrl);
routes.add(u);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ private static void resolveGithubAsRawFiles(
} else if (routes != null) {
if ("java".equalsIgnoreCase(ext) || "xml".equalsIgnoreCase(ext)
|| "yaml".equalsIgnoreCase(ext) || "camel.yaml".equalsIgnoreCase(ext)
|| "groovy".equalsIgnoreCase(ext) || "js".equalsIgnoreCase(ext)
|| "jsh".equalsIgnoreCase(ext)) {
|| "groovy".equalsIgnoreCase(ext) || "js".equalsIgnoreCase(ext)) {
String htmlUrl = c.get("html_url").asText();
String u = asGithubSingleUrl(htmlUrl);
routes.add(u);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public final class ProcessHelper {

private static final String[] DSL_EXT = new String[] { "groovy", "java", "js", "jsh", "xml", "yaml" };
private static final String[] DSL_EXT = new String[] { "groovy", "java", "js", "xml", "yaml" };
private static final Pattern PATTERN = Pattern.compile("([\\w|\\-.])+");

private ProcessHelper() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
public class SourceHelper {

private static final String[] ACCEPTED_FILE_EXT
= new String[] { "java", "groovy", "js", "jsh", "xml", "yaml" };
= new String[] { "java", "groovy", "js", "xml", "yaml" };

public static Source resolveSource(String source) {
List<Source> resolved = resolveSources(Collections.singletonList(source));
Expand Down

This file was deleted.

132 changes: 0 additions & 132 deletions dsl/camel-jsh-dsl/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions dsl/camel-jsh-dsl/src/generated/resources/jsh-dsl.json

This file was deleted.

54 changes: 0 additions & 54 deletions dsl/camel-jsh-dsl/src/main/docs/jsh-dsl.adoc

This file was deleted.

Loading

0 comments on commit ff89854

Please sign in to comment.