[OLINGO-841] Fixed outdated versions
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/58ead74e Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/58ead74e Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/58ead74e Branch: refs/heads/OLINGO-832_StreamSerializerPoC Commit: 58ead74ea131f91b9b97a4bf423a527b3dea8842 Parents: 26f7d2a Author: Michael Bolz <[email protected]> Authored: Mon Jan 18 15:00:56 2016 +0100 Committer: Michael Bolz <[email protected]> Committed: Mon Jan 18 15:02:25 2016 +0100 ---------------------------------------------------------------------- ext/karaf/karaf-features/src/main/resources/features.xml | 1 - .../apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +- samples/osgi/server/README.txt | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/58ead74e/ext/karaf/karaf-features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/ext/karaf/karaf-features/src/main/resources/features.xml b/ext/karaf/karaf-features/src/main/resources/features.xml index 0f2b5f4..d4511a8 100644 --- a/ext/karaf/karaf-features/src/main/resources/features.xml +++ b/ext/karaf/karaf-features/src/main/resources/features.xml @@ -24,7 +24,6 @@ <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle> <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle> <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle> - <bundle>wrap:mvn:org.antlr/antlr4-runtime/${antlr.version}/$Bundle-SymbolicName=antlr4-runtime&Bundle-Version=${antlr.version}&Export-Package=org.antlr.v4.runtime*</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/58ead74e/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java ---------------------------------------------------------------------- diff --git a/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java b/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java index 06d35cb..50f0cba 100644 --- a/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java +++ b/ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java @@ -96,7 +96,7 @@ public class CarServiceTest extends OlingoOSGiTestSupport { return new Option[] { olingoBaseConfig(), features(olingoUrl, "olingo-server", "olingo-client"), - mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.1.0-SNAPSHOT"), + mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.2.0-SNAPSHOT"), logLevel(LogLevel.INFO) }; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/58ead74e/samples/osgi/server/README.txt ---------------------------------------------------------------------- diff --git a/samples/osgi/server/README.txt b/samples/osgi/server/README.txt index a8de60a..65ceaeb 100644 --- a/samples/osgi/server/README.txt +++ b/samples/osgi/server/README.txt @@ -86,7 +86,7 @@ To install the required bundles, you can simply install the Karaf olingo-server The following commands will install the olingo-server feature. ``` -feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.1.0-SNAPSHOT/xml/features +feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.2.0-SNAPSHOT/xml/features feature:install olingo-server ``` @@ -95,16 +95,16 @@ feature:install olingo-server To install this sample bundle, run the karaf console command. ``` -bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.1.0-SNAPSHOT +bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.2.0-SNAPSHOT ``` Shown below is the output from running the above Karaf console commands. ``` -karaf@root()> feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.1.0-SNAPSHOT/xml/features -Adding feature url mvn:org.apache.olingo/odata-karaf-features/4.1.0-SNAPSHOT/xml/features +karaf@root()> feature:repo-add mvn:org.apache.olingo/odata-karaf-features/4.2.0-SNAPSHOT/xml/features +Adding feature url mvn:org.apache.olingo/odata-karaf-features/4.2.0-SNAPSHOT/xml/features karaf@root()> feature:install olingo-server -karaf@root()> bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.1.0-SNAPSHOT +karaf@root()> bundle:install -s mvn:org.apache.olingo/odata-server-osgi-sample/4.2.0-SNAPSHOT Bundle ID: 109 ```
