From e35f36abc55f972b9a4474b3eae87aa771205168 Mon Sep 17 00:00:00 2001 From: mibo Date: Sun, 5 May 2019 08:12:19 +0200 Subject: [PATCH] [OLINGO-1352] Set 4.7.0-SNAPSHOT as 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 8ed83c594..6f9cafb9c 100644 --- a/dist/android-lib/pom.xml +++ b/dist/android-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml index d996b1917..2e6fa9d18 100644 --- a/dist/client-lib/pom.xml +++ b/dist/client-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml index 4de6a6823..fe163f636 100644 --- a/dist/javadoc/pom.xml +++ b/dist/javadoc/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/dist/pom.xml b/dist/pom.xml index dfce113b8..e661e9c64 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-parent - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/dist/server-lib-ext/pom.xml b/dist/server-lib-ext/pom.xml index 398d16317..feabc249b 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.6.0 + 4.7.0-SNAPSHOT .. diff --git a/dist/server-lib/pom.xml b/dist/server-lib/pom.xml index eb9c798fd..5b0a7cf6c 100644 --- a/dist/server-lib/pom.xml +++ b/dist/server-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/ext/client-android/pom.xml b/ext/client-android/pom.xml index c198c8fc6..ddacd2e93 100644 --- a/ext/client-android/pom.xml +++ b/ext/client-android/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-ext - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml index 3d9683969..267bf2411 100644 --- a/ext/client-proxy/pom.xml +++ b/ext/client-proxy/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-ext - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/ext/karaf/karaf-features/pom.xml b/ext/karaf/karaf-features/pom.xml index f95ad64e0..01cdf0849 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.6.0 + 4.7.0-SNAPSHOT .. diff --git a/ext/karaf/karaf-fit/pom.xml b/ext/karaf/karaf-fit/pom.xml index ef5bebffd..c30a2e259 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.6.0 + 4.7.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 0534257b7..10490a902 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.6.0"), + mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.7.0-SNAPSHOT"), logLevel(LogLevel.INFO) }; } diff --git a/ext/karaf/pom.xml b/ext/karaf/pom.xml index 7a3c50646..a94ec4a56 100644 --- a/ext/karaf/pom.xml +++ b/ext/karaf/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-ext - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/ext/pojogen-maven-plugin/pom.xml b/ext/pojogen-maven-plugin/pom.xml index 13f6cc0ae..b3c6db06b 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.6.0 + 4.7.0-SNAPSHOT .. diff --git a/ext/pom.xml b/ext/pom.xml index 497ab3ed4..6bf665612 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-parent - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/fit/pom.xml b/fit/pom.xml index 106ab3435..ce6e30a13 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index 5e6e76b9a..a2fae6a9b 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index 3fe59d8f4..392f1228d 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index 693b731fa..db6c0c20e 100644 --- a/lib/commons-api/pom.xml +++ b/lib/commons-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index 31f46a4e6..b167420d3 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/pom.xml b/lib/pom.xml index 9b66434e2..964ae84ab 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml index 4750eaad3..fe535d03d 100644 --- a/lib/server-api/pom.xml +++ b/lib/server-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/server-core-ext/pom.xml b/lib/server-core-ext/pom.xml index 467b757e2..4ab7936ca 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.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml index aa5b55519..08abae6a1 100644 --- a/lib/server-core/pom.xml +++ b/lib/server-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml index cd6181616..bc31f5d53 100644 --- a/lib/server-tecsvc/pom.xml +++ b/lib/server-tecsvc/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml index 1c5da48ab..7168e99ab 100644 --- a/lib/server-test/pom.xml +++ b/lib/server-test/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 4dded9005..efab3007a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.olingo odata-parent - 4.6.0 + 4.7.0-SNAPSHOT pom Olingo-OData diff --git a/samples/client/pom.xml b/samples/client/pom.xml index 81221c544..02fc882d5 100644 --- a/samples/client/pom.xml +++ b/samples/client/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-samples - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/samples/osgi/server/pom.xml b/samples/osgi/server/pom.xml index 286b776ba..98737464c 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.6.0 + 4.7.0-SNAPSHOT ../.. diff --git a/samples/pom.xml b/samples/pom.xml index a29a9b97d..4cfa5509f 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/samples/server/pom.xml b/samples/server/pom.xml index 79ba5b223..cec422dce 100644 --- a/samples/server/pom.xml +++ b/samples/server/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-samples - 4.6.0 + 4.7.0-SNAPSHOT .. diff --git a/samples/tutorials/p0_all/pom.xml b/samples/tutorials/p0_all/pom.xml index 88835beb7..ead305e03 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId} Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p10_media/pom.xml b/samples/tutorials/p10_media/pom.xml index 3f44f56cf..64e1efb95 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p11_batch/pom.xml b/samples/tutorials/p11_batch/pom.xml index 3ccc9714c..75795e8f9 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp 2.5 - 4.6.0 + 4.7.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 40480bab9..49288eecf 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.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 b750da08f..8494d1f60 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p1_read/pom.xml b/samples/tutorials/p1_read/pom.xml index 1361d2575..db674c5c3 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p2_readep/pom.xml b/samples/tutorials/p2_readep/pom.xml index 91f06a35a..5bdcab578 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -19,7 +19,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p3_write/pom.xml b/samples/tutorials/p3_write/pom.xml index c6f361a5b..6c4d3abb9 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p4_navigation/pom.xml b/samples/tutorials/p4_navigation/pom.xml index 20501a639..12b198b62 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p5_queryoptions-tcs/pom.xml b/samples/tutorials/p5_queryoptions-tcs/pom.xml index c5123de88..116825288 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p6_queryoptions-es/pom.xml b/samples/tutorials/p6_queryoptions-es/pom.xml index df9e8b4cb..6d708fc2d 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p7_queryoptions-o/pom.xml b/samples/tutorials/p7_queryoptions-o/pom.xml index d31aa2641..238709da5 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p8_queryoptions-f/pom.xml b/samples/tutorials/p8_queryoptions-f/pom.xml index 023083fb9..a59df9558 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId} Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p9_action/pom.xml b/samples/tutorials/p9_action/pom.xml index 0e58eb763..cf36883ce 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/p9_action_preparation/pom.xml b/samples/tutorials/p9_action_preparation/pom.xml index 16e9f62cc..d7137b8be 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/pe_streaming/pom.xml b/samples/tutorials/pe_streaming/pom.xml index 07add18b5..693090f31 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.6.0 + 4.7.0-SNAPSHOT ${project.artifactId}-Webapp @@ -19,7 +19,7 @@ 2.5 - 4.6.0 + 4.7.0-SNAPSHOT 1.7.7 diff --git a/samples/tutorials/pom.xml b/samples/tutorials/pom.xml index 3dd60aab5..6714fb862 100644 --- a/samples/tutorials/pom.xml +++ b/samples/tutorials/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-samples - 4.6.0 + 4.7.0-SNAPSHOT ..