[camel] branch master updated: CAMEL-12549 - fix karaf features except upgrading camel-script karaf and the component

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch master updated: CAMEL-12549 - fix karaf features except upgrading camel-script karaf and the component

onders-2
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


The following commit(s) were added to refs/heads/master by this push:
     new 5132fa4  CAMEL-12549 - fix karaf features except upgrading camel-script karaf and the component
5132fa4 is described below

commit 5132fa452a80b2e2e1b1b860e198b1490f284c6a
Author: onders <[hidden email]>
AuthorDate: Tue Aug 7 19:27:23 2018 +0300

    CAMEL-12549 - fix karaf features except upgrading camel-script karaf and the component
---
 .../org/apache/camel/component/grape/MavenCoordinates.groovy  |  8 ++++----
 components/camel-script/pom.xml                               | 11 ++++++++++-
 parent/pom.xml                                                |  5 +++++
 platforms/karaf/features/src/main/resources/features.xml      |  6 +++---
 pom.xml                                                       |  1 +
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy
index 315f997..cfeb2a0 100644
--- a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy
+++ b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/MavenCoordinates.groovy
@@ -21,13 +21,13 @@ import groovy.transform.ImmutableBase
 @ImmutableBase
 class MavenCoordinates {
 
-    private final String groupId
+    private String groupId
 
-    private final String artifactId
+    private String artifactId
 
-    private final String version
+    private String version
 
-    private final String classifier
+    private String classifier
 
     static MavenCoordinates parseMavenCoordinates(String coordinates) {
         def coordinatesParts = coordinates.split('/')
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 28aa265..b504ce5 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -78,16 +78,25 @@
             <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>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>${groovy-2415-version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby-complete</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5509b22..b2567fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4484,6 +4484,11 @@
       <!-- optional scripting support -->
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <version>${groovy-2415-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy</artifactId>
         <version>${groovy-version}</version>
       </dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 08d2d41..74d003e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -819,7 +819,7 @@
   </feature>
   <feature name='camel-grape' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
+    <bundle dependency='true'>mvn:org.codehaus.groovy/groovy/${groovy-version}</bundle>
     <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-grape/${project.version}</bundle>
@@ -827,7 +827,7 @@
   <feature name='camel-groovy' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
+    <bundle dependency='true'>mvn:org.codehaus.groovy/groovy/${groovy-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-groovy/${project.version}</bundle>
   </feature>
   <feature name='camel-grpc' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1940,7 +1940,7 @@
   </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-version}</bundle>
+    <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-2415-version}</bundle>
   </feature>
   <feature name='camel-script' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
diff --git a/pom.xml b/pom.xml
index 7dde856..4aa5a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
     <mycila-license-version>3.0</mycila-license-version>
     <gmavenplus-plugin-version>1.5</gmavenplus-plugin-version>
     <groovy-version>2.5.1</groovy-version>
+    <groovy-2415-version>2.4.15</groovy-2415-version>
   </properties>
 
   <mailingLists>