This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d3d4fcda371 CAMEL-20626: deprecate experimental DSLs
d3d4fcda371 is described below
commit d3d4fcda371a041b996d42127a3e1e8ad77e7c21
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Mar 28 08:54:39 2024 +0100
CAMEL-20626: deprecate experimental DSLs
---
dsl/camel-js-dsl/pom.xml | 2 +-
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
dsl/camel-js-dsl/src/generated/resources/js-dsl.json | 2 +-
dsl/camel-js-dsl/src/main/docs/js-dsl.adoc | 7 ++++---
.../src/main/java/org/apache/camel/dsl/js/JavaScriptDSL.java | 1 +
.../org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java | 3 +++
dsl/camel-jsh-dsl/pom.xml | 2 +-
.../resources/META-INF/services/org/apache/camel/other.properties | 2 +-
dsl/camel-jsh-dsl/src/generated/resources/jsh-dsl.json | 2 +-
dsl/camel-jsh-dsl/src/main/docs/jsh-dsl.adoc | 7 ++++---
dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/Jsh.java | 1 +
.../src/main/java/org/apache/camel/dsl/jsh/JshClassLoader.java | 1 +
.../src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java | 1 +
.../main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java | 1 +
14 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/dsl/camel-js-dsl/pom.xml b/dsl/camel-js-dsl/pom.xml
index 19f55857ea7..0001ca5aa41 100644
--- a/dsl/camel-js-dsl/pom.xml
+++ b/dsl/camel-js-dsl/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-js-dsl</artifactId>
<packaging>jar</packaging>
- <name>Camel :: JavaScript DSL</name>
+ <name>Camel :: JavaScript DSL (deprecated)</name>
<description>Camel DSL with JavaScript</description>
<properties>
diff --git
a/dsl/camel-js-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/dsl/camel-js-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 86b25d2be4e..045aae78487 100644
---
a/dsl/camel-js-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++
b/dsl/camel-js-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,6 +3,6 @@ name=js-dsl
groupId=org.apache.camel
artifactId=camel-js-dsl
version=4.5.0-SNAPSHOT
-projectName=Camel :: JavaScript DSL
+projectName=Camel :: JavaScript DSL (deprecated)
projectDescription=Camel DSL with JavaScript
annotations=routes.language=js
diff --git a/dsl/camel-js-dsl/src/generated/resources/js-dsl.json
b/dsl/camel-js-dsl/src/generated/resources/js-dsl.json
index 7b0e58ca926..98bc8e0f971 100644
--- a/dsl/camel-js-dsl/src/generated/resources/js-dsl.json
+++ b/dsl/camel-js-dsl/src/generated/resources/js-dsl.json
@@ -4,7 +4,7 @@
"name": "js-dsl",
"title": "JavaScript DSL",
"description": "Camel DSL with JavaScript",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.9.0",
"label": "dsl",
"supportLevel": "Experimental",
diff --git a/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc
b/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc
index 407216a22bc..28f3414986e 100644
--- a/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc
+++ b/dsl/camel-js-dsl/src/main/docs/js-dsl.adoc
@@ -1,17 +1,18 @@
-= JavaScript DSL Component
+= JavaScript DSL Component (deprecated)
:doctitle: JavaScript DSL
:shortname: js-dsl
:artifactid: camel-js-dsl
:description: Camel DSL with JavaScript
:since: 3.9
-:supportlevel: Experimental
+:supportlevel: Experimental-deprecated
+:deprecated: *deprecated*
:tabs-sync-option:
//Manually maintained attributes
:group: DSL
*Since Camel {since}*
-IMPORTANT: This DSL is experimental support level and is not recommended being
used for production
+IMPORTANT: This DSL is deprecated and experimental support level and is not
recommended being used for production.
The `js-dsl` is used for runtime compiling JavaScript routes in an existing
running Camel integration.
This was invented for Camel K and later ported to Apache Camel.
diff --git
a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptDSL.java
b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptDSL.java
index 24ede56e15f..d3661ecb44f 100644
--- a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptDSL.java
+++ b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptDSL.java
@@ -36,6 +36,7 @@ import
org.apache.camel.model.rest.RestConfigurationDefinition;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.spi.Registry;
+@Deprecated
public class JavaScriptDSL extends BuilderSupport implements
EndpointBuilderFactory {
public final Registry registry;
public final EndpointRouteBuilder builder;
diff --git
a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java
b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java
index d4cc4ff3c49..9153a9706b0 100644
---
a/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java
+++
b/dsl/camel-js-dsl/src/main/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoader.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.js;
import java.io.Reader;
import org.apache.camel.CamelContext;
+import org.apache.camel.Experimental;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.builder.endpoint.EndpointRouteBuilder;
import org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport;
@@ -34,6 +35,8 @@ import static org.graalvm.polyglot.Source.newBuilder;
@ManagedResource(description = "Managed JavaScriptRoutesBuilderLoader")
@RoutesLoader(JavaScriptRoutesBuilderLoader.EXTENSION)
+@Experimental
+@Deprecated
public class JavaScriptRoutesBuilderLoader extends
EndpointRouteBuilderLoaderSupport {
public static final String EXTENSION = "js";
public static final String LANGUAGE_ID = "js";
diff --git a/dsl/camel-jsh-dsl/pom.xml b/dsl/camel-jsh-dsl/pom.xml
index 0c618610255..7ebbd86aa4d 100644
--- a/dsl/camel-jsh-dsl/pom.xml
+++ b/dsl/camel-jsh-dsl/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-jsh-dsl</artifactId>
<packaging>jar</packaging>
- <name>Camel :: JavaShell DSL</name>
+ <name>Camel :: JavaShell DSL (deprecated)</name>
<description>Camel DSL with JavaShell</description>
<properties>
diff --git
a/dsl/camel-jsh-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/dsl/camel-jsh-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index ec144f03eec..98231e827a1 100644
---
a/dsl/camel-jsh-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++
b/dsl/camel-jsh-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,6 +3,6 @@ name=jsh-dsl
groupId=org.apache.camel
artifactId=camel-jsh-dsl
version=4.5.0-SNAPSHOT
-projectName=Camel :: JavaShell DSL
+projectName=Camel :: JavaShell DSL (deprecated)
projectDescription=Camel DSL with JavaShell
annotations=routes.language=jsh
diff --git a/dsl/camel-jsh-dsl/src/generated/resources/jsh-dsl.json
b/dsl/camel-jsh-dsl/src/generated/resources/jsh-dsl.json
index e9764a538d6..a1b97e0e60d 100644
--- a/dsl/camel-jsh-dsl/src/generated/resources/jsh-dsl.json
+++ b/dsl/camel-jsh-dsl/src/generated/resources/jsh-dsl.json
@@ -4,7 +4,7 @@
"name": "jsh-dsl",
"title": "JavaShell DSL",
"description": "Camel DSL with JavaShell",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.15.0",
"label": "dsl",
"supportLevel": "Experimental",
diff --git a/dsl/camel-jsh-dsl/src/main/docs/jsh-dsl.adoc
b/dsl/camel-jsh-dsl/src/main/docs/jsh-dsl.adoc
index e5ae0eba5a9..86a0ba901ca 100644
--- a/dsl/camel-jsh-dsl/src/main/docs/jsh-dsl.adoc
+++ b/dsl/camel-jsh-dsl/src/main/docs/jsh-dsl.adoc
@@ -1,17 +1,18 @@
-= JavaShell DSL Component
+= JavaShell DSL Component (deprecated)
:doctitle: JavaShell DSL
:shortname: jsh-dsl
:artifactid: camel-jsh-dsl
:description: Camel DSL with JavaShell
:since: 3.15
-:supportlevel: Experimental
+:supportlevel: Experimental-deprecated
+:deprecated: *deprecated*
:tabs-sync-option:
//Manually maintained attributes
:group: DSL
*Since Camel {since}*
-IMPORTANT: This DSL is experimental support level and is not recommended being
used for production
+IMPORTANT: This DSL is deprecated and experimental support level and is not
recommended being used for production.
The `jsh-dsl` is used for runtime compiling JavaShell routes in an existing
running Camel integration.
This was invented for Camel K and later ported to Apache Camel.
diff --git a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/Jsh.java
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/Jsh.java
index 8b29d711438..38bb67d4037 100644
--- a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/Jsh.java
+++ b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/Jsh.java
@@ -34,6 +34,7 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public final class Jsh {
private static final Logger LOGGER = LoggerFactory.getLogger(Jsh.class);
private static final ThreadLocal<Map<String, Object>> BINDINGS =
ThreadLocal.withInitial(ConcurrentHashMap::new);
diff --git
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshClassLoader.java
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshClassLoader.java
index 530ba8f9b18..089fd786a21 100644
---
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshClassLoader.java
+++
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshClassLoader.java
@@ -24,6 +24,7 @@ import jdk.jshell.spi.ExecutionControl;
/**
* An implementation of a {@link ClassLoader} that allow hold class bytecode.
*/
+@Deprecated
final class JshClassLoader extends ClassLoader {
private final Map<String, ExecutionControl.ClassBytecodes> types;
diff --git
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
index 11069a93d19..972ccf3aeb3 100644
---
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
+++
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshLoaderDelegate.java
@@ -25,6 +25,7 @@ import jdk.jshell.spi.ExecutionControl;
/**
* A simple implementation of {@link LoaderDelegate} tailored for camel-k use
case.
*/
+@Deprecated
final class JshLoaderDelegate implements LoaderDelegate {
private final JshClassLoader loader;
private final Map<String, Class<?>> types;
diff --git
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
index a614a36d2ac..78d2f7ae4e6 100644
---
a/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
+++
b/dsl/camel-jsh-dsl/src/main/java/org/apache/camel/dsl/jsh/JshRoutesBuilderLoader.java
@@ -44,6 +44,7 @@ import org.apache.camel.util.IOHelper;
@ManagedResource(description = "Managed JShell RoutesBuilderLoader")
@Experimental
@RoutesLoader("jsh")
+@Deprecated
public class JshRoutesBuilderLoader extends RoutesBuilderLoaderSupport {
public static final String EXTENSION = "jsh";
