[
https://issues.apache.org/jira/browse/CAMEL-11856?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16270537#comment-16270537
]
ASF GitHub Bot commented on CAMEL-11856:
----------------------------------------
oscerd closed pull request #2124: [CAMEL-11856] Use wrap protocol for
odata-server-core until OLINGO-12…
URL: https://github.com/apache/camel/pull/2124
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/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 696a9411ed6..247628d0556 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 7937a748317..c7be9fbea5f 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.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 {
----------------------------------------------------------------
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]
> camel-olingo4 : create karaf feature
> ------------------------------------
>
> Key: CAMEL-11856
> URL: https://issues.apache.org/jira/browse/CAMEL-11856
> Project: Camel
> Issue Type: Task
> Components: camel-olingo4, karaf
> Reporter: Luca Burgazzoli
> Assignee: John Poth
> Priority: Minor
> Fix For: 2.21.0
>
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
