From 4cd3edebd0ad713869544b20d3bcff3e674497ec Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Wed, 6 Mar 2024 17:30:13 -0500 Subject: [PATCH] Upgrade to Jakarta EE 10 Servlet Upgrade to using Jakarta EE 10 from Java EE 8 by mostly following the upgrade instructions. Only the servlet package is upgrade. Other Jakarta EE components (like the persistence package that Hibernate depends on) need to be upgraded separately. TESTED=deployed and successfully communicated with the pubapi endpoint for web WHOIS. Note that this currently requires packaing the App Engine runtime per instructions here due to GoogleCloudPlatform/appengine-java-standard#98. This PR will only be merged until the fix is deployed to production (https://rapid.corp.google.com/#/release/serverless_runtimes_run_java/java21_20240310_21_0). --- buildSrc/gradle.lockfile | 10 +-- core/build.gradle | 8 +-- core/gradle.lockfile | 32 +++++----- .../google/registry/batch/BatchModule.java | 2 +- .../batch/DeleteExpiredDomainsAction.java | 6 +- .../batch/ExpandBillingRecurrencesAction.java | 4 +- .../registry/batch/RelockDomainAction.java | 4 +- .../ResaveAllEppResourcesPipelineAction.java | 4 +- .../batch/WipeOutContactHistoryPiiAction.java | 4 +- .../google/registry/bsa/BlockListFetcher.java | 2 +- .../registry/bsa/BsaDownloadAction.java | 2 +- .../google/registry/bsa/BsaRefreshAction.java | 2 +- .../registry/bsa/api/BsaCredential.java | 2 +- .../registry/bsa/api/BsaReportSender.java | 4 +- .../java/google/registry/cron/CronModule.java | 2 +- .../java/google/registry/dns/DnsModule.java | 2 +- .../registry/dns/PublishDnsUpdatesAction.java | 2 +- .../dns/RefreshDnsOnHostRenameAction.java | 2 +- .../alpha/backend/WEB-INF/appengine-web.xml | 1 - .../env/alpha/bsa/WEB-INF/appengine-web.xml | 1 - .../alpha/default/WEB-INF/appengine-web.xml | 1 - .../alpha/pubapi/WEB-INF/appengine-web.xml | 1 - .../env/alpha/tools/WEB-INF/appengine-web.xml | 1 - .../env/common/backend/WEB-INF/web.xml | 7 +-- .../registry/env/common/bsa/WEB-INF/web.xml | 7 +-- .../env/common/default/WEB-INF/web.xml | 9 ++- .../env/common/pubapi/WEB-INF/web.xml | 9 ++- .../registry/env/common/tools/WEB-INF/web.xml | 9 ++- .../crash/backend/WEB-INF/appengine-web.xml | 1 - .../env/crash/bsa/WEB-INF/appengine-web.xml | 1 - .../crash/default/WEB-INF/appengine-web.xml | 1 - .../crash/pubapi/WEB-INF/appengine-web.xml | 1 - .../env/crash/tools/WEB-INF/appengine-web.xml | 1 - .../local/backend/WEB-INF/appengine-web.xml | 1 - .../env/local/bsa/WEB-INF/appengine-web.xml | 1 - .../local/default/WEB-INF/appengine-web.xml | 1 - .../local/pubapi/WEB-INF/appengine-web.xml | 1 - .../env/local/tools/WEB-INF/appengine-web.xml | 1 - .../backend/WEB-INF/appengine-web.xml | 1 - .../production/bsa/WEB-INF/appengine-web.xml | 1 - .../default/WEB-INF/appengine-web.xml | 1 - .../pubapi/WEB-INF/appengine-web.xml | 1 - .../tools/WEB-INF/appengine-web.xml | 1 - .../env/qa/backend/WEB-INF/appengine-web.xml | 1 - .../env/qa/bsa/WEB-INF/appengine-web.xml | 1 - .../env/qa/default/WEB-INF/appengine-web.xml | 1 - .../env/qa/pubapi/WEB-INF/appengine-web.xml | 1 - .../env/qa/tools/WEB-INF/appengine-web.xml | 1 - .../sandbox/backend/WEB-INF/appengine-web.xml | 1 - .../env/sandbox/bsa/WEB-INF/appengine-web.xml | 1 - .../sandbox/default/WEB-INF/appengine-web.xml | 1 - .../sandbox/pubapi/WEB-INF/appengine-web.xml | 1 - .../sandbox/tools/WEB-INF/appengine-web.xml | 1 - .../export/ExportPremiumTermsAction.java | 4 +- .../export/ExportReservedTermsAction.java | 4 +- .../export/SyncGroupMembersAction.java | 4 +- .../registry/export/sheet/SheetModule.java | 2 +- .../sheet/SyncRegistrarsSheetAction.java | 8 +-- .../google/registry/flows/CheckApiAction.java | 2 +- .../registry/flows/EppRequestHandler.java | 4 +- .../google/registry/flows/EppTlsAction.java | 2 +- .../google/registry/flows/EppToolAction.java | 2 +- .../registry/flows/HttpSessionMetadata.java | 2 +- .../google/registry/flows/TlsCredentials.java | 2 +- .../groups/DirectoryGroupsConnection.java | 4 +- .../registry/loadtest/LoadTestModule.java | 2 +- .../google/registry/module/ServletBase.java | 6 +- .../google/registry/rdap/RdapActionBase.java | 6 +- .../java/google/registry/rdap/RdapModule.java | 2 +- .../java/google/registry/rde/RdeModule.java | 2 +- .../google/registry/rde/RdeStagingAction.java | 6 +- .../registry/reporting/ReportingModule.java | 2 +- .../reporting/billing/BillingModule.java | 2 +- .../billing/CopyDetailReportsAction.java | 4 +- .../billing/GenerateInvoicesAction.java | 4 +- .../billing/PublishInvoicesAction.java | 8 +-- .../reporting/icann/IcannReportingModule.java | 2 +- .../icann/IcannReportingStagingAction.java | 4 +- .../icann/IcannReportingUploadAction.java | 2 +- .../spec11/GenerateSpec11ReportAction.java | 4 +- .../spec11/PublishSpec11ReportAction.java | 8 +-- .../registry/request/FullServletPath.java | 2 +- .../registry/request/HttpException.java | 2 +- .../registry/request/RequestHandler.java | 12 ++-- .../registry/request/RequestMethod.java | 2 +- .../registry/request/RequestModule.java | 6 +- .../registry/request/RequestParameters.java | 2 +- .../google/registry/request/RequestPath.java | 2 +- .../google/registry/request/RequestUrl.java | 2 +- .../google/registry/request/Response.java | 4 +- .../google/registry/request/ResponseImpl.java | 4 +- .../request/auth/AuthenticationMechanism.java | 2 +- .../auth/LegacyAuthenticationMechanism.java | 2 +- .../OidcTokenAuthenticationMechanism.java | 2 +- .../request/auth/RequestAuthenticator.java | 2 +- .../google/registry/security/JsonHttp.java | 4 +- .../java/google/registry/tmch/Marksdb.java | 2 +- .../registry/tmch/NordnUploadAction.java | 2 +- .../registry/tmch/NordnVerifyAction.java | 4 +- .../java/google/registry/tmch/TmchModule.java | 2 +- .../tools/server/CreateGroupsAction.java | 2 +- .../tools/server/ToolsServerModule.java | 2 +- .../ui/server/console/ConsoleApiAction.java | 2 +- .../server/console/ConsoleUserDataAction.java | 2 +- .../ui/server/console/RegistrarsAction.java | 2 +- .../console/settings/ContactAction.java | 2 +- .../ui/server/registrar/ConsoleApiParams.java | 2 +- .../registrar/ConsoleOteSetupAction.java | 2 +- .../ConsoleRegistrarCreatorAction.java | 2 +- .../ui/server/registrar/ConsoleUiAction.java | 4 +- .../ui/server/registrar/HtmlAction.java | 4 +- .../registrar/RegistrarConsoleModule.java | 2 +- .../registrar/RegistryLockGetAction.java | 4 +- .../registrar/RegistryLockPostAction.java | 2 +- .../registry/whois/BaseWhoisModule.java | 2 +- .../registry/whois/DomainLookupCommand.java | 2 +- .../whois/NameserverLookupByHostCommand.java | 2 +- .../whois/NameserverLookupByIpCommand.java | 2 +- .../whois/RegistrarLookupCommand.java | 2 +- .../google/registry/whois/WhoisAction.java | 4 +- .../registry/whois/WhoisHttpAction.java | 6 +- .../google/registry/whois/WhoisReader.java | 2 +- .../batch/RelockDomainActionTest.java | 4 +- ...saveAllEppResourcesPipelineActionTest.java | 2 +- .../registry/bsa/BlockListFetcherTest.java | 2 +- .../registry/bsa/api/BsaCredentialTest.java | 2 +- .../google/registry/dns/DnsInjectionTest.java | 4 +- .../dns/PublishDnsUpdatesActionTest.java | 4 +- .../dns/RefreshDnsOnHostRenameActionTest.java | 4 +- .../export/ExportPremiumTermsActionTest.java | 4 +- .../export/ExportReservedTermsActionTest.java | 4 +- .../export/SyncGroupMembersActionTest.java | 4 +- .../google/registry/flows/EppTestCase.java | 2 +- .../registry/flows/TlsCredentialsTest.java | 2 +- .../groups/DirectoryGroupsConnectionTest.java | 6 +- .../module/backend/BackendServletTest.java | 4 +- .../registry/module/bsa/BsaServletTest.java | 4 +- .../module/frontend/FrontendServletTest.java | 4 +- .../module/pubapi/PubApiServletTest.java | 4 +- .../module/tools/ToolsServletTest.java | 4 +- .../registry/rdap/RdapJsonFormatterTest.java | 2 +- .../rdap/RdapSearchActionTestCase.java | 2 +- ...UpdateRegistrarRdapBaseUrlsActionTest.java | 4 +- .../reporting/ReportingModuleTest.java | 2 +- .../billing/CopyDetailReportsActionTest.java | 2 +- .../billing/GenerateInvoicesActionTest.java | 4 +- .../billing/PublishInvoicesActionTest.java | 8 +-- .../icann/IcannReportingModuleTest.java | 2 +- .../GenerateSpec11ReportActionTest.java | 2 +- .../spec11/PublishSpec11ReportActionTest.java | 8 +-- .../registry/request/RequestHandlerTest.java | 4 +- .../request/RequestParametersTest.java | 14 ++--- .../registry/request/ResponseImplTest.java | 2 +- .../AuthenticatedRegistrarAccessorTest.java | 4 +- .../LegacyAuthenticationMechanismTest.java | 2 +- .../OidcTokenAuthenticationMechanismTest.java | 2 +- .../auth/RequestAuthenticatorTest.java | 2 +- .../registry/security/JsonHttpTest.java | 4 +- .../registry/server/HealthzServlet.java | 8 +-- .../java/google/registry/server/Route.java | 2 +- .../ServletWrapperDelegatorServlet.java | 8 +-- .../server/StaticResourceServlet.java | 18 +++--- .../google/registry/server/TestServer.java | 51 +++++++-------- .../google/registry/testing/FailAnswer.java | 17 ++--- .../testing/FakeConsoleApiParams.java | 2 +- .../registry/testing/FakeHttpSession.java | 31 +-------- .../google/registry/testing/FakeResponse.java | 2 +- .../testing/FakeServletInputStream.java | 60 ------------------ .../testing/FakeServletOutputStream.java | 63 ------------------- .../registry/tmch/NordnUploadActionTest.java | 4 +- .../registry/tmch/NordnVerifyActionTest.java | 6 +- .../registry/tmch/TmchActionTestCase.java | 2 +- .../tools/server/CreateGroupsActionTest.java | 2 +- .../tools/server/ListActionTestCase.java | 2 +- .../console/ConsoleUserDataActionTest.java | 2 +- .../server/console/RegistrarsActionTest.java | 2 +- .../console/settings/ContactActionTest.java | 2 +- .../console/settings/SecurityActionTest.java | 2 +- .../WhoisRegistrarFieldsActionTest.java | 2 +- .../registrar/ConsoleOteSetupActionTest.java | 4 +- .../ConsoleRegistrarCreatorActionTest.java | 4 +- .../server/registrar/ConsoleUiActionTest.java | 4 +- .../RegistrarSettingsActionTestCase.java | 4 +- .../registrar/RegistryLockGetActionTest.java | 4 +- .../registrar/RegistryLockPostActionTest.java | 4 +- .../RegistryLockVerifyActionTest.java | 6 +- .../registry/whois/WhoisActionTest.java | 6 +- .../registry/whois/WhoisHttpActionTest.java | 6 +- .../registry/whois/WhoisInjectionTest.java | 4 +- db/gradle.lockfile | 2 +- dependencies.gradle | 8 +-- jetty/gradle.lockfile | 20 +++--- .../{ee8-deploy.ini => ee10-deploy.ini} | 8 +-- jetty/src/main/jetty-base/webapps/nomulus.xml | 2 +- jetty/src/main/webapp/WEB-INF/web.xml | 7 +-- proxy/gradle.lockfile | 10 +-- services/backend/gradle.lockfile | 20 +++--- services/bsa/gradle.lockfile | 20 +++--- services/default/gradle.lockfile | 20 +++--- services/pubapi/gradle.lockfile | 20 +++--- services/tools/gradle.lockfile | 20 +++--- 201 files changed, 394 insertions(+), 616 deletions(-) delete mode 100644 core/src/test/java/google/registry/testing/FakeServletInputStream.java delete mode 100644 core/src/test/java/google/registry/testing/FakeServletOutputStream.java rename jetty/src/main/jetty-base/start.d/{ee8-deploy.ini => ee10-deploy.ini} (87%) diff --git a/buildSrc/gradle.lockfile b/buildSrc/gradle.lockfile index 98cf9c60fed..28ff055dff5 100644 --- a/buildSrc/gradle.lockfile +++ b/buildSrc/gradle.lockfile @@ -9,16 +9,16 @@ com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor com.google.android:annotations:4.1.1.4=buildScriptClasspath com.google.api-client:google-api-client:2.3.0=buildScriptClasspath,compileClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=buildScriptClasspath,compileClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=buildScriptClasspath,compileClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=buildScriptClasspath,compileClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=buildScriptClasspath,compileClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=buildScriptClasspath,compileClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=buildScriptClasspath,compileClasspath com.google.api.grpc:proto-google-common-protos:2.36.0=buildScriptClasspath,compileClasspath com.google.api.grpc:proto-google-iam-v1:1.31.0=buildScriptClasspath,compileClasspath com.google.api:api-common:2.28.0=buildScriptClasspath,compileClasspath com.google.api:gax-grpc:2.45.0=buildScriptClasspath,compileClasspath com.google.api:gax-httpjson:2.45.0=buildScriptClasspath,compileClasspath com.google.api:gax:2.45.0=buildScriptClasspath,compileClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=buildScriptClasspath,compileClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=buildScriptClasspath,compileClasspath com.google.auth:google-auth-library-credentials:1.23.0=buildScriptClasspath,compileClasspath com.google.auth:google-auth-library-oauth2-http:1.23.0=buildScriptClasspath,compileClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor @@ -29,7 +29,7 @@ com.google.auto:auto-common:1.2.1=annotationProcessor com.google.cloud:google-cloud-core-grpc:2.35.0=buildScriptClasspath,compileClasspath com.google.cloud:google-cloud-core-http:2.35.0=buildScriptClasspath,compileClasspath com.google.cloud:google-cloud-core:2.35.0=buildScriptClasspath,compileClasspath -com.google.cloud:google-cloud-storage:2.35.0=buildScriptClasspath,compileClasspath +com.google.cloud:google-cloud-storage:2.36.0=buildScriptClasspath,compileClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,buildScriptClasspath,compileClasspath com.google.code.gson:gson:2.10.1=buildScriptClasspath,compileClasspath com.google.common.html.types:types:1.0.6=buildScriptClasspath,compileClasspath diff --git a/core/build.gradle b/core/build.gradle index 58a876f1ba0..ffce12f5ddf 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -197,7 +197,7 @@ dependencies { implementation deps['javax.mail:mail'] implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['javax.persistence:javax.persistence-api'] - implementation deps['javax.servlet:servlet-api'] + implementation deps['jakarta.servlet:jakarta.servlet-api'] implementation deps['javax.xml.bind:jaxb-api'] implementation deps['jline:jline'] implementation deps['joda-time:joda-time'] @@ -228,10 +228,10 @@ dependencies { implementation deps['org.joda:joda-money'] implementation deps['org.json:json'] implementation deps['org.jsoup:jsoup'] - testImplementation deps['org.mortbay.jetty:jetty'] + testImplementation deps['org.eclipse.jetty:jetty-server'] + testImplementation deps['org.eclipse.jetty.ee10:jetty-ee10-servlet'] + testImplementation deps['org.eclipse.jetty.ee10:jetty-ee10-webapp'] implementation deps['org.postgresql:postgresql'] - implementation "org.eclipse.jetty:jetty-server:9.4.49.v20220914" - implementation "org.eclipse.jetty:jetty-servlet:9.4.49.v20220914" testImplementation deps['org.seleniumhq.selenium:selenium-api'] testImplementation deps['org.seleniumhq.selenium:selenium-chrome-driver'] testImplementation deps['org.seleniumhq.selenium:selenium-java'] diff --git a/core/gradle.lockfile b/core/gradle.lockfile index efafbbd796d..13062795fff 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -39,7 +39,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,deploy_j com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=compileClasspath,dep com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -68,7 +68,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=compileC com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -93,7 +93,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClass com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -129,7 +129,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=compileClasspath,deploy_jar,nonprod com.google.cloud:google-cloud-pubsublite:1.12.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -311,6 +311,8 @@ jakarta-regexp:jakarta-regexp:1.4=compileClasspath,deploy_jar,nonprodCompileClas jakarta.activation:jakarta.activation-api:2.1.3=jaxb jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=soy +jakarta.servlet:jakarta.servlet-api:6.0.0=testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jaxb javacc:javacc:4.1=css javax.activation:activation:1.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -395,13 +397,15 @@ org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,deploy_jar,nonpr org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.easymock:easymock:3.0=css -org.eclipse.jetty:jetty-http:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.0.7=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.0.7=testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-database-postgresql:10.10.0=testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -461,8 +465,6 @@ org.jvnet.staxex:stax-ex:1.8=compileClasspath,deploy_jar,nonprodCompileClasspath org.mockito:mockito-core:1.10.19=css org.mockito:mockito-core:5.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:5.11.0=testCompileClasspath,testRuntimeClasspath -org.mortbay.jetty:jetty-util:6.1.26=testCompileClasspath,testRuntimeClasspath -org.mortbay.jetty:jetty:6.1.26=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:2.1=css org.objenesis:objenesis:3.3=testRuntimeClasspath org.ogce:xpp3:1.1.6=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -480,7 +482,7 @@ org.ow2.asm:asm:7.0=soy org.ow2.asm:asm:9.2=compileClasspath,nonprodCompileClasspath org.ow2.asm:asm:9.6=deploy_jar,jacocoAnt,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor -org.postgresql:postgresql:42.7.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.reflections:reflections:0.10.2=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.seleniumhq.selenium:selenium-api:3.141.59=testCompileClasspath,testRuntimeClasspath diff --git a/core/src/main/java/google/registry/batch/BatchModule.java b/core/src/main/java/google/registry/batch/BatchModule.java index 4d44b94ae33..252e974d327 100644 --- a/core/src/main/java/google/registry/batch/BatchModule.java +++ b/core/src/main/java/google/registry/batch/BatchModule.java @@ -32,8 +32,8 @@ import dagger.Module; import dagger.Provides; import google.registry.request.Parameter; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; /** Dagger module for injecting common settings for batch actions. */ diff --git a/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java b/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java index 66f95888bd9..b94348e3440 100644 --- a/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java +++ b/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java @@ -20,10 +20,10 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.ResourceUtils.readResourceUtf8; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; diff --git a/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java b/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java index 96112114f62..e7389823ac9 100644 --- a/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java +++ b/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java @@ -20,8 +20,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.request.RequestParameters.PARAM_DRY_RUN; import static google.registry.util.DateTimeUtils.START_OF_TIME; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.api.services.dataflow.Dataflow; import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter; diff --git a/core/src/main/java/google/registry/batch/RelockDomainAction.java b/core/src/main/java/google/registry/batch/RelockDomainAction.java index a197517372d..9d5d87605eb 100644 --- a/core/src/main/java/google/registry/batch/RelockDomainAction.java +++ b/core/src/main/java/google/registry/batch/RelockDomainAction.java @@ -19,8 +19,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.request.Action.Method.POST; import static google.registry.tools.LockOrUnlockDomainCommand.REGISTRY_LOCK_STATUSES; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; diff --git a/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java b/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java index 07b530c1d1e..80e9aeec4c8 100644 --- a/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java +++ b/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java @@ -16,8 +16,8 @@ import static google.registry.batch.BatchModule.PARAM_FAST; import static google.registry.beam.BeamUtils.createJobName; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.api.services.dataflow.Dataflow; import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter; diff --git a/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java b/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java index 29697983c3e..3ecffb341ef 100644 --- a/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java +++ b/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java @@ -16,8 +16,8 @@ import static google.registry.beam.BeamUtils.createJobName; import static google.registry.request.RequestParameters.PARAM_DRY_RUN; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.api.services.dataflow.Dataflow; import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter; diff --git a/core/src/main/java/google/registry/bsa/BlockListFetcher.java b/core/src/main/java/google/registry/bsa/BlockListFetcher.java index 22f6d790706..16d5a7a098b 100644 --- a/core/src/main/java/google/registry/bsa/BlockListFetcher.java +++ b/core/src/main/java/google/registry/bsa/BlockListFetcher.java @@ -14,8 +14,8 @@ package google.registry.bsa; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.api.client.http.HttpMethods; import com.google.common.collect.ImmutableMap; diff --git a/core/src/main/java/google/registry/bsa/BsaDownloadAction.java b/core/src/main/java/google/registry/bsa/BsaDownloadAction.java index 3cb5346e6b7..afd5e3e0815 100644 --- a/core/src/main/java/google/registry/bsa/BsaDownloadAction.java +++ b/core/src/main/java/google/registry/bsa/BsaDownloadAction.java @@ -23,7 +23,7 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import static google.registry.util.BatchedStreams.toBatches; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/core/src/main/java/google/registry/bsa/BsaRefreshAction.java b/core/src/main/java/google/registry/bsa/BsaRefreshAction.java index f50b2c7c8f7..0222bd6c1ac 100644 --- a/core/src/main/java/google/registry/bsa/BsaRefreshAction.java +++ b/core/src/main/java/google/registry/bsa/BsaRefreshAction.java @@ -18,7 +18,7 @@ import static google.registry.bsa.BsaStringUtils.LINE_SPLITTER; import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; diff --git a/core/src/main/java/google/registry/bsa/api/BsaCredential.java b/core/src/main/java/google/registry/bsa/api/BsaCredential.java index 3845c3b0cd6..76e41f32f55 100644 --- a/core/src/main/java/google/registry/bsa/api/BsaCredential.java +++ b/core/src/main/java/google/registry/bsa/api/BsaCredential.java @@ -15,8 +15,8 @@ package google.registry.bsa.api; import static google.registry.request.UrlConnectionUtils.getResponseBytes; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.api.client.http.HttpMethods; import com.google.common.annotations.VisibleForTesting; diff --git a/core/src/main/java/google/registry/bsa/api/BsaReportSender.java b/core/src/main/java/google/registry/bsa/api/BsaReportSender.java index c50f8dd8c2d..f27589a9f88 100644 --- a/core/src/main/java/google/registry/bsa/api/BsaReportSender.java +++ b/core/src/main/java/google/registry/bsa/api/BsaReportSender.java @@ -14,9 +14,9 @@ package google.registry.bsa.api; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.api.client.http.HttpMethods; import com.google.common.flogger.FluentLogger; diff --git a/core/src/main/java/google/registry/cron/CronModule.java b/core/src/main/java/google/registry/cron/CronModule.java index 3927b04bab7..07d12ebd675 100644 --- a/core/src/main/java/google/registry/cron/CronModule.java +++ b/core/src/main/java/google/registry/cron/CronModule.java @@ -23,8 +23,8 @@ import dagger.Module; import dagger.Provides; import google.registry.request.Parameter; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; /** Dagger module for the cron package. */ @Module diff --git a/core/src/main/java/google/registry/dns/DnsModule.java b/core/src/main/java/google/registry/dns/DnsModule.java index fc8e93156da..7399e124cd5 100644 --- a/core/src/main/java/google/registry/dns/DnsModule.java +++ b/core/src/main/java/google/registry/dns/DnsModule.java @@ -31,9 +31,9 @@ import google.registry.dns.writer.DnsWriterZone; import google.registry.request.Parameter; import google.registry.request.RequestParameters; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import java.util.Set; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; /** Dagger module for the dns package. */ diff --git a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java index 99e4ebef8df..f0fbb97f389 100644 --- a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -30,7 +30,7 @@ import static google.registry.request.Action.Method.POST; import static google.registry.request.RequestParameters.PARAM_TLD; import static google.registry.util.CollectionUtils.nullToEmpty; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java b/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java index cebc181f57d..2dc26c1cd9f 100644 --- a/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java +++ b/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java @@ -18,7 +18,7 @@ import static google.registry.dns.RefreshDnsOnHostRenameAction.PATH; import static google.registry.model.EppResourceUtils.getLinkedDomainKeys; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; import com.google.common.net.MediaType; import google.registry.model.EppResourceUtils; diff --git a/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml index 136328e7366..e47d22319eb 100644 --- a/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml @@ -12,7 +12,6 @@ - - - - - - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" + version="6.0"> diff --git a/core/src/main/java/google/registry/env/common/bsa/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/bsa/WEB-INF/web.xml index 980da4059a0..6e6c541f546 100644 --- a/core/src/main/java/google/registry/env/common/bsa/WEB-INF/web.xml +++ b/core/src/main/java/google/registry/env/common/bsa/WEB-INF/web.xml @@ -1,8 +1,7 @@ - - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" + version="6.0"> diff --git a/core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml index e6766c8f677..9d1967f0a99 100644 --- a/core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml +++ b/core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml @@ -1,8 +1,7 @@ - - + diff --git a/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml index 24f2fd6a502..11347b06f00 100644 --- a/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml +++ b/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml @@ -1,8 +1,7 @@ - - + diff --git a/core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml index 015077a72f9..2257209b095 100644 --- a/core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml +++ b/core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml @@ -1,8 +1,7 @@ - - + diff --git a/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml index a57ac284e05..10eaca9c4ed 100644 --- a/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml @@ -12,7 +12,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - See {@link jakarta.servlet.http.HttpServletRequest#getServletPath} */ @Qualifier @Documented diff --git a/core/src/main/java/google/registry/request/HttpException.java b/core/src/main/java/google/registry/request/HttpException.java index 07526a13da7..287b35cde7b 100644 --- a/core/src/main/java/google/registry/request/HttpException.java +++ b/core/src/main/java/google/registry/request/HttpException.java @@ -17,9 +17,9 @@ import static com.google.common.html.HtmlEscapers.htmlEscaper; import com.google.common.flogger.FluentLogger; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.logging.Level; -import javax.servlet.http.HttpServletResponse; /** Base for exceptions that cause an HTTP error response. */ public abstract class HttpException extends RuntimeException { diff --git a/core/src/main/java/google/registry/request/RequestHandler.java b/core/src/main/java/google/registry/request/RequestHandler.java index 1d4af530013..f1609321cfe 100644 --- a/core/src/main/java/google/registry/request/RequestHandler.java +++ b/core/src/main/java/google/registry/request/RequestHandler.java @@ -16,10 +16,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.flogger.FluentLogger; import google.registry.request.auth.AuthResult; @@ -27,12 +27,12 @@ import google.registry.util.NonFinalForTesting; import google.registry.util.SystemClock; import google.registry.util.TypeUtils.TypeInstantiator; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Optional; import javax.annotation.Nullable; import javax.inject.Provider; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/request/RequestMethod.java b/core/src/main/java/google/registry/request/RequestMethod.java index 8debc8020db..715bdcc7cc4 100644 --- a/core/src/main/java/google/registry/request/RequestMethod.java +++ b/core/src/main/java/google/registry/request/RequestMethod.java @@ -20,7 +20,7 @@ /** * Dagger qualifier for the HTTP request method. * - * @see javax.servlet.http.HttpServletRequest#getMethod() + * @see jakarta.servlet.http.HttpServletRequest#getMethod() */ @Qualifier @Documented diff --git a/core/src/main/java/google/registry/request/RequestModule.java b/core/src/main/java/google/registry/request/RequestModule.java index 07b0c4dd02d..d43a7ba5688 100644 --- a/core/src/main/java/google/registry/request/RequestModule.java +++ b/core/src/main/java/google/registry/request/RequestModule.java @@ -43,12 +43,12 @@ import google.registry.request.lock.LockHandler; import google.registry.request.lock.LockHandlerImpl; import google.registry.tools.GsonUtils; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.Map; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; diff --git a/core/src/main/java/google/registry/request/RequestParameters.java b/core/src/main/java/google/registry/request/RequestParameters.java index d9aaa3e8e91..e2b61c07809 100644 --- a/core/src/main/java/google/registry/request/RequestParameters.java +++ b/core/src/main/java/google/registry/request/RequestParameters.java @@ -24,9 +24,9 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import google.registry.request.HttpException.BadRequestException; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; /** Utilities for extracting parameters from HTTP requests. */ diff --git a/core/src/main/java/google/registry/request/RequestPath.java b/core/src/main/java/google/registry/request/RequestPath.java index c75605b5dc4..a7a6fb6e82e 100644 --- a/core/src/main/java/google/registry/request/RequestPath.java +++ b/core/src/main/java/google/registry/request/RequestPath.java @@ -20,7 +20,7 @@ /** * Dagger qualifier for the HTTP request path. * - * @see javax.servlet.http.HttpServletRequest#getRequestURI() + * @see jakarta.servlet.http.HttpServletRequest#getRequestURI() */ @Qualifier @Documented diff --git a/core/src/main/java/google/registry/request/RequestUrl.java b/core/src/main/java/google/registry/request/RequestUrl.java index 6d512edd3d7..dcb69695fe7 100644 --- a/core/src/main/java/google/registry/request/RequestUrl.java +++ b/core/src/main/java/google/registry/request/RequestUrl.java @@ -23,7 +23,7 @@ /** * Dagger qualifier for the HTTP request URL. * - * @see javax.servlet.http.HttpServletRequest#getRequestURL() + * @see jakarta.servlet.http.HttpServletRequest#getRequestURL() */ @Retention(RUNTIME) @Qualifier diff --git a/core/src/main/java/google/registry/request/Response.java b/core/src/main/java/google/registry/request/Response.java index 27c62706dd9..d39c0abe89c 100644 --- a/core/src/main/java/google/registry/request/Response.java +++ b/core/src/main/java/google/registry/request/Response.java @@ -15,8 +15,8 @@ package google.registry.request; import com.google.common.net.MediaType; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/request/ResponseImpl.java b/core/src/main/java/google/registry/request/ResponseImpl.java index 4bb317e6aef..ec2c537b5a9 100644 --- a/core/src/main/java/google/registry/request/ResponseImpl.java +++ b/core/src/main/java/google/registry/request/ResponseImpl.java @@ -15,10 +15,10 @@ package google.registry.request; import com.google.common.net.MediaType; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import javax.inject.Inject; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; /** HTTP response object. */ diff --git a/core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java index db30f77b07e..b1cd1c0cfbf 100644 --- a/core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java +++ b/core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java @@ -14,7 +14,7 @@ package google.registry.request.auth; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * A particular way to authenticate an HTTP request, returning an {@link AuthResult}. diff --git a/core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java index 3e2e9ee32fd..1c826a09a1e 100644 --- a/core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java +++ b/core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java @@ -23,8 +23,8 @@ import com.google.appengine.api.users.UserService; import com.google.common.collect.ImmutableSet; import google.registry.security.XsrfTokenManager; +import jakarta.servlet.http.HttpServletRequest; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; /** * Authentication mechanism for legacy cookie-based App Engine authentication. diff --git a/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java index 93e49d5f356..286cc7ec2bc 100644 --- a/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java +++ b/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java @@ -27,10 +27,10 @@ import google.registry.request.auth.AuthModule.RegularOidcFallback; import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.util.RegistryEnvironment; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import javax.annotation.Nullable; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; /** * An authenticam mechanism that verifies the OIDC token. diff --git a/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java b/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java index bec01c8656b..817d45af1ac 100644 --- a/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java +++ b/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java @@ -24,9 +24,9 @@ import com.google.common.collect.Ordering; import com.google.common.flogger.FluentLogger; import google.registry.request.auth.AuthSettings.AuthMethod; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; /** Top-level authentication/authorization class; calls authentication mechanisms as needed. */ public class RequestAuthenticator { diff --git a/core/src/main/java/google/registry/security/JsonHttp.java b/core/src/main/java/google/registry/security/JsonHttp.java index 0362399d435..0dbf152a63f 100644 --- a/core/src/main/java/google/registry/security/JsonHttp.java +++ b/core/src/main/java/google/registry/security/JsonHttp.java @@ -22,13 +22,13 @@ import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.Map; import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; diff --git a/core/src/main/java/google/registry/tmch/Marksdb.java b/core/src/main/java/google/registry/tmch/Marksdb.java index 02c22318b06..51727f5c010 100644 --- a/core/src/main/java/google/registry/tmch/Marksdb.java +++ b/core/src/main/java/google/registry/tmch/Marksdb.java @@ -18,8 +18,8 @@ import static google.registry.request.UrlConnectionUtils.getResponseBytes; import static google.registry.request.UrlConnectionUtils.setBasicAuth; import static google.registry.util.HexDumper.dumpHex; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.US_ASCII; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; diff --git a/core/src/main/java/google/registry/tmch/NordnUploadAction.java b/core/src/main/java/google/registry/tmch/NordnUploadAction.java index 3d274739b81..3d3a72e9c1c 100644 --- a/core/src/main/java/google/registry/tmch/NordnUploadAction.java +++ b/core/src/main/java/google/registry/tmch/NordnUploadAction.java @@ -24,8 +24,8 @@ import static google.registry.tmch.LordnTaskUtils.COLUMNS_SUNRISE; import static google.registry.tmch.LordnTaskUtils.getCsvLineForClaimsDomain; import static google.registry.tmch.LordnTaskUtils.getCsvLineForSunriseDomain; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; import static java.nio.charset.StandardCharsets.US_ASCII; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; import com.google.api.client.http.HttpMethods; import com.google.cloud.tasks.v2.Task; diff --git a/core/src/main/java/google/registry/tmch/NordnVerifyAction.java b/core/src/main/java/google/registry/tmch/NordnVerifyAction.java index 2ab5b95f8f0..ee4b065ecb8 100644 --- a/core/src/main/java/google/registry/tmch/NordnVerifyAction.java +++ b/core/src/main/java/google/registry/tmch/NordnVerifyAction.java @@ -15,9 +15,9 @@ package google.registry.tmch; import static google.registry.request.UrlConnectionUtils.getResponseBytes; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.annotations.VisibleForTesting; import com.google.common.flogger.FluentLogger; diff --git a/core/src/main/java/google/registry/tmch/TmchModule.java b/core/src/main/java/google/registry/tmch/TmchModule.java index ba2c106b988..29926ced979 100644 --- a/core/src/main/java/google/registry/tmch/TmchModule.java +++ b/core/src/main/java/google/registry/tmch/TmchModule.java @@ -23,9 +23,9 @@ import google.registry.keyring.api.KeyModule.Key; import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; +import jakarta.servlet.http.HttpServletRequest; import java.net.MalformedURLException; import java.net.URL; -import javax.servlet.http.HttpServletRequest; import org.bouncycastle.openpgp.PGPPublicKey; /** Dagger module for TMCH package. */ diff --git a/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java b/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java index c818c8daf1d..cfea189a926 100644 --- a/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java +++ b/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java @@ -16,8 +16,8 @@ import static google.registry.export.SyncGroupMembersAction.getGroupEmailAddressForContactType; import static google.registry.request.Action.Method.POST; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.util.Arrays.asList; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.flogger.FluentLogger; import google.registry.config.RegistryConfig.Config; diff --git a/core/src/main/java/google/registry/tools/server/ToolsServerModule.java b/core/src/main/java/google/registry/tools/server/ToolsServerModule.java index 898c7c3db84..379f8cfc9fb 100644 --- a/core/src/main/java/google/registry/tools/server/ToolsServerModule.java +++ b/core/src/main/java/google/registry/tools/server/ToolsServerModule.java @@ -23,8 +23,8 @@ import dagger.Module; import dagger.Provides; import google.registry.request.Parameter; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; /** * Dagger module for the tools package. diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java index 002478a76b7..35f6e530f8c 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java @@ -20,9 +20,9 @@ import google.registry.model.console.User; import google.registry.security.XsrfTokenManager; import google.registry.ui.server.registrar.ConsoleApiParams; +import jakarta.servlet.http.Cookie; import java.util.Arrays; import java.util.Optional; -import javax.servlet.http.Cookie; /** Base class for handling Console API requests */ public abstract class ConsoleApiAction implements Runnable { diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java index 15d86971a4a..314013cf3a6 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java @@ -23,8 +23,8 @@ import google.registry.request.Action; import google.registry.request.auth.Auth; import google.registry.ui.server.registrar.ConsoleApiParams; +import jakarta.servlet.http.Cookie; import javax.inject.Inject; -import javax.servlet.http.Cookie; import org.json.JSONObject; @Action( diff --git a/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java b/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java index cc14d8dc8e7..c0b576a1906 100644 --- a/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java +++ b/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java @@ -36,10 +36,10 @@ import google.registry.request.auth.AuthResult; import google.registry.ui.server.registrar.JsonGetAction; import google.registry.util.StringGenerator; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import javax.inject.Inject; import javax.inject.Named; -import javax.servlet.http.HttpServletRequest; @Action( service = Action.Service.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java b/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java index ccb63a4be36..475e30b25bf 100644 --- a/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java +++ b/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java @@ -37,10 +37,10 @@ import google.registry.ui.forms.FormException; import google.registry.ui.server.registrar.JsonGetAction; import google.registry.ui.server.registrar.RegistrarSettingsAction; +import jakarta.servlet.http.HttpServletRequest; import java.util.Collections; import java.util.Optional; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; @Action( service = Action.Service.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/registrar/ConsoleApiParams.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleApiParams.java index 93f0a990102..95617c6d1e7 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/ConsoleApiParams.java +++ b/core/src/main/java/google/registry/ui/server/registrar/ConsoleApiParams.java @@ -18,7 +18,7 @@ import google.registry.request.Response; import google.registry.request.auth.AuthResult; import google.registry.security.XsrfTokenManager; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** Groups necessary dependencies for Console API actions * */ @AutoValue diff --git a/core/src/main/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java index 25cf0ea277d..8c3b6dc61d8 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java @@ -17,7 +17,7 @@ import static com.google.common.base.Preconditions.checkState; import static google.registry.ui.server.SoyTemplateUtils.CSS_RENAMING_MAP_SUPPLIER; import static google.registry.util.RegistryEnvironment.PRODUCTION; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; import com.google.common.base.Ascii; import com.google.common.base.Supplier; diff --git a/core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java index 6048515aba2..4344e29bee6 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java @@ -19,7 +19,7 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.ui.server.SoyTemplateUtils.CSS_RENAMING_MAP_SUPPLIER; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; import com.google.common.base.Ascii; import com.google.common.base.Splitter; diff --git a/core/src/main/java/google/registry/ui/server/registrar/ConsoleUiAction.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleUiAction.java index 83e0b8d8dd1..9ee4fda1945 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/ConsoleUiAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/ConsoleUiAction.java @@ -17,8 +17,8 @@ import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.ADMIN; import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.OWNER; import static google.registry.ui.server.SoyTemplateUtils.CSS_RENAMING_MAP_SUPPLIER; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSetMultimap; diff --git a/core/src/main/java/google/registry/ui/server/registrar/HtmlAction.java b/core/src/main/java/google/registry/ui/server/registrar/HtmlAction.java index 3c83ac2887e..b14efa3274f 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/HtmlAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/HtmlAction.java @@ -16,7 +16,7 @@ import static com.google.common.net.HttpHeaders.LOCATION; import static com.google.common.net.HttpHeaders.X_FRAME_OPTIONS; -import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; +import static jakarta.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import com.google.appengine.api.users.UserService; import com.google.common.flogger.FluentLogger; @@ -28,10 +28,10 @@ import google.registry.request.auth.AuthResult; import google.registry.request.auth.UserAuthInfo; import google.registry.security.XsrfTokenManager; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; /** * Handles some of the nitty-gritty of responding to requests that should return HTML, including diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java b/core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java index c04b143c3ed..c41197303d8 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java @@ -32,8 +32,8 @@ import google.registry.request.Response; import google.registry.request.auth.AuthResult; import google.registry.security.XsrfTokenManager; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; /** Dagger module for the Registrar Console parameters. */ diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java index 08dc9233249..a110d6e8f09 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockGetAction.java @@ -19,8 +19,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.security.JsonResponseHelper.Status.SUCCESS; import static google.registry.ui.server.registrar.RegistrarConsoleModule.PARAM_CLIENT_ID; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import com.google.appengine.api.users.User; import com.google.common.annotations.VisibleForTesting; diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java index 2646bd178a3..e268d9fcaf0 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistryLockPostAction.java @@ -46,13 +46,13 @@ import google.registry.security.JsonResponseHelper; import google.registry.tools.DomainLockUtils; import google.registry.util.EmailMessage; +import jakarta.servlet.http.HttpServletRequest; import java.net.URISyntaxException; import java.util.Map; import java.util.Optional; import javax.inject.Inject; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; -import javax.servlet.http.HttpServletRequest; import org.apache.http.client.utils.URIBuilder; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/whois/BaseWhoisModule.java b/core/src/main/java/google/registry/whois/BaseWhoisModule.java index aee86b24c7a..7b4bdf5490d 100644 --- a/core/src/main/java/google/registry/whois/BaseWhoisModule.java +++ b/core/src/main/java/google/registry/whois/BaseWhoisModule.java @@ -18,9 +18,9 @@ import dagger.Provides; import google.registry.util.Clock; import google.registry.whois.WhoisMetrics.WhoisMetric; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.Reader; -import javax.servlet.http.HttpServletRequest; /** * Dagger base module for the whois package. diff --git a/core/src/main/java/google/registry/whois/DomainLookupCommand.java b/core/src/main/java/google/registry/whois/DomainLookupCommand.java index a83756344b8..ead015d4631 100644 --- a/core/src/main/java/google/registry/whois/DomainLookupCommand.java +++ b/core/src/main/java/google/registry/whois/DomainLookupCommand.java @@ -21,7 +21,7 @@ import static google.registry.model.tld.Tlds.findTldForName; import static google.registry.model.tld.Tlds.getTlds; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; diff --git a/core/src/main/java/google/registry/whois/NameserverLookupByHostCommand.java b/core/src/main/java/google/registry/whois/NameserverLookupByHostCommand.java index f2186e52426..36fa8b1ebea 100644 --- a/core/src/main/java/google/registry/whois/NameserverLookupByHostCommand.java +++ b/core/src/main/java/google/registry/whois/NameserverLookupByHostCommand.java @@ -19,7 +19,7 @@ import static google.registry.model.EppResourceUtils.loadByForeignKeyCached; import static google.registry.model.tld.Tlds.findTldForName; import static google.registry.model.tld.Tlds.getTlds; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; import com.google.common.net.InternetDomainName; diff --git a/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java b/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java index dc50b5bc324..e784fa4b308 100644 --- a/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java +++ b/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java @@ -17,7 +17,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableList.toImmutableList; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; diff --git a/core/src/main/java/google/registry/whois/RegistrarLookupCommand.java b/core/src/main/java/google/registry/whois/RegistrarLookupCommand.java index 51d801afeb3..059091d4fb1 100644 --- a/core/src/main/java/google/registry/whois/RegistrarLookupCommand.java +++ b/core/src/main/java/google/registry/whois/RegistrarLookupCommand.java @@ -18,7 +18,7 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static google.registry.model.CacheUtils.memoizeWithShortExpiration; import static google.registry.util.RegistrarUtils.normalizeRegistrarName; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CharMatcher; diff --git a/core/src/main/java/google/registry/whois/WhoisAction.java b/core/src/main/java/google/registry/whois/WhoisAction.java index c07421b5361..114d7459d34 100644 --- a/core/src/main/java/google/registry/whois/WhoisAction.java +++ b/core/src/main/java/google/registry/whois/WhoisAction.java @@ -15,8 +15,8 @@ package google.registry.whois; import static google.registry.request.Action.Method.POST; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; diff --git a/core/src/main/java/google/registry/whois/WhoisHttpAction.java b/core/src/main/java/google/registry/whois/WhoisHttpAction.java index fc2c6c3f09d..ad20aa1946b 100644 --- a/core/src/main/java/google/registry/whois/WhoisHttpAction.java +++ b/core/src/main/java/google/registry/whois/WhoisHttpAction.java @@ -22,9 +22,9 @@ import static com.google.common.net.HttpHeaders.LAST_MODIFIED; import static com.google.common.net.HttpHeaders.X_CONTENT_TYPE_OPTIONS; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.common.base.Joiner; import com.google.common.base.Splitter; diff --git a/core/src/main/java/google/registry/whois/WhoisReader.java b/core/src/main/java/google/registry/whois/WhoisReader.java index 5f20e769e73..5ab3f7ee71a 100644 --- a/core/src/main/java/google/registry/whois/WhoisReader.java +++ b/core/src/main/java/google/registry/whois/WhoisReader.java @@ -18,7 +18,7 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static google.registry.model.tld.Tlds.findTldForName; import static google.registry.util.DomainNameUtils.canonicalizeHostname; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.common.base.Joiner; import com.google.common.flogger.FluentLogger; diff --git a/core/src/test/java/google/registry/batch/RelockDomainActionTest.java b/core/src/test/java/google/registry/batch/RelockDomainActionTest.java index cee65386a5d..2198740739c 100644 --- a/core/src/test/java/google/registry/batch/RelockDomainActionTest.java +++ b/core/src/test/java/google/registry/batch/RelockDomainActionTest.java @@ -28,8 +28,8 @@ import static google.registry.testing.SqlHelper.getRegistryLockByVerificationCode; import static google.registry.testing.SqlHelper.saveRegistryLock; import static google.registry.tools.LockOrUnlockDomainCommand.REGISTRY_LOCK_STATUSES; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/core/src/test/java/google/registry/batch/ResaveAllEppResourcesPipelineActionTest.java b/core/src/test/java/google/registry/batch/ResaveAllEppResourcesPipelineActionTest.java index 077c91101e0..ff2aca40c13 100644 --- a/core/src/test/java/google/registry/batch/ResaveAllEppResourcesPipelineActionTest.java +++ b/core/src/test/java/google/registry/batch/ResaveAllEppResourcesPipelineActionTest.java @@ -18,7 +18,7 @@ import static google.registry.batch.BatchModule.PARAM_FAST; import static google.registry.batch.ResaveAllEppResourcesPipelineAction.PIPELINE_NAME; import static google.registry.beam.BeamUtils.createJobName; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Mockito.verify; import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter; diff --git a/core/src/test/java/google/registry/bsa/BlockListFetcherTest.java b/core/src/test/java/google/registry/bsa/BlockListFetcherTest.java index 71ecc438db5..8ceb6a86fc8 100644 --- a/core/src/test/java/google/registry/bsa/BlockListFetcherTest.java +++ b/core/src/test/java/google/registry/bsa/BlockListFetcherTest.java @@ -15,8 +15,8 @@ package google.registry.bsa; import static com.google.common.truth.Truth.assertThat; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; diff --git a/core/src/test/java/google/registry/bsa/api/BsaCredentialTest.java b/core/src/test/java/google/registry/bsa/api/BsaCredentialTest.java index fec4d2cf362..ac750f5a267 100644 --- a/core/src/test/java/google/registry/bsa/api/BsaCredentialTest.java +++ b/core/src/test/java/google/registry/bsa/api/BsaCredentialTest.java @@ -15,8 +15,8 @@ package google.registry.bsa.api; import static com.google.common.truth.Truth.assertThat; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; diff --git a/core/src/test/java/google/registry/dns/DnsInjectionTest.java b/core/src/test/java/google/registry/dns/DnsInjectionTest.java index 285dd62f3cc..05dfa01fefc 100644 --- a/core/src/test/java/google/registry/dns/DnsInjectionTest.java +++ b/core/src/test/java/google/registry/dns/DnsInjectionTest.java @@ -32,10 +32,10 @@ import google.registry.request.RequestModule; import google.registry.testing.CloudTasksHelper.CloudTasksHelperModule; import google.registry.testing.FakeClock; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java index f1b7cb021e0..655cf55dc7f 100644 --- a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java +++ b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java @@ -33,8 +33,8 @@ import static google.registry.testing.DatabaseHelper.persistActiveDomain; import static google.registry.testing.DatabaseHelper.persistActiveSubordinateHost; import static google.registry.testing.DatabaseHelper.persistResource; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; diff --git a/core/src/test/java/google/registry/dns/RefreshDnsOnHostRenameActionTest.java b/core/src/test/java/google/registry/dns/RefreshDnsOnHostRenameActionTest.java index f875fab0306..eb1b9e4e5d7 100644 --- a/core/src/test/java/google/registry/dns/RefreshDnsOnHostRenameActionTest.java +++ b/core/src/test/java/google/registry/dns/RefreshDnsOnHostRenameActionTest.java @@ -23,8 +23,8 @@ import static google.registry.testing.DatabaseHelper.persistDeletedHost; import static google.registry.testing.DatabaseHelper.persistDomainAsDeleted; import static google.registry.testing.DatabaseHelper.persistResource; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableSet; import google.registry.model.eppcommon.StatusValue; diff --git a/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java b/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java index 41f206e4bd4..7219a58b9c8 100644 --- a/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java +++ b/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java @@ -20,9 +20,9 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.deleteTld; import static google.registry.testing.DatabaseHelper.persistResource; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.joda.money.CurrencyUnit.USD; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; diff --git a/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java b/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java index 3a21bb258c5..c9577142227 100644 --- a/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java +++ b/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java @@ -20,9 +20,9 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistReservedList; import static google.registry.testing.DatabaseHelper.persistResource; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java b/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java index 2466d48714a..b306e339ec8 100644 --- a/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java +++ b/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java @@ -22,8 +22,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.loadRegistrar; import static google.registry.testing.DatabaseHelper.persistResource; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; diff --git a/core/src/test/java/google/registry/flows/EppTestCase.java b/core/src/test/java/google/registry/flows/EppTestCase.java index 1dd28927982..3af8b2e9907 100644 --- a/core/src/test/java/google/registry/flows/EppTestCase.java +++ b/core/src/test/java/google/registry/flows/EppTestCase.java @@ -20,8 +20,8 @@ import static google.registry.testing.DatabaseHelper.stripBillingEventId; import static google.registry.testing.TestDataHelper.loadFile; import static google.registry.xml.XmlTestUtils.assertXmlEqualsWithMessage; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/core/src/test/java/google/registry/flows/TlsCredentialsTest.java b/core/src/test/java/google/registry/flows/TlsCredentialsTest.java index 95e635a5fde..f32a5479477 100644 --- a/core/src/test/java/google/registry/flows/TlsCredentialsTest.java +++ b/core/src/test/java/google/registry/flows/TlsCredentialsTest.java @@ -37,8 +37,8 @@ import google.registry.testing.FakeClock; import google.registry.util.CidrAddressBlock; import google.registry.util.ProxyHttpHeaders; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/groups/DirectoryGroupsConnectionTest.java b/core/src/test/java/google/registry/groups/DirectoryGroupsConnectionTest.java index df7d5d537d5..d0a6c0b201f 100644 --- a/core/src/test/java/google/registry/groups/DirectoryGroupsConnectionTest.java +++ b/core/src/test/java/google/registry/groups/DirectoryGroupsConnectionTest.java @@ -16,9 +16,9 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.groups.DirectoryGroupsConnection.getDefaultGroupPermissions; -import static javax.servlet.http.HttpServletResponse.SC_CONFLICT; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/core/src/test/java/google/registry/module/backend/BackendServletTest.java b/core/src/test/java/google/registry/module/backend/BackendServletTest.java index 315aa9ac7a9..919e650908a 100644 --- a/core/src/test/java/google/registry/module/backend/BackendServletTest.java +++ b/core/src/test/java/google/registry/module/backend/BackendServletTest.java @@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; /** Unit tests for {@link BackendServlet}. */ diff --git a/core/src/test/java/google/registry/module/bsa/BsaServletTest.java b/core/src/test/java/google/registry/module/bsa/BsaServletTest.java index 5d02b4238ae..3f94870d7a4 100644 --- a/core/src/test/java/google/registry/module/bsa/BsaServletTest.java +++ b/core/src/test/java/google/registry/module/bsa/BsaServletTest.java @@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; class BsaServletTest { diff --git a/core/src/test/java/google/registry/module/frontend/FrontendServletTest.java b/core/src/test/java/google/registry/module/frontend/FrontendServletTest.java index ab175d666d0..3038a5c8688 100644 --- a/core/src/test/java/google/registry/module/frontend/FrontendServletTest.java +++ b/core/src/test/java/google/registry/module/frontend/FrontendServletTest.java @@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; /** Unit tests for {@link FrontendServlet}. */ diff --git a/core/src/test/java/google/registry/module/pubapi/PubApiServletTest.java b/core/src/test/java/google/registry/module/pubapi/PubApiServletTest.java index ac5b483470f..f88f6921634 100644 --- a/core/src/test/java/google/registry/module/pubapi/PubApiServletTest.java +++ b/core/src/test/java/google/registry/module/pubapi/PubApiServletTest.java @@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; /** Unit tests for {@link PubApiServlet}. */ diff --git a/core/src/test/java/google/registry/module/tools/ToolsServletTest.java b/core/src/test/java/google/registry/module/tools/ToolsServletTest.java index 865f473b5d8..e33e8e8e084 100644 --- a/core/src/test/java/google/registry/module/tools/ToolsServletTest.java +++ b/core/src/test/java/google/registry/module/tools/ToolsServletTest.java @@ -18,8 +18,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; /** Unit tests for {@link ToolsServlet}. */ diff --git a/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java b/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java index 02a8cf2aa55..ba0d573150a 100644 --- a/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java +++ b/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java @@ -25,7 +25,7 @@ import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; import static google.registry.testing.TestDataHelper.loadFile; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/core/src/test/java/google/registry/rdap/RdapSearchActionTestCase.java b/core/src/test/java/google/registry/rdap/RdapSearchActionTestCase.java index e69f8ac2336..b62e2ecae2a 100644 --- a/core/src/test/java/google/registry/rdap/RdapSearchActionTestCase.java +++ b/core/src/test/java/google/registry/rdap/RdapSearchActionTestCase.java @@ -14,7 +14,7 @@ package google.registry.rdap; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableListMultimap; diff --git a/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java index 19a9e324017..1c05359ceb7 100644 --- a/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java +++ b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java @@ -18,8 +18,8 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.loadRegistrar; import static google.registry.testing.DatabaseHelper.persistSimpleResource; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/core/src/test/java/google/registry/reporting/ReportingModuleTest.java b/core/src/test/java/google/registry/reporting/ReportingModuleTest.java index f8ef4c1b757..d1c57901466 100644 --- a/core/src/test/java/google/registry/reporting/ReportingModuleTest.java +++ b/core/src/test/java/google/registry/reporting/ReportingModuleTest.java @@ -23,8 +23,8 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.testing.FakeClock; import google.registry.util.Clock; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.YearMonth; diff --git a/core/src/test/java/google/registry/reporting/billing/CopyDetailReportsActionTest.java b/core/src/test/java/google/registry/reporting/billing/CopyDetailReportsActionTest.java index 66b687997e7..58811a9371b 100644 --- a/core/src/test/java/google/registry/reporting/billing/CopyDetailReportsActionTest.java +++ b/core/src/test/java/google/registry/reporting/billing/CopyDetailReportsActionTest.java @@ -17,8 +17,8 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.DatabaseHelper.loadRegistrar; import static google.registry.testing.DatabaseHelper.persistResource; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/google/registry/reporting/billing/GenerateInvoicesActionTest.java b/core/src/test/java/google/registry/reporting/billing/GenerateInvoicesActionTest.java index a947e85c445..d9fa8fb6067 100644 --- a/core/src/test/java/google/registry/reporting/billing/GenerateInvoicesActionTest.java +++ b/core/src/test/java/google/registry/reporting/billing/GenerateInvoicesActionTest.java @@ -15,8 +15,8 @@ package google.registry.reporting.billing; import static com.google.common.truth.Truth.assertThat; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/google/registry/reporting/billing/PublishInvoicesActionTest.java b/core/src/test/java/google/registry/reporting/billing/PublishInvoicesActionTest.java index 0e6f8aaf451..8fe86a5824c 100644 --- a/core/src/test/java/google/registry/reporting/billing/PublishInvoicesActionTest.java +++ b/core/src/test/java/google/registry/reporting/billing/PublishInvoicesActionTest.java @@ -15,10 +15,10 @@ package google.registry.reporting.billing; import static com.google.common.truth.Truth.assertThat; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/google/registry/reporting/icann/IcannReportingModuleTest.java b/core/src/test/java/google/registry/reporting/icann/IcannReportingModuleTest.java index 03896a6f451..dd865dd8cd9 100644 --- a/core/src/test/java/google/registry/reporting/icann/IcannReportingModuleTest.java +++ b/core/src/test/java/google/registry/reporting/icann/IcannReportingModuleTest.java @@ -20,7 +20,7 @@ import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java b/core/src/test/java/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java index ca534566f99..2288ca288aa 100644 --- a/core/src/test/java/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java +++ b/core/src/test/java/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java @@ -15,7 +15,7 @@ package google.registry.reporting.spec11; import static com.google.common.truth.Truth.assertThat; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static org.apache.http.HttpStatus.SC_OK; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java b/core/src/test/java/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java index f8baee81b37..671c7fe8d5f 100644 --- a/core/src/test/java/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java +++ b/core/src/test/java/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java @@ -18,10 +18,10 @@ import static google.registry.reporting.spec11.Spec11RegistrarThreatMatchesParserTest.getMatchA; import static google.registry.reporting.spec11.Spec11RegistrarThreatMatchesParserTest.getMatchB; import static google.registry.reporting.spec11.Spec11RegistrarThreatMatchesParserTest.sampleThreatMatches; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/core/src/test/java/google/registry/request/RequestHandlerTest.java b/core/src/test/java/google/registry/request/RequestHandlerTest.java index 071a81c8212..46fb584acf3 100644 --- a/core/src/test/java/google/registry/request/RequestHandlerTest.java +++ b/core/src/test/java/google/registry/request/RequestHandlerTest.java @@ -35,11 +35,11 @@ import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.request.auth.RequestAuthenticator; import google.registry.request.auth.UserAuthInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/request/RequestParametersTest.java b/core/src/test/java/google/registry/request/RequestParametersTest.java index e945d6c4a23..c5c105b20f8 100644 --- a/core/src/test/java/google/registry/request/RequestParametersTest.java +++ b/core/src/test/java/google/registry/request/RequestParametersTest.java @@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableMap; import google.registry.request.HttpException.BadRequestException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; @@ -168,41 +168,41 @@ void testExtractBooleanParameter_notPresent_returnsFalse() { @Test void testExtractBooleanParameter_presentWithoutValue_returnsTrue() { - when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", "")); + when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", new String[] {})); assertThat(extractBooleanParameter(req, "love")).isTrue(); } @Test void testExtractBooleanParameter_empty_returnsTrue() { - when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", "")); + when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", new String[] {})); when(req.getParameter("love")).thenReturn(""); assertThat(extractBooleanParameter(req, "love")).isTrue(); } @Test void testExtractBooleanParameter_presentStringArbitrary_returnsTrue() { - when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", "lol")); + when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", new String[] {"lol"})); when(req.getParameter("love")).thenReturn("lol"); assertThat(extractBooleanParameter(req, "love")).isTrue(); } @Test void testExtractBooleanParameter_presentStringTrue_returnsTrue() { - when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", "true")); + when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", new String[] {"true"})); when(req.getParameter("love")).thenReturn("true"); assertThat(extractBooleanParameter(req, "love")).isTrue(); } @Test void testExtractBooleanParameter_presentStringFalse_returnsFalse() { - when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", "false")); + when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", new String[] {"false"})); when(req.getParameter("love")).thenReturn("false"); assertThat(extractBooleanParameter(req, "love")).isFalse(); } @Test void testExtractBooleanParameter_presentStringFalse_caseInsensitive() { - when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", "FaLsE")); + when(req.getParameterMap()).thenReturn(ImmutableMap.of("love", new String[] {"FaLsE"})); when(req.getParameter("love")).thenReturn("FaLsE"); assertThat(extractBooleanParameter(req, "love")).isFalse(); } diff --git a/core/src/test/java/google/registry/request/ResponseImplTest.java b/core/src/test/java/google/registry/request/ResponseImplTest.java index b09cfe11140..204607aa233 100644 --- a/core/src/test/java/google/registry/request/ResponseImplTest.java +++ b/core/src/test/java/google/registry/request/ResponseImplTest.java @@ -21,9 +21,9 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; /** Unit tests for {@link ResponseImpl}. */ diff --git a/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java index 552fc95df94..1ca49c5d69d 100644 --- a/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java +++ b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java @@ -43,10 +43,10 @@ import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; import google.registry.util.JdkLoggerConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Optional; import java.util.logging.Level; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/request/auth/LegacyAuthenticationMechanismTest.java b/core/src/test/java/google/registry/request/auth/LegacyAuthenticationMechanismTest.java index 0ced9a73d42..a08dce4a14a 100644 --- a/core/src/test/java/google/registry/request/auth/LegacyAuthenticationMechanismTest.java +++ b/core/src/test/java/google/registry/request/auth/LegacyAuthenticationMechanismTest.java @@ -29,7 +29,7 @@ import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.security.XsrfTokenManager; import google.registry.testing.FakeClock; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java b/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java index ad423204f6a..1bd7aff4579 100644 --- a/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java +++ b/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java @@ -39,8 +39,8 @@ import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.request.auth.OidcTokenAuthenticationMechanism.IapOidcAuthenticationMechanism; import google.registry.request.auth.OidcTokenAuthenticationMechanism.RegularOidcAuthenticationMechanism; +import jakarta.servlet.http.HttpServletRequest; import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/request/auth/RequestAuthenticatorTest.java b/core/src/test/java/google/registry/request/auth/RequestAuthenticatorTest.java index 64d55b4c0e8..f89247292c7 100644 --- a/core/src/test/java/google/registry/request/auth/RequestAuthenticatorTest.java +++ b/core/src/test/java/google/registry/request/auth/RequestAuthenticatorTest.java @@ -36,8 +36,8 @@ import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.request.auth.AuthSettings.AuthMethod; import google.registry.request.auth.AuthSettings.UserPolicy; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/security/JsonHttpTest.java b/core/src/test/java/google/registry/security/JsonHttpTest.java index a752365fca5..11351a33feb 100644 --- a/core/src/test/java/google/registry/security/JsonHttpTest.java +++ b/core/src/test/java/google/registry/security/JsonHttpTest.java @@ -26,12 +26,12 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; /** Unit tests for {@link JsonHttp}. */ diff --git a/core/src/test/java/google/registry/server/HealthzServlet.java b/core/src/test/java/google/registry/server/HealthzServlet.java index 36a4018a42e..c9312216781 100644 --- a/core/src/test/java/google/registry/server/HealthzServlet.java +++ b/core/src/test/java/google/registry/server/HealthzServlet.java @@ -15,12 +15,12 @@ package google.registry.server; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** Servlet for responding to {@code /healthz} requests. */ public final class HealthzServlet extends HttpServlet { diff --git a/core/src/test/java/google/registry/server/Route.java b/core/src/test/java/google/registry/server/Route.java index 9b0343c5a49..246585ea18a 100644 --- a/core/src/test/java/google/registry/server/Route.java +++ b/core/src/test/java/google/registry/server/Route.java @@ -15,7 +15,7 @@ package google.registry.server; import com.google.auto.value.AutoValue; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServlet; /** Pair of servlet path and servlet instance object. */ @AutoValue diff --git a/core/src/test/java/google/registry/server/ServletWrapperDelegatorServlet.java b/core/src/test/java/google/registry/server/ServletWrapperDelegatorServlet.java index 762ba2b0d2b..00e4519c829 100644 --- a/core/src/test/java/google/registry/server/ServletWrapperDelegatorServlet.java +++ b/core/src/test/java/google/registry/server/ServletWrapperDelegatorServlet.java @@ -19,16 +19,16 @@ import static google.registry.util.TypeUtils.instantiate; import com.google.common.util.concurrent.Uninterruptibles; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Queue; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; import javax.annotation.Nullable; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * Servlet that wraps a servlet and delegates request execution to a queue. diff --git a/core/src/test/java/google/registry/server/StaticResourceServlet.java b/core/src/test/java/google/registry/server/StaticResourceServlet.java index 8dd0fb674d2..75149750f7b 100644 --- a/core/src/test/java/google/registry/server/StaticResourceServlet.java +++ b/core/src/test/java/google/registry/server/StaticResourceServlet.java @@ -16,24 +16,24 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Verify.verify; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; import com.google.common.primitives.Ints; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Optional; import javax.annotation.PostConstruct; -import javax.servlet.ServletConfig; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.mortbay.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletHolder; /** * Servlet for serving static resources on a Jetty development server path prefix. @@ -70,11 +70,10 @@ public final class StaticResourceServlet extends HttpServlet { * is a directory * @param root file or root directory to serve */ - public static ServletHolder create(String prefix, Path root) { + public static void configureServletHolder(ServletHolder holder, String prefix, Path root) { root = root.toAbsolutePath(); checkArgument(Files.exists(root), "Root must exist: %s", root); checkArgument(prefix.startsWith("/"), "Prefix must start with a slash: %s", prefix); - ServletHolder holder = new ServletHolder(StaticResourceServlet.class); holder.setInitParameter("root", root.toString()); if (Files.isDirectory(root)) { checkArgument(prefix.endsWith("/*"), @@ -83,7 +82,6 @@ public static ServletHolder create(String prefix, Path root) { } else { holder.setInitParameter("prefix", prefix); } - return holder; } private Optional fileServer = Optional.empty(); diff --git a/core/src/test/java/google/registry/server/TestServer.java b/core/src/test/java/google/registry/server/TestServer.java index 3c68d74da87..385ecba44a7 100644 --- a/core/src/test/java/google/registry/server/TestServer.java +++ b/core/src/test/java/google/registry/server/TestServer.java @@ -26,6 +26,7 @@ import com.google.common.util.concurrent.SimpleTimeLimiter; import google.registry.ui.server.registrar.RegistrarSettingsAction; import google.registry.util.UrlChecker; +import jakarta.servlet.http.HttpServlet; import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Path; @@ -34,13 +35,12 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServlet; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.DefaultServlet; -import org.mortbay.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.DefaultServlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; /** * HTTP server that serves static content and handles servlet requests in the calling thread. @@ -50,11 +50,11 @@ * requests made to servlets (not static files) in the calling thread. * *

Note: This server is intended for development purposes. For the love all that is good, - * do not make this public facing. + * do not make this public-facing. * *

Implementation Details

* - *

Jetty6 is multithreaded and provides no mechanism for controlling which threads execute your + *

Jetty is multithreaded and provides no mechanism for controlling which threads execute your * requests. HttpServer solves this problem by wrapping all the servlets provided to the constructor * inside {@link ServletWrapperDelegatorServlet}. When requests come in, a {@link FutureTask} will * be sent back to this class using a {@link LinkedBlockingDeque} message queue. Those messages are @@ -81,8 +81,11 @@ public final class TestServer { public TestServer( HostAndPort address, ImmutableMap runfiles, ImmutableList routes) { urlAddress = createUrlAddress(address); - server.addConnector(createConnector(address)); - server.addHandler(createHandler(runfiles, routes)); + ServerConnector connector = new ServerConnector(server); + connector.setHost(urlAddress.getHost()); + connector.setPort(urlAddress.getPortOrDefault(DEFAULT_PORT)); + server.addConnector(connector); + server.setHandler(createHandler(runfiles, routes)); } /** Starts the HTTP server in a new thread and returns once it's online. */ @@ -147,20 +150,21 @@ public URL getUrl(String path) { } } - private Context createHandler(Map runfiles, ImmutableList routes) { - Context context = new Context(server, CONTEXT_PATH, Context.SESSIONS); - context.addServlet(new ServletHolder(HealthzServlet.class), "/healthz"); + private ServletContextHandler createHandler( + Map runfiles, ImmutableList routes) { + ServletContextHandler context = new ServletContextHandler(CONTEXT_PATH, WebAppContext.SESSIONS); + ServletHolder holder; + context.setContextPath(CONTEXT_PATH); + context.addServlet(HealthzServlet.class, "/healthz"); for (Map.Entry runfile : runfiles.entrySet()) { - context.addServlet( - StaticResourceServlet.create(runfile.getKey(), runfile.getValue()), - runfile.getKey()); + holder = context.addServlet(StaticResourceServlet.class, runfile.getKey()); + StaticResourceServlet.configureServletHolder(holder, runfile.getKey(), runfile.getValue()); } for (Route route : routes) { - context.addServlet(new ServletHolder(wrapServlet(route.servletClass())), route.path()); + context.addServlet(wrapServlet(route.servletClass()), route.path()); } - ServletHolder holder = new ServletHolder(DefaultServlet.class); + holder = context.addServlet(DefaultServlet.class, "/*"); holder.setInitParameter("aliases", "1"); - context.addServlet(holder, "/*"); return context; } @@ -168,13 +172,6 @@ private HttpServlet wrapServlet(Class servletClass) { return new ServletWrapperDelegatorServlet(servletClass, requestQueue); } - private static Connector createConnector(HostAndPort address) { - SocketConnector connector = new SocketConnector(); - connector.setHost(address.getHost()); - connector.setPort(address.getPortOrDefault(DEFAULT_PORT)); - return connector; - } - /** Converts a bind address into an address that other machines can use to connect here. */ private static HostAndPort createUrlAddress(HostAndPort address) { if (address.getHost().equals("::") || address.getHost().equals("0.0.0.0")) { diff --git a/core/src/test/java/google/registry/testing/FailAnswer.java b/core/src/test/java/google/registry/testing/FailAnswer.java index 2bf57c3e1e8..f42e29f56fc 100644 --- a/core/src/test/java/google/registry/testing/FailAnswer.java +++ b/core/src/test/java/google/registry/testing/FailAnswer.java @@ -21,18 +21,19 @@ * Display helpful failure message if a mocked method is called. * *

One important problem this solves is when you mock servlets and the test fails, you usually - * end up with failure messages like {@code Wanted but not invoked: rsp.setStatus(200)} which - * aren't very helpful. This is because servlets normally report problems by calling - * {@link javax.servlet.http.HttpServletResponse#sendError(int, String) rsp.sendError()} so it'd be - * nice if we could have the error message be whatever arguments get passed to {@code sendError}. + * end up with failure messages like {@code Wanted but not invoked: rsp.setStatus(200)} which aren't + * very helpful. This is because servlets normally report problems by calling {@link + * jakarta.servlet.http.HttpServletResponse#sendError(int, String) rsp.sendError()} so it'd be nice + * if we could have the error message be whatever arguments get passed to {@code sendError}. * *

And that's where {@link FailAnswer} comes to the rescue! Here's an example of what you could * put at the beginning of a servlet test method to have better error messages: * - * 

   {@code
- *   doAnswer(new FailAnswer<>()).when(rsp).sendError(anyInt());
- *   doAnswer(new FailAnswer<>()).when(rsp).sendError(anyInt(), anyString());
- *   }
+ * 
{@code
+ * doAnswer(new FailAnswer<>()).when(rsp).sendError(anyInt());
+ * doAnswer(new FailAnswer<>()).when(rsp).sendError(anyInt(), anyString());
+ *
+ * }
* * @param The return type of the mocked method (which doesn't actually return). */ diff --git a/core/src/test/java/google/registry/testing/FakeConsoleApiParams.java b/core/src/test/java/google/registry/testing/FakeConsoleApiParams.java index 18290ca4ba3..8d9f85bcdeb 100644 --- a/core/src/test/java/google/registry/testing/FakeConsoleApiParams.java +++ b/core/src/test/java/google/registry/testing/FakeConsoleApiParams.java @@ -21,8 +21,8 @@ import google.registry.request.auth.UserAuthInfo; import google.registry.security.XsrfTokenManager; import google.registry.ui.server.registrar.ConsoleApiParams; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; public final class FakeConsoleApiParams { diff --git a/core/src/test/java/google/registry/testing/FakeHttpSession.java b/core/src/test/java/google/registry/testing/FakeHttpSession.java index 13c0bda5af0..4d03796500f 100644 --- a/core/src/test/java/google/registry/testing/FakeHttpSession.java +++ b/core/src/test/java/google/registry/testing/FakeHttpSession.java @@ -16,12 +16,12 @@ import static com.google.common.base.Preconditions.checkState; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import javax.annotation.Nullable; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; /** A fake {@link HttpSession} that only provides support for getting/setting attributes. */ @SuppressWarnings("deprecation") @@ -61,11 +61,6 @@ public int getMaxInactiveInterval() { throw new UnsupportedOperationException(); } - @Override - public javax.servlet.http.HttpSessionContext getSessionContext() { - throw new UnsupportedOperationException(); - } - @Override public Object getAttribute(@Nullable String name) { checkState(isValid, "This session has been invalidated."); @@ -73,17 +68,7 @@ public Object getAttribute(@Nullable String name) { } @Override - public Object getValue(@Nullable String name) { - throw new UnsupportedOperationException(); - } - - @Override - public Enumeration getAttributeNames() { - throw new UnsupportedOperationException(); - } - - @Override - public String[] getValueNames() { + public Enumeration getAttributeNames() { throw new UnsupportedOperationException(); } @@ -93,22 +78,12 @@ public void setAttribute(@Nullable String name, @Nullable Object value) { map.put(name, value); } - @Override - public void putValue(@Nullable String name, @Nullable Object value) { - throw new UnsupportedOperationException(); - } - @Override public void removeAttribute(@Nullable String name) { checkState(isValid, "This session has been invalidated."); map.remove(name); } - @Override - public void removeValue(@Nullable String name) { - throw new UnsupportedOperationException(); - } - @Override public void invalidate() { isValid = false; diff --git a/core/src/test/java/google/registry/testing/FakeResponse.java b/core/src/test/java/google/registry/testing/FakeResponse.java index f5038fcdb3c..16a23d5fb48 100644 --- a/core/src/test/java/google/registry/testing/FakeResponse.java +++ b/core/src/test/java/google/registry/testing/FakeResponse.java @@ -22,11 +22,11 @@ import com.google.common.base.Throwables; import com.google.common.net.MediaType; import google.registry.request.Response; +import jakarta.servlet.http.Cookie; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.Cookie; import org.joda.time.DateTime; /** Fake implementation of {@link Response} for testing. */ diff --git a/core/src/test/java/google/registry/testing/FakeServletInputStream.java b/core/src/test/java/google/registry/testing/FakeServletInputStream.java deleted file mode 100644 index 6489163f06f..00000000000 --- a/core/src/test/java/google/registry/testing/FakeServletInputStream.java +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.testing; - -import com.google.common.io.ByteSource; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import javax.servlet.ServletInputStream; - -/** - * Used to mock the return value of {@link javax.servlet.ServletRequest#getInputStream}. - * - *

Most servlets will call {@link javax.servlet.ServletRequest#getReader}, in which case you - * can simply return a {@link java.io.StringReader} instance. But the getInputStream method is - * not as simple to mock and requires an implementing class. - */ -public final class FakeServletInputStream extends ServletInputStream { - - private final InputStream input; - - public FakeServletInputStream(byte[] buf) { - this.input = new ByteArrayInputStream(buf); - } - - /** - * Use a {@link ByteSource} as input for the servlet. Be sure to call {@link #close} after - * your servlet runs so the resource opened via {@code bytes} gets closed. - */ - public FakeServletInputStream(ByteSource bytes) throws IOException { - this.input = bytes.openStream(); - } - - @Override - public int read() throws IOException { - return input.read(); - } - - @Override - public int read(byte[] b, int off, int len) throws IOException { - return input.read(b, off, len); - } - - @Override - public void close() throws IOException { - input.close(); - } -} diff --git a/core/src/test/java/google/registry/testing/FakeServletOutputStream.java b/core/src/test/java/google/registry/testing/FakeServletOutputStream.java deleted file mode 100644 index 0c842767104..00000000000 --- a/core/src/test/java/google/registry/testing/FakeServletOutputStream.java +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.testing; - -import static java.nio.charset.StandardCharsets.UTF_8; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import javax.annotation.Nonnull; -import javax.servlet.ServletOutputStream; - -/** - * Used to mock the return value of {@link javax.servlet.ServletResponse#getOutputStream}. - * - *

Most servlets will call {@link javax.servlet.ServletResponse#getWriter}, in which case you - * can simply return a {@link java.io.StringWriter} instance. But the getOutputStream method is - * not as simple to mock and requires an implementing class. - */ -public final class FakeServletOutputStream extends ServletOutputStream { - - private final ByteArrayOutputStream out = new ByteArrayOutputStream(); - - /** @see java.io.OutputStream#write(int) */ - @Override - public void write(int b) { - out.write(b); - } - - /** @see java.io.OutputStream#write(byte[]) */ - @Override - public void write(@Nonnull @SuppressWarnings("null") byte[] b) throws IOException { - out.write(b); - } - - /** @see java.io.OutputStream#write(byte[], int, int) */ - @Override - public void write(@Nonnull @SuppressWarnings("null") byte[] b, int off, int len) { - out.write(b, off, len); - } - - /** Converts contents to a string, assuming UTF-8 encoding. */ - @Override - public String toString() { - try { - return out.toString(UTF_8.name()); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } -} diff --git a/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java index 5d6aca75873..66ddd89b9ce 100644 --- a/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java +++ b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java @@ -25,9 +25,9 @@ import static google.registry.testing.DatabaseHelper.loadRegistrar; import static google.registry.testing.DatabaseHelper.newDomain; import static google.registry.testing.DatabaseHelper.persistResource; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; diff --git a/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java b/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java index e4008df2044..56c60be1c72 100644 --- a/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java +++ b/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java @@ -18,10 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistResource; +import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; diff --git a/core/src/test/java/google/registry/tmch/TmchActionTestCase.java b/core/src/test/java/google/registry/tmch/TmchActionTestCase.java index c82d697df66..17d8264c73d 100644 --- a/core/src/test/java/google/registry/tmch/TmchActionTestCase.java +++ b/core/src/test/java/google/registry/tmch/TmchActionTestCase.java @@ -14,7 +14,7 @@ package google.registry.tmch; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java b/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java index b492d610852..85f5b47413a 100644 --- a/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java +++ b/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java @@ -15,7 +15,7 @@ package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/google/registry/tools/server/ListActionTestCase.java b/core/src/test/java/google/registry/tools/server/ListActionTestCase.java index 04fd81e5bd7..3859bd322ad 100644 --- a/core/src/test/java/google/registry/tools/server/ListActionTestCase.java +++ b/core/src/test/java/google/registry/tools/server/ListActionTestCase.java @@ -15,7 +15,7 @@ package google.registry.tools.server; import static com.google.common.truth.Truth.assertThat; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension; diff --git a/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java b/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java index 2fe15c4f1b3..801ae92f2c9 100644 --- a/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java @@ -31,11 +31,11 @@ import google.registry.testing.FakeConsoleApiParams; import google.registry.testing.FakeResponse; import google.registry.ui.server.registrar.ConsoleApiParams; +import jakarta.servlet.http.Cookie; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Optional; -import javax.servlet.http.Cookie; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java b/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java index ff6db88f583..000263312d5 100644 --- a/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java @@ -43,13 +43,13 @@ import google.registry.testing.FakeResponse; import google.registry.ui.server.registrar.RegistrarConsoleModule; import google.registry.util.StringGenerator; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java b/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java index 48aedf0af5d..86ac0dbdbf3 100644 --- a/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java @@ -40,12 +40,12 @@ import google.registry.request.auth.UserAuthInfo; import google.registry.testing.FakeResponse; import google.registry.ui.server.registrar.RegistrarConsoleModule; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.util.HashMap; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java b/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java index f5acd5c1365..4cb15dfa8b6 100644 --- a/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java @@ -40,11 +40,11 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.ui.server.registrar.RegistrarConsoleModule; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java b/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java index 1e2aef92608..af9e477be2c 100644 --- a/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java @@ -40,11 +40,11 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.ui.server.registrar.RegistrarConsoleModule; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java index 09dc44fea60..db30d4399ce 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.registrar.Registrar.loadByRegistrarId; import static google.registry.testing.DatabaseHelper.persistPremiumList; -import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; +import static jakarta.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import static org.joda.money.CurrencyUnit.USD; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.verify; @@ -46,8 +46,8 @@ import google.registry.ui.server.SendEmailUtils; import google.registry.util.EmailMessage; import google.registry.util.RegistryEnvironment; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java index 1bbe9f7f381..33f33d5cb2e 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.registrar.Registrar.loadByRegistrarId; import static google.registry.testing.DatabaseHelper.persistPremiumList; -import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; +import static jakarta.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import static org.joda.money.CurrencyUnit.USD; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -47,8 +47,8 @@ import google.registry.ui.server.SendEmailUtils; import google.registry.util.EmailMessage; import google.registry.util.RegistryEnvironment; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.joda.money.CurrencyUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Order; diff --git a/core/src/test/java/google/registry/ui/server/registrar/ConsoleUiActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleUiActionTest.java index 0cc27215cb2..53f25123477 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/ConsoleUiActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/ConsoleUiActionTest.java @@ -19,7 +19,7 @@ import static com.google.monitoring.metrics.contrib.LongMetricSubject.assertThat; import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.ADMIN; import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.OWNER; -import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; +import static jakarta.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,8 +38,8 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.UserServiceExtension; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java index 8430272bde4..19b7567dba8 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java @@ -48,11 +48,11 @@ import google.registry.testing.FakeClock; import google.registry.ui.server.SendEmailUtils; import google.registry.util.EmailMessage; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.io.StringWriter; import javax.mail.internet.InternetAddress; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java index e348ded0b13..22d5caad198 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java @@ -22,8 +22,8 @@ import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.OWNER; import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.testing.SqlHelper.saveRegistryLock; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.api.client.http.HttpStatusCodes; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java index e01a4379d7c..544d73aeb77 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java @@ -55,12 +55,12 @@ import google.registry.tools.DomainLockUtils; import google.registry.util.EmailMessage; import google.registry.util.StringGenerator.Alphabets; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; import java.util.Optional; import java.util.UUID; import javax.mail.internet.InternetAddress; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.joda.time.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java index adb7bebe8ca..ab4ce42b425 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockVerifyActionTest.java @@ -23,8 +23,8 @@ import static google.registry.testing.SqlHelper.getRegistryLockByVerificationCode; import static google.registry.testing.SqlHelper.saveRegistryLock; import static google.registry.tools.LockOrUnlockDomainCommand.REGISTRY_LOCK_STATUSES; -import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -54,7 +54,7 @@ import google.registry.tools.DomainLockUtils; import google.registry.util.StringGenerator; import google.registry.util.StringGenerator.Alphabets; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.joda.time.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/whois/WhoisActionTest.java b/core/src/test/java/google/registry/whois/WhoisActionTest.java index a5e7b41f75b..9974860d31d 100644 --- a/core/src/test/java/google/registry/whois/WhoisActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisActionTest.java @@ -29,9 +29,9 @@ import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarPocs; import static google.registry.whois.WhoisTestData.loadFile; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java index b72a5e2e6f4..0bfaeda21f3 100644 --- a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java @@ -26,9 +26,9 @@ import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar; import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarPocs; import static google.registry.whois.WhoisTestData.loadFile; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/core/src/test/java/google/registry/whois/WhoisInjectionTest.java b/core/src/test/java/google/registry/whois/WhoisInjectionTest.java index 34d91af6cc5..f10e6a1db61 100644 --- a/core/src/test/java/google/registry/whois/WhoisInjectionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisInjectionTest.java @@ -25,12 +25,12 @@ import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension; import google.registry.request.RequestModule; import google.registry.testing.FullFieldsTestEntityHelper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/db/gradle.lockfile b/db/gradle.lockfile index 0244b3cdc44..a61f6c4cc87 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -113,7 +113,7 @@ org.ow2.asm:asm-tree:9.6=jacocoAnt org.ow2.asm:asm:9.2=deploy_jar,runtimeClasspath org.ow2.asm:asm:9.6=jacocoAnt,testCompileClasspath,testRuntimeClasspath org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor -org.postgresql:postgresql:42.7.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=deploy_jar,runtimeClasspath,testRuntimeClasspath org.reflections:reflections:0.10.2=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=testCompileClasspath diff --git a/dependencies.gradle b/dependencies.gradle index cd0b5068653..310ce4c628d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -185,10 +185,10 @@ ext { 'io.github.classgraph:classgraph:[4.8.102,)', 'io.github.java-diff-utils:java-diff-utils:[4.9,)', 'io.netty:netty-tcnative-boringssl-static:[2.0.36.Final,)', + 'jakarta.servlet:jakarta.servlet-api:[6.0,)', // Upgrade to jakarta when we remove App Engine dependency 'javax.mail:mail:[1.4,)', 'javax.persistence:javax.persistence-api:[2.2,)', - 'javax.servlet:servlet-api:[2.5,)', 'javax.xml.bind:jaxb-api:[2.3.0,)', 'joda-time:joda-time:[2.9.2,)', 'junit:junit:[4.13,)', @@ -215,8 +215,6 @@ ext { 'org.bouncycastle:bcprov-jdk18on:[1.67,)', 'org.checkerframework:checker-compat-qual:[2.5.5,)', 'org.checkerframework:checker-qual:[3.9.1,)', - 'org.eclipse.jetty:jetty-server:[9.4.49.v20220914,)', - 'org.eclipse.jetty:jetty-servlet:[9.4.49.v20220914,)', 'org.flywaydb:flyway-core:[10.0.0,)', 'org.flywaydb:flyway-database-postgresql:[10.0.0,)', 'org.hamcrest:hamcrest-core:[2.2,)', @@ -234,7 +232,9 @@ ext { 'org.junit.platform:junit-platform-suite-api:[1.6.2,)', 'org.mockito:mockito-core:[3.7.7,)', 'org.mockito:mockito-junit-jupiter:[3.7.7,)', - 'org.mortbay.jetty:jetty:[6.1.26,)', + 'org.eclipse.jetty:jetty-server:[12.0.0,)', + 'org.eclipse.jetty.ee10:jetty-ee10-servlet:[12.0.0,)', + 'org.eclipse.jetty.ee10:jetty-ee10-webapp:[12.0.0,)', 'org.ogce:xpp3:[1.1.6,)', 'org.postgresql:postgresql:[42.2.18,)', 'org.slf4j:slf4j-jdk14:[1.7.28,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index 0d58d7452f8..318fe72bddf 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -36,7 +36,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=deploy_jar,runtimeClasspa com.google.api-client:google-api-client-java6:2.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -46,7 +46,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=deploy_jar,runtimeCl com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=deploy_j com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -89,7 +89,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=deploy_jar,r com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -121,7 +121,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=deploy_jar,runtimeClasspath,testRun com.google.cloud:google-cloud-pubsublite:1.12.20=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -263,6 +263,7 @@ io.outfoxx:swiftpoet:1.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -322,13 +323,6 @@ org.codehaus.jackson:jackson-core-asl:1.9.13=deploy_jar,runtimeClasspath,testRun org.codehaus.jackson:jackson-mapper-asl:1.9.13=deploy_jar,runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=deploy_jar,runtimeClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -372,7 +366,7 @@ org.ow2.asm:asm-tree:9.6=jacocoAnt org.ow2.asm:asm-util:7.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.6=deploy_jar,jacocoAnt,runtimeClasspath,testRuntimeClasspath org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor -org.postgresql:postgresql:42.7.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=deploy_jar,runtimeClasspath,testRuntimeClasspath org.reflections:reflections:0.10.2=checkstyle org.rnorth.duct-tape:duct-tape:1.0.8=deploy_jar,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.1.0-alpha1=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/jetty/src/main/jetty-base/start.d/ee8-deploy.ini b/jetty/src/main/jetty-base/start.d/ee10-deploy.ini similarity index 87% rename from jetty/src/main/jetty-base/start.d/ee8-deploy.ini rename to jetty/src/main/jetty-base/start.d/ee10-deploy.ini index 69fdbddeddc..f76075a7018 100644 --- a/jetty/src/main/jetty-base/start.d/ee8-deploy.ini +++ b/jetty/src/main/jetty-base/start.d/ee10-deploy.ini @@ -1,14 +1,14 @@ # --------------------------------------- -# Module: ee8-deploy +# Module: ee10-deploy # This module enables webapp deployment from the `$JETTY_BASE/webapps` directory. # --------------------------------------- ---modules=ee8-deploy +--modules=ee10-deploy ## Monitored directory name (relative to $jetty.base) # jetty.deploy.monitoredDir=webapps ## Defaults Descriptor for all deployed webapps -# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee8.xml +# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee10.xml ## Monitored directory scan period (seconds) jetty.deploy.scanInterval=1 @@ -23,7 +23,7 @@ jetty.deploy.scanInterval=1 # jetty.deploy.configurationClasses= ## Pattern to select jars from the container classloader to be scanned (or null to scan no jars) -# jetty.deploy.containerScanJarPattern=.*/jetty-servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$ +# jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$ ## Pattern to select jars from the container classloader to be scanned (or null to scan all jars). # jetty.deploy.webInfScanJarPattern= diff --git a/jetty/src/main/jetty-base/webapps/nomulus.xml b/jetty/src/main/jetty-base/webapps/nomulus.xml index aa521fc658b..b039798051c 100644 --- a/jetty/src/main/jetty-base/webapps/nomulus.xml +++ b/jetty/src/main/jetty-base/webapps/nomulus.xml @@ -1,7 +1,7 @@ - + / ./webapps/nomulus.war diff --git a/jetty/src/main/webapp/WEB-INF/web.xml b/jetty/src/main/webapp/WEB-INF/web.xml index 45c4836879e..e6ba35badcb 100644 --- a/jetty/src/main/webapp/WEB-INF/web.xml +++ b/jetty/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,7 @@ - - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" + version="6.0"> diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index e3d68cb5346..9fec1d1148c 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -14,9 +14,9 @@ com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRunt com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.android:annotations:4.1.1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -28,7 +28,7 @@ com.google.api:gax-httpjson:2.45.0=compileClasspath,deploy_jar,runtimeClasspath, com.google.api:gax:2.45.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudkms:v1-rev20240219-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationP com.google.cloud:google-cloud-core-grpc:2.35.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-core-http:2.35.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-core:2.35.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.10.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index b21a49ee82e..90a39b3f712 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -34,7 +34,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeC com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=compileClasspath,run com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=compileC com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,7 +88,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClass com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=runtimeClasspath,testRuntimeClasspath @@ -118,7 +118,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=compileClasspath,runtimeClasspath,t com.google.cloud:google-cloud-pubsublite:1.12.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -247,6 +247,7 @@ io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -302,13 +303,6 @@ org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,runtimeClasspath,t org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -344,7 +338,7 @@ org.ow2.asm:asm-tree:9.2=compileClasspath,runtimeClasspath,testCompileClasspath, org.ow2.asm:asm-util:7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm:9.2=compileClasspath,testCompileClasspath org.ow2.asm:asm:9.6=runtimeClasspath,testRuntimeClasspath -org.postgresql:postgresql:42.7.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile index b21a49ee82e..90a39b3f712 100644 --- a/services/bsa/gradle.lockfile +++ b/services/bsa/gradle.lockfile @@ -34,7 +34,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeC com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=compileClasspath,run com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=compileC com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,7 +88,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClass com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=runtimeClasspath,testRuntimeClasspath @@ -118,7 +118,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=compileClasspath,runtimeClasspath,t com.google.cloud:google-cloud-pubsublite:1.12.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -247,6 +247,7 @@ io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -302,13 +303,6 @@ org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,runtimeClasspath,t org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -344,7 +338,7 @@ org.ow2.asm:asm-tree:9.2=compileClasspath,runtimeClasspath,testCompileClasspath, org.ow2.asm:asm-util:7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm:9.2=compileClasspath,testCompileClasspath org.ow2.asm:asm:9.6=runtimeClasspath,testRuntimeClasspath -org.postgresql:postgresql:42.7.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index b21a49ee82e..90a39b3f712 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -34,7 +34,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeC com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=compileClasspath,run com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=compileC com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,7 +88,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClass com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=runtimeClasspath,testRuntimeClasspath @@ -118,7 +118,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=compileClasspath,runtimeClasspath,t com.google.cloud:google-cloud-pubsublite:1.12.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -247,6 +247,7 @@ io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -302,13 +303,6 @@ org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,runtimeClasspath,t org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -344,7 +338,7 @@ org.ow2.asm:asm-tree:9.2=compileClasspath,runtimeClasspath,testCompileClasspath, org.ow2.asm:asm-util:7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm:9.2=compileClasspath,testCompileClasspath org.ow2.asm:asm:9.6=runtimeClasspath,testRuntimeClasspath -org.postgresql:postgresql:42.7.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index b21a49ee82e..90a39b3f712 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -34,7 +34,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeC com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=compileClasspath,run com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=compileC com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,7 +88,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClass com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=runtimeClasspath,testRuntimeClasspath @@ -118,7 +118,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=compileClasspath,runtimeClasspath,t com.google.cloud:google-cloud-pubsublite:1.12.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -247,6 +247,7 @@ io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -302,13 +303,6 @@ org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,runtimeClasspath,t org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -344,7 +338,7 @@ org.ow2.asm:asm-tree:9.2=compileClasspath,runtimeClasspath,testCompileClasspath, org.ow2.asm:asm-util:7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm:9.2=compileClasspath,testCompileClasspath org.ow2.asm:asm:9.6=runtimeClasspath,testRuntimeClasspath -org.postgresql:postgresql:42.7.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index b21a49ee82e..90a39b3f712 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -34,7 +34,7 @@ com.google.api-client:google-api-client-jackson2:2.0.1=compileClasspath,runtimeC com.google.api-client:google-api-client-java6:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client-servlet:2.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api-client:google-api-client:1.35.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ com.google.api.grpc:grpc-google-cloud-pubsublite-v1:1.12.20=compileClasspath,run com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-common-protos:2.30.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.172.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.56.0=compileC com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.35.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.36.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.127.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,7 +88,7 @@ com.google.apis:google-api-services-monitoring:v3-rev20240303-2.0.0=compileClass com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sheets:v4-rev20230815-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240304-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240209-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240307-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-1.0-sdk:2.0.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.appengine:appengine-api-stubs:2.0.25=runtimeClasspath,testRuntimeClasspath com.google.appengine:appengine-remote-api:2.0.25=runtimeClasspath,testRuntimeClasspath @@ -118,7 +118,7 @@ com.google.cloud:google-cloud-pubsub:1.126.0=compileClasspath,runtimeClasspath,t com.google.cloud:google-cloud-pubsublite:1.12.20=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-secretmanager:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.56.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.35.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-tasks:2.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:grpc-gcp:1.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -247,6 +247,7 @@ io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.servlet:jakarta.servlet-api:6.1.0-M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -302,13 +303,6 @@ org.codehaus.jackson:jackson-core-asl:1.9.13=compileClasspath,runtimeClasspath,t org.codehaus.jackson:jackson-mapper-asl:1.9.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util-ajax:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.49.v20220914=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.flywaydb:flyway-core:10.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -344,7 +338,7 @@ org.ow2.asm:asm-tree:9.2=compileClasspath,runtimeClasspath,testCompileClasspath, org.ow2.asm:asm-util:7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm:9.2=compileClasspath,testCompileClasspath org.ow2.asm:asm:9.6=runtimeClasspath,testRuntimeClasspath -org.postgresql:postgresql:42.7.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.postgresql:postgresql:42.7.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.1.0-alpha1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath