You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2023/11/06 20:06:24 UTC
(olingo-odata4) branch OLINGO-1600-upgrade updated (7b8f05659 -> 7e0637b2b)
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a change to branch OLINGO-1600-upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
from 7b8f05659 [OLINGO-1603] Set version to 5.0.0-SNAPSHOT
add 5e696bc13 upgrade jdk and java ee
add 6c8ebc32a Merge branch 'master' into upgrade/jdk-and-jakarta
new 7e0637b2b [OLINGO-1600] Merge branches
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/codeql-analysis.yml | 4 +-
.github/workflows/maven.yml | 4 +-
.../src/it/exchangeMail/pom.xml | 5 +-
.../src/it/exchangeMailNoBasePkg/pom.xml | 5 +-
ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml | 2 +-
fit/pom.xml | 36 +-
fit/src/it/demo/pom.xml | 2 +-
fit/src/it/openType/pom.xml | 2 +-
fit/src/it/staticService/pom.xml | 2 +-
fit/src/main/java/org/apache/olingo/fit/Demo.java | 28 +-
.../java/org/apache/olingo/fit/KeyAsSegment.java | 30 +-
.../main/java/org/apache/olingo/fit/NorthWind.java | 4 +-
.../java/org/apache/olingo/fit/NorthWindExt.java | 4 +-
.../main/java/org/apache/olingo/fit/OAuth2.java | 2 +-
.../main/java/org/apache/olingo/fit/OpenType.java | 28 +-
.../main/java/org/apache/olingo/fit/Services.java | 42 +--
.../java/org/apache/olingo/fit/Vocabularies.java | 12 +-
.../java/org/apache/olingo/fit/methods/PATCH.java | 2 +-
.../org/apache/olingo/fit/rest/OAuth2Provider.java | 25 +-
.../olingo/fit/rest/OAuth2RequestFilter.java | 15 +-
.../olingo/fit/rest/ServiceNameResponseFilter.java | 8 +-
.../olingo/fit/rest/StaticSecurityInterceptor.java | 4 +-
.../apache/olingo/fit/server/TomcatTestServer.java | 55 +--
.../apache/olingo/fit/utils/AbstractUtilities.java | 4 +-
.../org/apache/olingo/fit/utils/FSManager.java | 2 +-
.../org/apache/olingo/fit/utils/JSONUtilities.java | 2 +-
.../org/apache/olingo/fit/utils/XMLUtilities.java | 2 +-
fit/src/main/webapp/WEB-INF/applicationContext.xml | 22 +-
.../apache/olingo/fit/AbstractBaseTestITCase.java | 8 +-
.../olingo/fit/CXFOAuth2HttpClientFactory.java | 11 +-
.../olingo/fit/base/ConformanceTestITCase.java | 2 +-
.../fit/tecsvc/client/AuthBatchTestITCase.java | 1 -
.../fit/tecsvc/client/BatchClientITCase.java | 3 -
.../fit/tecsvc/client/BoundOperationITCase.java | 6 +-
.../fit/tecsvc/client/ConformanceITCase.java | 2 +-
.../fit/tecsvc/client/EntityWithStreamITCase.java | 6 +-
.../olingo/fit/tecsvc/http/BasicAsyncITCase.java | 20 +-
.../tecsvc/http/ODataVersionConformanceITCase.java | 4 +-
lib/client-core/pom.xml | 2 +-
.../request/AsyncRequestWrapperTest.java | 2 +-
.../request/batch/batchResponse.batch | 2 +-
.../response/batch/batchResponse.batch | 2 +-
lib/commons-core/pom.xml | 2 +-
lib/server-api/pom.xml | 6 +-
.../apache/olingo/server/api/ODataHttpHandler.java | 4 +-
lib/server-core-ext/pom.xml | 25 +-
.../olingo/server/core/OData4HttpHandler.java | 4 +-
.../server/core/NettyServiceDispatcherTest.java | 1 -
.../olingo/server/core/ServiceDispatcherTest.java | 17 +-
.../olingo/server/example/TripPinServiceTest.java | 14 +-
.../olingo/server/example/TripPinServlet.java | 10 +-
lib/server-core/pom.xml | 8 +-
.../olingo/server/core/ODataHttpHandlerImpl.java | 4 +-
.../server/core/debug/ServerCoreDebugger.java | 2 +-
.../olingo/server/core/ContentNegotiatorTest.java | 6 +-
.../server/core/ODataHttpHandlerImplTest.java | 2 +-
.../core/batchhandler/MockedBatchHandlerTest.java | 392 ++++++++++-----------
.../server/core/debug/ServerCoreDebuggerTest.java | 6 +-
.../deserializer/batch/BatchRequestParserTest.java | 2 +-
lib/server-tecsvc/pom.xml | 13 +-
.../olingo/server/tecsvc/TechnicalServlet.java | 10 +-
.../tecsvc/TechnicalServletContextListener.java | 4 +-
.../server/tecsvc/async/TechnicalAsyncService.java | 4 +-
.../async/TechnicalStatusMonitorServlet.java | 8 +-
.../queryoptions/options/SearchHandler.java | 2 +-
lib/server-test/pom.xml | 2 +-
.../olingo/server/core/ODataHandlerImplTest.java | 18 +-
.../server/core/PreconditionsValidatorTest.java | 2 +-
.../olingo/server/core/uri/parser/ParserTest.java | 2 +-
pom.xml | 40 ++-
samples/server/pom.xml | 6 +-
.../apache/olingo/server/sample/CarsServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p11_batch/pom.xml | 2 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 8 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
97 files changed, 656 insertions(+), 570 deletions(-)
(olingo-odata4) 01/01: [OLINGO-1600] Merge branches
Posted by mi...@apache.org.
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 <mi...@apache.org>
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>