This is an automated email from the ASF dual-hosted git repository. mibo pushed a commit to branch OLINGO-1600-upgrade in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
commit 7e0637b2b7ca1d5e3c6848b725a7f2ec3649a533 Merge: 6c8ebc32a 7b8f05659 Author: mibo <[email protected]> AuthorDate: Mon Nov 6 20:57:26 2023 +0100 [OLINGO-1600] Merge branches 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 +- .../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 +- .../core/serialization/JsonEntityDeserializer.java | 3 ++ .../client/core/serialization/ODataBinderImpl.java | 2 +- .../olingo/client/core/JsonDeserializerTest.java | 59 ++++++++++++++++++++++ .../org/apache/olingo/client/core/Employee.json | 19 +++++++ lib/commons-api/pom.xml | 2 +- lib/commons-core/pom.xml | 2 +- .../olingo/commons/core/edm/EdmTypeInfo.java | 10 +++- lib/pom.xml | 2 +- lib/server-api/pom.xml | 2 +- lib/server-core-ext/pom.xml | 2 +- lib/server-core/pom.xml | 2 +- .../core/serializer/json/ODataJsonSerializer.java | 11 +++- lib/server-tecsvc/pom.xml | 2 +- lib/server-test/pom.xml | 2 +- .../serializer/json/ODataJsonSerializerTest.java | 42 +++++++++++++++ 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 +- .../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 +- 54 files changed, 205 insertions(+), 67 deletions(-) diff --cc samples/tutorials/p11_batch/pom.xml index 6e4fcbe34,2601a340d..efe5cd25b --- a/samples/tutorials/p11_batch/pom.xml +++ b/samples/tutorials/p11_batch/pom.xml @@@ -31,9 -31,9 +31,9 @@@ <properties> <javax.version>2.5</javax.version> - <odata.version>4.10.0-SNAPSHOT</odata.version> + <odata.version>5.0.0-SNAPSHOT</odata.version> <slf4j.version>1.7.7</slf4j.version> - <project.source>1.6</project.source> + <project.source>17</project.source> <compiler.plugin.version>3.2</compiler.plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties>
