You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/12/05 06:49:51 UTC
[camel] branch main updated (6efedf23be2 -> 523710323bc)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 6efedf23be2 upgrade opentelemetry to the version 1.20.1
new fbcf967eeb5 Polished
new 523710323bc CAMEL-18784: camel-jbang - Include joor compiler if using csimple language.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-csimple-joor/src/main/docs/csimple-joor.adoc | 2 +-
.../download/DependencyDownloaderLanguageResolver.java | 18 ++++++++++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
[camel] 01/02: Polished
Posted by da...@apache.org.
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
commit fbcf967eeb5fd4e772e3a71b35463adbaff7982b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 5 07:41:08 2022 +0100
Polished
---
components/camel-csimple-joor/src/main/docs/csimple-joor.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc b/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
index 0aefcda23c1..eb0a3ae305e 100644
--- a/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
+++ b/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
@@ -17,7 +17,7 @@ This module includes the jOOR compiler for the csimple language for runtime comp
To use this, just include `camel-csimple-joor` in the classpath.
-NOTE: Java 8 is not supported. Java 11 or 14 is required.
+NOTE: Java 8 is not supported. Java 11 or newer is required.
== Limitations
[camel] 02/02: CAMEL-18784: camel-jbang - Include joor compiler if using csimple language.
Posted by da...@apache.org.
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
commit 523710323bc55c238bdfde987e31ba30129fc5c7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 5 07:49:39 2022 +0100
CAMEL-18784: camel-jbang - Include joor compiler if using csimple language.
---
.../download/DependencyDownloaderLanguageResolver.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
index 7892158abb2..ed8d62c97d5 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderLanguageResolver.java
@@ -43,10 +43,12 @@ public final class DependencyDownloaderLanguageResolver extends DefaultLanguageR
@Override
public Language resolveLanguage(String name, CamelContext context) {
LanguageModel model = catalog.languageModel(name);
- if (model != null && !downloader.alreadyOnClasspath(model.getGroupId(), model.getArtifactId(),
- model.getVersion())) {
- downloader.downloadDependency(model.getGroupId(), model.getArtifactId(),
- model.getVersion());
+ if (model != null) {
+ downloadLoader(model.getArtifactId(), model.getVersion());
+ if ("csimple".equals(name)) {
+ // need to include joor compiler also
+ downloadLoader("camel-csimple-joor", model.getVersion());
+ }
}
Language answer = super.resolveLanguage(name, context);
if (answer == null) {
@@ -59,4 +61,12 @@ public final class DependencyDownloaderLanguageResolver extends DefaultLanguageR
return answer;
}
+ private void downloadLoader(String artifactId, String version) {
+ if (!downloader.alreadyOnClasspath("org.apache.camel", artifactId,
+ version)) {
+ downloader.downloadDependency("org.apache.camel", artifactId,
+ version);
+ }
+ }
+
}