You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/08/19 16:27:31 UTC
[camel] branch camel-2.23.x updated (f6fc117 -> 418067d)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from f6fc117 Fixing Karaf itests when not run with bash
new 9e6df18 Fixing Camel Script feature
new 418067d Fixing Camel Olingo4 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:
platforms/karaf/features/src/main/resources/features.xml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
[camel] 01/02: Fixing Camel Script feature
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9e6df185c5ed9ac7f4f1039c7cc39b0eeba335a8
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 17 15:22:59 2019 +0100
Fixing Camel Script feature
---
platforms/karaf/features/src/main/resources/features.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0a69699..4754e65 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1995,6 +1995,10 @@
</feature>
<feature name='camel-script-groovy' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-script</feature>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle>
+ <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
<bundle>mvn:org.codehaus.groovy/groovy/${groovy-version}</bundle>
<bundle>mvn:org.codehaus.groovy/groovy-jsr223/${groovy-version}</bundle>
</feature>
[camel] 02/02: Fixing Camel Olingo4 feature
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 418067db14a3b8981c0c3089beaced2b7f2f3ce9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 17 15:15:39 2019 +0100
Fixing Camel Olingo4 feature
---
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 4754e65..b6d3e40 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1709,11 +1709,11 @@
<feature>http</feature>
<bundle dependency='true'>mvn:org.apache.olingo/odata-commons-api/${olingo4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.olingo/odata-commons-core/${olingo4-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.olingo/odata-server-api/${olingo4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.olingo/odata-client-api/${olingo4-version}</bundle>
<!--TODO remove wrap protocol when https://issues.apache.org/jira/browse/OLINGO-1206 is resolved-->
+ <bundle dependency='true'>wrap:mvn:org.apache.olingo/odata-server-api/${olingo4-version}$overwrite=merge&Export-Package=org.apache.olingo.server.api;version=${olingo4-version},org.apache.olingo.server.api.uri;version=${olingo4-version},org.apache.olingo.server.api.processor;version=${olingo4-version},org.apache.olingo.server.api.batch;version=${olingo4-version},org.apache.olingo.server.api.debug;version=${olingo4-version},org.apache.olingo.server.api.deserializer;version=${olingo [...]
<bundle dependency='true'>wrap:mvn:org.apache.olingo/odata-server-core/${olingo4-version}$overwrite=merge&Export-Package=org.apache.olingo.server.core;version=${olingo4-version},org.apache.olingo.server.core.uri.parser;version=${olingo4-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.olingo/odata-client-api/${olingo4-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.olingo/odata-client-core/${olingo4-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.olingo/odata-client-core/${olingo4-version}$overwrite=merge&Export-Package=org.apache.olingo.client.core;version=${olingo4-version},org.apache.olingo.client.core.domain;version=${olingo4-version},org.apache.olingo.client.core.http;version=${olingo4-version},org.apache.olingo.client.core.communication.request.batch;version=${olingo4-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-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>