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/12/17 19:02:49 UTC
(olingo-odata4) 01/01: Merge pull request #151 from apache/OLINGO-1600-upgrade
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
commit 7daba341a2eb42925ca1eb0a42e3797c23c0a8d2
Merge: 7b8f05659 05f865650
Author: Michael Bolz <mi...@apache.org>
AuthorDate: Sun Dec 17 20:02:42 2023 +0100
Merge pull request #151 from apache/OLINGO-1600-upgrade
[OLINGO-1600] Upgrade JDK 17 + Jakarta + Spring (6)
.github/workflows/codeql-analysis.yml | 6 +-
.github/workflows/maven.yml | 6 +-
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 +-
.../src/it/exchangeMail/pom.xml | 7 +-
.../src/it/exchangeMailNoBasePkg/pom.xml | 7 +-
ext/pojogen-maven-plugin/src/it/v4Sample/pom.xml | 4 +-
ext/pom.xml | 2 +-
fit/pom.xml | 40 ++-
fit/src/it/demo/pom.xml | 4 +-
fit/src/it/openType/pom.xml | 4 +-
fit/src/it/staticService/pom.xml | 4 +-
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-api/pom.xml | 2 +-
lib/client-core/pom.xml | 4 +-
.../request/AsyncRequestWrapperTest.java | 2 +-
.../request/batch/batchResponse.batch | 2 +-
.../response/batch/batchResponse.batch | 2 +-
lib/commons-api/pom.xml | 2 +-
lib/commons-core/pom.xml | 4 +-
lib/pom.xml | 2 +-
lib/server-api/pom.xml | 8 +-
.../apache/olingo/server/api/ODataHttpHandler.java | 4 +-
lib/server-core-ext/pom.xml | 27 +-
.../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 | 10 +-
.../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 | 15 +-
.../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 | 4 +-
.../olingo/server/core/ODataHandlerImplTest.java | 18 +-
.../server/core/PreconditionsValidatorTest.java | 2 +-
.../olingo/server/core/uri/parser/ParserTest.java | 2 +-
pom.xml | 51 +--
samples/client/pom.xml | 2 +-
samples/osgi/server/pom.xml | 2 +-
samples/pom.xml | 2 +-
samples/server/pom.xml | 8 +-
.../apache/olingo/server/sample/CarsServlet.java | 10 +-
samples/tutorials/p0_all/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p10_media/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p11_batch/pom.xml | 8 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p12_deep_insert/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
.../tutorials/p12_deep_insert_preparation/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p1_read/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 8 +-
samples/tutorials/p2_readep/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p3_write/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p4_navigation/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p5_queryoptions-tcs/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p6_queryoptions-es/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p7_queryoptions-o/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p8_queryoptions-f/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p9_action/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/p9_action_preparation/pom.xml | 4 +-
.../mynamespace/service/DemoEntityProcessor.java | 2 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/pe_streaming/pom.xml | 4 +-
.../myservice/mynamespace/web/DemoServlet.java | 10 +-
samples/tutorials/pom.xml | 2 +-
133 files changed, 734 insertions(+), 647 deletions(-)