You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2018/08/13 12:27:47 UTC
[camel] branch master updated (4b584ad -> 363f53d)
This is an automated email from the ASF dual-hosted git repository.
onders pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4b584ad Regen after typo fix
new fb4cee8 CAMEL-12715: Fixed camel-script dependencies
new 363f53d CAMEL-12715: Fixed the camel-script-groovy feature
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:
components/camel-script/pom.xml | 9 ---------
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
2 files changed, 2 insertions(+), 10 deletions(-)
[camel] 02/02: CAMEL-12715: Fixed the camel-script-groovy feature
Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 363f53dba60efec5bf7fa6e6c6757ddec7052336
Author: aldettinger <al...@gmail.com>
AuthorDate: Sun Aug 12 14:03:02 2018 +0200
CAMEL-12715: Fixed the camel-script-groovy feature
---
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 74d003e..413a8d6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1940,7 +1940,8 @@
</feature>
<feature name='camel-script-groovy' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-script</feature>
- <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-2415-version}</bundle>
+ <bundle>mvn:org.codehaus.groovy/groovy/${groovy-version}</bundle>
+ <bundle>mvn:org.codehaus.groovy/groovy-jsr223/${groovy-version}</bundle>
</feature>
<feature name='camel-script' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
[camel] 01/02: CAMEL-12715: Fixed camel-script dependencies
Posted by on...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fb4cee8633350f38e6e47d3b88fb88a8e792634d
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Aug 10 19:26:15 2018 +0200
CAMEL-12715: Fixed camel-script dependencies
---
components/camel-script/pom.xml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index b504ce5..177e794 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -78,23 +78,14 @@
<version>${jython-version}</version>
<scope>test</scope>
</dependency>
- <!-- for camel-script groovy upgrade requires rework as camel-itest-karaf fails to succeed
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>test</scope>
</dependency>
- -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
- <version>${groovy-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy-2415-version}</version>
<scope>test</scope>
</dependency>
<dependency>