From c28e79077cf97179d0587d019bef7e211f7af149 Mon Sep 17 00:00:00 2001 From: mibo Date: Sun, 27 Feb 2022 07:34:32 +0100 Subject: [PATCH] [OLINGO-1560] Set version to 4.9.0 --- 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 +- .../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 | 8 +++----- 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 | 4 ++-- 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, 66 insertions(+), 68 deletions(-) diff --git a/dist/android-lib/pom.xml b/dist/android-lib/pom.xml index 71d0977bb..ecd92b905 100644 --- a/dist/android-lib/pom.xml +++ b/dist/android-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/dist/client-lib/pom.xml b/dist/client-lib/pom.xml index 8f4ab1d34..ee9545dc5 100644 --- a/dist/client-lib/pom.xml +++ b/dist/client-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml index db42bb3c5..d77c90799 100644 --- a/dist/javadoc/pom.xml +++ b/dist/javadoc/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/dist/pom.xml b/dist/pom.xml index ed3fcc1b6..907ec29cc 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-parent - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/dist/server-lib-ext/pom.xml b/dist/server-lib-ext/pom.xml index 40f040b2c..30627ebb8 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.9.0-SNAPSHOT + 4.9.0 .. diff --git a/dist/server-lib/pom.xml b/dist/server-lib/pom.xml index de72e2c57..98d035cd4 100644 --- a/dist/server-lib/pom.xml +++ b/dist/server-lib/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-dist - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/ext/client-android/pom.xml b/ext/client-android/pom.xml index 977c38a89..eadf58b1d 100644 --- a/ext/client-android/pom.xml +++ b/ext/client-android/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-ext - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/ext/client-proxy/pom.xml b/ext/client-proxy/pom.xml index bf6d84e7a..fc6f226ce 100644 --- a/ext/client-proxy/pom.xml +++ b/ext/client-proxy/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-ext - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/ext/karaf/karaf-features/pom.xml b/ext/karaf/karaf-features/pom.xml index f67b5b015..531589feb 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.9.0-SNAPSHOT + 4.9.0 .. diff --git a/ext/karaf/karaf-fit/pom.xml b/ext/karaf/karaf-fit/pom.xml index 56dc9e125..db1d358c7 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.9.0-SNAPSHOT + 4.9.0 .. 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 e2543723f..a75c18de6 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.9.0-SNAPSHOT"), + mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.9.0"), logLevel(LogLevel.INFO) }; } diff --git a/ext/karaf/pom.xml b/ext/karaf/pom.xml index 02cd07dfb..1421ee181 100644 --- a/ext/karaf/pom.xml +++ b/ext/karaf/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-ext - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/ext/pojogen-maven-plugin/pom.xml b/ext/pojogen-maven-plugin/pom.xml index 09ac7564b..1d5075a2c 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.9.0-SNAPSHOT + 4.9.0 .. diff --git a/ext/pom.xml b/ext/pom.xml index 65f81ca62..32f83af8d 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-parent - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/fit/pom.xml b/fit/pom.xml index 816ec62f5..7c04ce0f9 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -30,15 +30,12 @@ org.apache.olingo odata-parent - 4.9.0-SNAPSHOT - .. + 4.9.0 true true - - .*proxy.* ${project.build.directory}/${project.build.finalName} ${project.build.directory}/emb-tom-fit ${project.build.outputDirectory} @@ -223,7 +220,8 @@ **/*Test.java - %regex[${exclude.regex}] + + %regex[.*proxy.*] diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index 0d8fadf24..d9f53d547 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index 406436ce6..0aa0b532c 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index 9bbd7d179..c7aa0d023 100644 --- a/lib/commons-api/pom.xml +++ b/lib/commons-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index a85bb3634..7f26d782f 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/pom.xml b/lib/pom.xml index 9a0ff2df9..e615f48cf 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml index c5e471c84..6a327736a 100644 --- a/lib/server-api/pom.xml +++ b/lib/server-api/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/server-core-ext/pom.xml b/lib/server-core-ext/pom.xml index 47b578bf2..7e19db72a 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.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml index b5d10af85..e7daf3b8d 100644 --- a/lib/server-core/pom.xml +++ b/lib/server-core/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml index 45b7bc31d..dccae1294 100644 --- a/lib/server-tecsvc/pom.xml +++ b/lib/server-tecsvc/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml index 3f2289109..5da3250f5 100644 --- a/lib/server-test/pom.xml +++ b/lib/server-test/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-lib - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/pom.xml b/pom.xml index 30271adcb..92811b71e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache.olingo odata-parent - 4.9.0-SNAPSHOT + 4.9.0 pom Olingo-OData @@ -113,7 +113,7 @@ UTF-8 1.8 - 10 + ${maven.build.timestamp} true diff --git a/samples/client/pom.xml b/samples/client/pom.xml index 4dd03f713..52e6621ba 100644 --- a/samples/client/pom.xml +++ b/samples/client/pom.xml @@ -31,7 +31,7 @@ org.apache.olingo odata-samples - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/samples/osgi/server/pom.xml b/samples/osgi/server/pom.xml index 28a0bbbec..2d1fce126 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.9.0-SNAPSHOT + 4.9.0 ../.. diff --git a/samples/pom.xml b/samples/pom.xml index b08e9e25b..2ec744c58 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-parent - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/samples/server/pom.xml b/samples/server/pom.xml index f178c8a00..405c48ccc 100644 --- a/samples/server/pom.xml +++ b/samples/server/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-samples - 4.9.0-SNAPSHOT + 4.9.0 .. diff --git a/samples/tutorials/p0_all/pom.xml b/samples/tutorials/p0_all/pom.xml index f1044282d..3f48b72d8 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId} Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p10_media/pom.xml b/samples/tutorials/p10_media/pom.xml index 4db454c86..ee15ba419 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p11_batch/pom.xml b/samples/tutorials/p11_batch/pom.xml index d27e3a420..be29826bb 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp 2.5 - 4.9.0-SNAPSHOT + 4.9.0 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 147dea823..2fa30266d 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p12_deep_insert_preparation/pom.xml b/samples/tutorials/p12_deep_insert_preparation/pom.xml index 8a4ba2a58..f48036da3 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p1_read/pom.xml b/samples/tutorials/p1_read/pom.xml index 60666daa6..bcdc6eae8 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p2_readep/pom.xml b/samples/tutorials/p2_readep/pom.xml index b8eaa878f..4603fd057 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -19,7 +19,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p3_write/pom.xml b/samples/tutorials/p3_write/pom.xml index 0f78c9edc..f9f17bf64 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p4_navigation/pom.xml b/samples/tutorials/p4_navigation/pom.xml index 7f37901a8..9850e253b 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p5_queryoptions-tcs/pom.xml b/samples/tutorials/p5_queryoptions-tcs/pom.xml index 53a549978..719eff9c7 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p6_queryoptions-es/pom.xml b/samples/tutorials/p6_queryoptions-es/pom.xml index ef1fcd252..11c351372 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p7_queryoptions-o/pom.xml b/samples/tutorials/p7_queryoptions-o/pom.xml index 91cc641d9..6e345c541 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p8_queryoptions-f/pom.xml b/samples/tutorials/p8_queryoptions-f/pom.xml index 8ed0caacb..95bab3d65 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId} Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p9_action/pom.xml b/samples/tutorials/p9_action/pom.xml index 6127dcf9f..5ecff3c66 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/p9_action_preparation/pom.xml b/samples/tutorials/p9_action_preparation/pom.xml index 8aaf9b24a..b1e9910ca 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -35,7 +35,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/pe_streaming/pom.xml b/samples/tutorials/pe_streaming/pom.xml index cd5d685a8..b926506e2 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.9.0-SNAPSHOT + 4.9.0 ${project.artifactId}-Webapp @@ -19,7 +19,7 @@ 2.5 - 4.9.0-SNAPSHOT + 4.9.0 1.7.7 diff --git a/samples/tutorials/pom.xml b/samples/tutorials/pom.xml index fb4df964d..80b36c8d4 100644 --- a/samples/tutorials/pom.xml +++ b/samples/tutorials/pom.xml @@ -30,7 +30,7 @@ org.apache.olingo odata-samples - 4.9.0-SNAPSHOT + 4.9.0 ..