You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/11/29 10:08:44 UTC
[camel] branch master updated (763da15 -> 7efb0fb)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 763da15 Upgrade Chronicle Network to version 1.9.15
new 252cf91 [CAMEL-11856] Use wrap protocol for odata-server-core until OLINGO-1206 is resolved
new 7efb0fb CAMEL-11856 - Fixed comment in Karaf features file
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 | 6 +++---
.../test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].
[camel] 01/02: [CAMEL-11856] Use wrap protocol for
odata-server-core until OLINGO-1206 is resolved
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 252cf91f74b09c981eab69ec983cc4bcb2698c23
Author: jpoth <po...@gmail.com>
AuthorDate: Tue Nov 28 13:01:12 2017 +0100
[CAMEL-11856] Use wrap protocol for odata-server-core until OLINGO-1206 is resolved
---
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
.../test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 696a941..247628d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1607,14 +1607,14 @@
<bundle dependency='true'>mvn:org.apache.camel/camel-olingo2-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-olingo2/${project.version}</bundle>
</feature>
- <!-- TODO: https://issues.apache.org/jira/browse/CAMEL-11856
<feature name='camel-olingo4' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<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-server-core/${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-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'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
@@ -1635,7 +1635,7 @@
<bundle dependency='true'>mvn:com.fasterxml/aalto-xml/0.9.10</bundle>
<bundle dependency='true'>mvn:org.apache.camel/camel-olingo4-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-olingo4/${project.version}</bundle>
- </feature> -->
+ </feature>
<feature name='camel-openshift' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>wrap:mvn:com.openshift/openshift-java-client/${openshift-java-client-version}</bundle>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java
index 7937a74..c7be9fb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo4Test.java
@@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
-@Ignore("https://issues.apache.org/jira/browse/CAMEL-11856")
@RunWith(PaxExam.class)
public class CamelOlingo4Test extends BaseKarafTest {
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.
[camel] 02/02: CAMEL-11856 - Fixed comment in Karaf features file
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7efb0fbc83d728e9264f4e4163918aa648230d17
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Nov 29 11:08:17 2017 +0100
CAMEL-11856 - Fixed comment in Karaf features file
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 247628d..81c6998 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1613,7 +1613,7 @@
<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>
- // TODO remove wrap protocol when https://issues.apache.org/jira/browse/OLINGO-1206 is resolved
+ <!--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-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>
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.