From 0f39306541a04b0fd92903c18b4c9a3b9970bd7f Mon Sep 17 00:00:00 2001 From: Christian Amend Date: Mon, 13 Aug 2018 15:26:45 +0200 Subject: [PATCH] [OLINGO-1284] Set next 4.6.0-SNAPSHOT development version --- dist/android-lib/pom.xml | 2 +- dist/client-lib/pom.xml | 2 +- dist/javadoc/pom.xml | 2 +- dist/pom.xml | 2 +- dist/server-lib-ext/pom.xml | 2 +- dist/server-lib/pom.xml | 2 +- ext/client-android/pom.xml | 2 +- ext/client-proxy/pom.xml | 2 +- ext/karaf/karaf-features/pom.xml | 2 +- ext/karaf/karaf-fit/pom.xml | 2 +- .../org/apache/olingo/osgi/itests/server/CarServiceTest.java | 2 +- ext/karaf/pom.xml | 2 +- ext/pojogen-maven-plugin/pom.xml | 2 +- ext/pom.xml | 2 +- fit/pom.xml | 2 +- lib/client-api/pom.xml | 2 +- lib/client-core/pom.xml | 2 +- lib/commons-api/pom.xml | 2 +- lib/commons-core/pom.xml | 2 +- lib/pom.xml | 2 +- lib/server-api/pom.xml | 2 +- lib/server-core-ext/pom.xml | 2 +- lib/server-core/pom.xml | 2 +- lib/server-tecsvc/pom.xml | 2 +- lib/server-test/pom.xml | 2 +- pom.xml | 2 +- samples/client/pom.xml | 2 +- samples/osgi/server/pom.xml | 2 +- samples/pom.xml | 2 +- samples/server/pom.xml | 2 +- samples/tutorials/p0_all/pom.xml | 4 ++-- samples/tutorials/p10_media/pom.xml | 4 ++-- samples/tutorials/p11_batch/pom.xml | 4 ++-- samples/tutorials/p12_deep_insert/pom.xml | 4 ++-- samples/tutorials/p12_deep_insert_preparation/pom.xml | 4 ++-- samples/tutorials/p1_read/pom.xml | 4 ++-- samples/tutorials/p2_readep/pom.xml | 4 ++-- samples/tutorials/p3_write/pom.xml | 4 ++-- samples/tutorials/p4_navigation/pom.xml | 4 ++-- samples/tutorials/p5_queryoptions-tcs/pom.xml | 4 ++-- samples/tutorials/p6_queryoptions-es/pom.xml | 4 ++-- samples/tutorials/p7_queryoptions-o/pom.xml | 4 ++-- samples/tutorials/p8_queryoptions-f/pom.xml | 4 ++-- samples/tutorials/p9_action/pom.xml | 4 ++-- samples/tutorials/p9_action_preparation/pom.xml | 4 ++-- samples/tutorials/pe_streaming/pom.xml | 4 ++-- samples/tutorials/pom.xml | 2 +- 47 files changed, 63 insertions(+), 63 deletions(-) diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml index 12cc7ee5c..849946921 100644 --- a/dist/android-lib/pom.xml +++ b/dist/android-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml index a0d132707..c118eca7b 100644 --- a/dist/client-lib/pom.xml +++ b/dist/client-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml index 9e8242711..8a81b2658 100644 --- a/dist/javadoc/pom.xml +++ b/dist/javadoc/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/dist/pom.xml b/dist/pom.xml index 11287f5ed..615081116 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-parent - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/dist/server-lib-ext/pom.xml b/dist/server-lib-ext/pom.xml index 24bf5def6..cf2a51505 100644 --- a/dist/server-lib-ext/pom.xml +++ b/dist/server-lib-ext/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/dist/server-lib/pom.xml b/dist/server-lib/pom.xml index 2382779b3..9040de339 100644 --- a/dist/server-lib/pom.xml +++ b/dist/server-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/ext/client-android/pom.xml b/ext/client-android/pom.xml index 6e8ba298f..da8b1df41 100644 --- a/ext/client-android/pom.xml +++ b/ext/client-android/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-ext - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml index 7c364836d..d1fd1a521 100644 --- a/ext/client-proxy/pom.xml +++ b/ext/client-proxy/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-ext - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/ext/karaf/karaf-features/pom.xml b/ext/karaf/karaf-features/pom.xml index 038c6d767..2ce95758b 100644 --- a/ext/karaf/karaf-features/pom.xml +++ b/ext/karaf/karaf-features/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-karaf - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/ext/karaf/karaf-fit/pom.xml b/ext/karaf/karaf-fit/pom.xml index 612dd4bd7..61cdf52e5 100644 --- a/ext/karaf/karaf-fit/pom.xml +++ b/ext/karaf/karaf-fit/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-karaf - 4.5.0 + 4.6.0-SNAPSHOT .. 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 6964c5a5f..eced4be38 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.5.0"), + mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.6.0-SNAPSHOT"), logLevel(LogLevel.INFO) }; } diff --git a/ext/karaf/pom.xml b/ext/karaf/pom.xml index 5fb29764f..e9e70766f 100644 --- a/ext/karaf/pom.xml +++ b/ext/karaf/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-ext - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/ext/pojogen-maven-plugin/pom.xml b/ext/pojogen-maven-plugin/pom.xml index c13722b3e..9ab3f9f9b 100644 --- a/ext/pojogen-maven-plugin/pom.xml +++ b/ext/pojogen-maven-plugin/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-ext - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/ext/pom.xml b/ext/pom.xml index 182b6235d..9feee4900 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-parent - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/fit/pom.xml b/fit/pom.xml index c6e5c14cc..1513cb2a4 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index c54d098ef..bb2c807c4 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index ccb311d35..bf20fa5a3 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index 6336271da..54d984205 100644 --- a/lib/commons-api/pom.xml +++ b/lib/commons-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index 363cf2bbd..fa503dfdb 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/pom.xml b/lib/pom.xml index 7913078e8..330436262 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml index 78de45415..30319d7e1 100644 --- a/lib/server-api/pom.xml +++ b/lib/server-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/server-core-ext/pom.xml b/lib/server-core-ext/pom.xml index 1c4bcdfda..f40de27e4 100644 --- a/lib/server-core-ext/pom.xml +++ b/lib/server-core-ext/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml index 66413c3b8..673abed06 100644 --- a/lib/server-core/pom.xml +++ b/lib/server-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml index 122195f2d..95f049d77 100644 --- a/lib/server-tecsvc/pom.xml +++ b/lib/server-tecsvc/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml index f2bf91c17..5fc1c0349 100644 --- a/lib/server-test/pom.xml +++ b/lib/server-test/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 25879252b..0f16b6163 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.olingo odata-parent - 4.5.0 + 4.6.0-SNAPSHOT pom Olingo-OData diff --git a/samples/client/pom.xml b/samples/client/pom.xml index 237cd43db..f871e0f43 100644 --- a/samples/client/pom.xml +++ b/samples/client/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-samples - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/samples/osgi/server/pom.xml b/samples/osgi/server/pom.xml index 58f47533e..c437c734a 100644 --- a/samples/osgi/server/pom.xml +++ b/samples/osgi/server/pom.xml @@ -30,7 +30,7 @@ under the License. org.apache.olingo odata-samples - 4.5.0 + 4.6.0-SNAPSHOT ../.. diff --git a/samples/pom.xml b/samples/pom.xml index cb6f5a3c7..b38b99619 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/samples/server/pom.xml b/samples/server/pom.xml index 67b70918a..ac7b432fd 100644 --- a/samples/server/pom.xml +++ b/samples/server/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-samples - 4.5.0 + 4.6.0-SNAPSHOT .. diff --git a/samples/tutorials/p0_all/pom.xml b/samples/tutorials/p0_all/pom.xml index 31a3d3699..c2b8dc0f4 100644 --- a/samples/tutorials/p0_all/pom.xml +++ b/samples/tutorials/p0_all/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId} Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p10_media/pom.xml b/samples/tutorials/p10_media/pom.xml index d23ce66ab..3a8813b08 100644 --- a/samples/tutorials/p10_media/pom.xml +++ b/samples/tutorials/p10_media/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-Media war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p11_batch/pom.xml b/samples/tutorials/p11_batch/pom.xml index 22ca2e5c6..73506a273 100644 --- a/samples/tutorials/p11_batch/pom.xml +++ b/samples/tutorials/p11_batch/pom.xml @@ -25,13 +25,13 @@ my.group.id DemoService-Batch war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 1.6 3.2 diff --git a/samples/tutorials/p12_deep_insert/pom.xml b/samples/tutorials/p12_deep_insert/pom.xml index 439f6afa8..ca5bb0003 100644 --- a/samples/tutorials/p12_deep_insert/pom.xml +++ b/samples/tutorials/p12_deep_insert/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-DeepInsert war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p12_deep_insert_preparation/pom.xml b/samples/tutorials/p12_deep_insert_preparation/pom.xml index 5a54bba57..298042286 100644 --- a/samples/tutorials/p12_deep_insert_preparation/pom.xml +++ b/samples/tutorials/p12_deep_insert_preparation/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-DeepInsertPreparation war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p1_read/pom.xml b/samples/tutorials/p1_read/pom.xml index 4a02aba9a..c86db66fa 100755 --- a/samples/tutorials/p1_read/pom.xml +++ b/samples/tutorials/p1_read/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-Read war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p2_readep/pom.xml b/samples/tutorials/p2_readep/pom.xml index 37eb8cc3f..72acd0479 100755 --- a/samples/tutorials/p2_readep/pom.xml +++ b/samples/tutorials/p2_readep/pom.xml @@ -9,7 +9,7 @@ my.group.id DemoService-ReadEp war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -19,7 +19,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p3_write/pom.xml b/samples/tutorials/p3_write/pom.xml index 71d3902fe..e0baeb159 100755 --- a/samples/tutorials/p3_write/pom.xml +++ b/samples/tutorials/p3_write/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-Write war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p4_navigation/pom.xml b/samples/tutorials/p4_navigation/pom.xml index 2103d7540..78d791a19 100755 --- a/samples/tutorials/p4_navigation/pom.xml +++ b/samples/tutorials/p4_navigation/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-Navigation war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p5_queryoptions-tcs/pom.xml b/samples/tutorials/p5_queryoptions-tcs/pom.xml index 338a7f9ff..a7d1cc3cf 100755 --- a/samples/tutorials/p5_queryoptions-tcs/pom.xml +++ b/samples/tutorials/p5_queryoptions-tcs/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-QueryOptions-TCS war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p6_queryoptions-es/pom.xml b/samples/tutorials/p6_queryoptions-es/pom.xml index 5b2ed5da7..ad3d14a67 100755 --- a/samples/tutorials/p6_queryoptions-es/pom.xml +++ b/samples/tutorials/p6_queryoptions-es/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-QueryOptions-ES war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p7_queryoptions-o/pom.xml b/samples/tutorials/p7_queryoptions-o/pom.xml index 8a317d55d..a2de557d2 100644 --- a/samples/tutorials/p7_queryoptions-o/pom.xml +++ b/samples/tutorials/p7_queryoptions-o/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-QueryOptions-O war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p8_queryoptions-f/pom.xml b/samples/tutorials/p8_queryoptions-f/pom.xml index 31b8029b4..aa9de97ce 100644 --- a/samples/tutorials/p8_queryoptions-f/pom.xml +++ b/samples/tutorials/p8_queryoptions-f/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-QueryOptions-F war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId} Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p9_action/pom.xml b/samples/tutorials/p9_action/pom.xml index 6bf76cf1b..2cf362de7 100644 --- a/samples/tutorials/p9_action/pom.xml +++ b/samples/tutorials/p9_action/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-Action war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p9_action_preparation/pom.xml b/samples/tutorials/p9_action_preparation/pom.xml index a93e8b58c..176ece278 100644 --- a/samples/tutorials/p9_action_preparation/pom.xml +++ b/samples/tutorials/p9_action_preparation/pom.xml @@ -25,7 +25,7 @@ my.group.id DemoService-ActionPreparation war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/pe_streaming/pom.xml b/samples/tutorials/pe_streaming/pom.xml index c80f5843d..c4708840e 100755 --- a/samples/tutorials/pe_streaming/pom.xml +++ b/samples/tutorials/pe_streaming/pom.xml @@ -9,7 +9,7 @@ my.group.id DemoService-Streaming war - 4.5.0 + 4.6.0-SNAPSHOT ${project.artifactId}-Webapp @@ -19,7 +19,7 @@ 2.5 - 4.5.0 + 4.6.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/pom.xml b/samples/tutorials/pom.xml index a29d48adb..43afa0e57 100644 --- a/samples/tutorials/pom.xml +++ b/samples/tutorials/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-samples - 4.5.0 + 4.6.0-SNAPSHOT ..