[
https://issues.apache.org/jira/browse/CAMEL-12549?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16572104#comment-16572104
]
ASF GitHub Bot commented on CAMEL-12549:
----------------------------------------
onderson closed pull request #2458: CAMEL-12549 - fix karaf features except
upgrading camel-script karaf
URL: https://github.com/apache/camel/pull/2458
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 315f99725b5..cfeb2a0bea0 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 28aa265f861..b504ce5967e 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 5509b22fd32..b2567fc1a13 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4482,6 +4482,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>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 08d2d413a6a..74d003e7c4f 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 7dde85659b8..4aa5a92d866 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Upgrade to Groovy 2.5
> ---------------------
>
> Key: CAMEL-12549
> URL: https://issues.apache.org/jira/browse/CAMEL-12549
> Project: Camel
> Issue Type: Task
> Components: camel-groovy
> Reporter: Claus Ibsen
> Assignee: Önder Sezgin
> Priority: Minor
> Fix For: 2.23.0
>
>
> Groovy 2.5 was just released.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
