From d9ad39cdadd73ae7da0375dc821f1872816569cb Mon Sep 17 00:00:00 2001 From: Weimin Yu Date: Tue, 3 Sep 2024 14:02:53 -0400 Subject: [PATCH] Upgrade to Hibernate6 and Jaxb4 (#2526) * Rebase * Addressing commetns * Addressing comments * Auto convert Duration and Money --- common/gradle.lockfile | 12 +- core/build.gradle | 14 +- core/gradle.lockfile | 270 +++-- .../batch/CheckBulkComplianceAction.java | 4 +- .../batch/DeleteProberDataAction.java | 6 +- .../ExpandBillingRecurrencesPipeline.java | 3 +- .../beam/billing/InvoicingPipeline.java | 4 +- .../registry/beam/common/RegistryJpaIO.java | 2 +- .../registry/beam/common/RegistryQuery.java | 10 +- .../registry/beam/spec11/Spec11Pipeline.java | 2 +- .../WipeOutContactHistoryPiiPipeline.java | 4 +- .../UploadBsaUnavailableDomainsAction.java | 2 +- .../bsa/persistence/BsaDomainRefresh.java | 14 +- .../registry/bsa/persistence/BsaDownload.java | 18 +- .../registry/bsa/persistence/BsaLabel.java | 6 +- .../bsa/persistence/BsaUnblockableDomain.java | 12 +- .../registry/bsa/persistence/Queries.java | 17 +- .../registry/model/CreateAutoTimestamp.java | 8 +- .../registry/model/EntityYamlUtils.java | 19 + .../google/registry/model/EppResource.java | 18 +- .../registry/model/EppResourceUtils.java | 2 +- .../registry/model/ImmutableObject.java | 9 +- .../registry/model/UpdateAutoTimestamp.java | 8 +- .../model/UpdateAutoTimestampEntity.java | 8 +- .../model/adapters/CurrencyUnitAdapter.java | 2 +- .../adapters/EnumToAttributeAdapter.java | 4 +- .../registry/model/billing/BillingBase.java | 14 +- .../model/billing/BillingCancellation.java | 10 +- .../registry/model/billing/BillingEvent.java | 20 +- .../model/billing/BillingRecurrence.java | 28 +- .../model/common/CrossTldSingleton.java | 4 +- .../google/registry/model/common/Cursor.java | 14 +- .../model/common/DnsRefreshRequest.java | 18 +- .../registry/model/common/FeatureFlag.java | 13 +- .../registry/model/common/TimeOfYear.java | 2 +- .../model/common/TimedTransitionProperty.java | 38 +- .../console/ConsoleEppActionHistory.java | 14 +- .../model/console/ConsoleUpdateHistory.java | 18 +- .../console/RegistrarPocUpdateHistory.java | 14 +- .../model/console/RegistrarUpdateHistory.java | 14 +- .../google/registry/model/console/User.java | 12 +- .../registry/model/console/UserBase.java | 14 +- .../registry/model/console/UserRoles.java | 15 +- .../model/console/UserUpdateHistory.java | 14 +- .../registry/model/contact/Contact.java | 12 +- .../model/contact/ContactAddress.java | 2 +- .../model/contact/ContactAuthInfo.java | 4 +- .../registry/model/contact/ContactBase.java | 20 +- .../model/contact/ContactCommand.java | 12 +- .../model/contact/ContactHistory.java | 14 +- .../model/contact/ContactInfoData.java | 10 +- .../model/contact/ContactPhoneNumber.java | 2 +- .../registry/model/contact/Disclose.java | 13 +- .../registry/model/contact/PostalInfo.java | 18 +- .../registry/model/contact/package-info.java | 13 +- .../model/domain/DesignatedContact.java | 4 +- .../google/registry/model/domain/Domain.java | 28 +- .../registry/model/domain/DomainAuthInfo.java | 2 +- .../registry/model/domain/DomainBase.java | 26 +- .../registry/model/domain/DomainCommand.java | 16 +- .../registry/model/domain/DomainHistory.java | 32 +- .../registry/model/domain/DomainInfoData.java | 8 +- .../model/domain/DomainRenewData.java | 6 +- .../domain/ForeignKeyedDesignatedContact.java | 4 +- .../registry/model/domain/GracePeriod.java | 12 +- .../model/domain/GracePeriodBase.java | 14 +- .../google/registry/model/domain/Period.java | 12 +- .../registry/model/domain/RegistryLock.java | 28 +- .../domain/bulktoken/BulkTokenExtension.java | 2 +- .../bulktoken/BulkTokenResponseExtension.java | 4 +- .../model/domain/bulktoken/package-info.java | 10 +- .../registry/model/domain/fee/BaseFee.java | 10 +- .../fee/FeeCheckCommandExtensionItem.java | 2 +- .../fee/FeeCheckResponseExtensionItem.java | 2 +- .../domain/fee/FeeCreateCommandExtension.java | 2 +- .../fee/FeeExtensionCommandDescriptor.java | 4 +- .../fee/FeeQueryCommandExtensionItem.java | 2 +- .../fee/FeeQueryResponseExtensionItem.java | 4 +- .../domain/fee/FeeRenewCommandExtension.java | 2 +- .../fee/FeeTransferCommandExtension.java | 2 +- .../fee/FeeTransformCommandExtension.java | 4 +- .../fee/FeeTransformResponseExtension.java | 4 +- .../domain/fee/FeeUpdateCommandExtension.java | 2 +- .../FeeCheckCommandExtensionItemV06.java | 2 +- .../fee06/FeeCheckCommandExtensionV06.java | 4 +- .../FeeCheckResponseExtensionItemV06.java | 2 +- .../fee06/FeeCheckResponseExtensionV06.java | 4 +- .../fee06/FeeCreateCommandExtensionV06.java | 4 +- .../fee06/FeeCreateResponseExtensionV06.java | 4 +- .../fee06/FeeDeleteResponseExtensionV06.java | 4 +- .../fee06/FeeInfoCommandExtensionV06.java | 4 +- .../fee06/FeeInfoResponseExtensionV06.java | 4 +- .../fee06/FeeRenewCommandExtensionV06.java | 4 +- .../fee06/FeeRenewResponseExtensionV06.java | 4 +- .../fee06/FeeTransferCommandExtensionV06.java | 4 +- .../FeeTransferResponseExtensionV06.java | 4 +- .../fee06/FeeUpdateCommandExtensionV06.java | 4 +- .../fee06/FeeUpdateResponseExtensionV06.java | 4 +- .../model/domain/fee06/package-info.java | 13 +- .../fee11/FeeCheckCommandExtensionV11.java | 6 +- .../FeeCheckResponseExtensionItemV11.java | 4 +- .../fee11/FeeCheckResponseExtensionV11.java | 4 +- .../fee11/FeeCreateCommandExtensionV11.java | 6 +- .../fee11/FeeCreateResponseExtensionV11.java | 4 +- .../fee11/FeeDeleteResponseExtensionV11.java | 4 +- .../fee11/FeeRenewCommandExtensionV11.java | 6 +- .../fee11/FeeRenewResponseExtensionV11.java | 4 +- .../fee11/FeeTransferCommandExtensionV11.java | 6 +- .../FeeTransferResponseExtensionV11.java | 4 +- .../fee11/FeeUpdateCommandExtensionV11.java | 6 +- .../fee11/FeeUpdateResponseExtensionV11.java | 4 +- .../model/domain/fee11/package-info.java | 13 +- .../FeeCheckCommandExtensionItemV12.java | 6 +- .../fee12/FeeCheckCommandExtensionV12.java | 6 +- ...eCheckResponseExtensionItemCommandV12.java | 6 +- .../FeeCheckResponseExtensionItemV12.java | 2 +- .../fee12/FeeCheckResponseExtensionV12.java | 6 +- .../fee12/FeeCreateCommandExtensionV12.java | 6 +- .../fee12/FeeCreateResponseExtensionV12.java | 4 +- .../fee12/FeeDeleteResponseExtensionV12.java | 4 +- .../fee12/FeeRenewCommandExtensionV12.java | 6 +- .../fee12/FeeRenewResponseExtensionV12.java | 4 +- .../fee12/FeeTransferCommandExtensionV12.java | 6 +- .../FeeTransferResponseExtensionV12.java | 4 +- .../fee12/FeeUpdateCommandExtensionV12.java | 6 +- .../fee12/FeeUpdateResponseExtensionV12.java | 4 +- .../model/domain/fee12/package-info.java | 15 +- .../domain/launch/LaunchCheckExtension.java | 6 +- .../launch/LaunchCheckResponseExtension.java | 10 +- .../domain/launch/LaunchCreateExtension.java | 10 +- .../domain/launch/LaunchDeleteExtension.java | 2 +- .../model/domain/launch/LaunchExtension.java | 2 +- .../domain/launch/LaunchInfoExtension.java | 4 +- .../model/domain/launch/LaunchNotice.java | 12 +- .../model/domain/launch/LaunchPhase.java | 4 +- .../domain/launch/LaunchUpdateExtension.java | 2 +- .../model/domain/launch/package-info.java | 13 +- .../domain/metadata/MetadataExtension.java | 4 +- .../model/domain/metadata/package-info.java | 10 +- .../registry/model/domain/package-info.java | 15 +- .../model/domain/rgp/GracePeriodStatus.java | 4 +- .../model/domain/rgp/RestoreCommand.java | 6 +- .../model/domain/rgp/RgpInfoExtension.java | 2 +- .../model/domain/rgp/RgpUpdateExtension.java | 2 +- .../model/domain/rgp/package-info.java | 10 +- .../model/domain/secdns/DomainDsData.java | 18 +- .../model/domain/secdns/DomainDsDataBase.java | 18 +- .../domain/secdns/DomainDsDataHistory.java | 10 +- .../domain/secdns/SecDnsCreateExtension.java | 4 +- .../domain/secdns/SecDnsInfoExtension.java | 2 +- .../domain/secdns/SecDnsUpdateExtension.java | 10 +- .../model/domain/secdns/package-info.java | 10 +- .../DomainDeleteSuperuserExtension.java | 4 +- ...mainTransferRequestSuperuserExtension.java | 4 +- .../DomainUpdateSuperuserExtension.java | 4 +- .../domain/superuser/SuperuserExtension.java | 2 +- .../model/domain/superuser/package-info.java | 10 +- .../model/domain/token/AllocationToken.java | 33 +- .../token/AllocationTokenExtension.java | 6 +- .../domain/token/BulkPricingPackage.java | 30 +- .../model/domain/token/package-info.java | 10 +- .../registry/model/eppcommon/Address.java | 20 +- .../registry/model/eppcommon/AuthInfo.java | 20 +- .../registry/model/eppcommon/PhoneNumber.java | 14 +- .../model/eppcommon/PresenceMarker.java | 4 +- .../model/eppcommon/ProtocolDefinition.java | 2 +- .../registry/model/eppcommon/StatusValue.java | 2 +- .../google/registry/model/eppcommon/Trid.java | 6 +- .../registry/model/eppinput/EppInput.java | 24 +- .../model/eppinput/ResourceCommand.java | 6 +- .../registry/model/eppinput/package-info.java | 10 +- .../registry/model/eppoutput/CheckData.java | 14 +- .../registry/model/eppoutput/CreateData.java | 8 +- .../registry/model/eppoutput/EppOutput.java | 6 +- .../registry/model/eppoutput/EppResponse.java | 12 +- .../registry/model/eppoutput/Greeting.java | 4 +- .../registry/model/eppoutput/Result.java | 4 +- .../model/eppoutput/package-info.java | 13 +- .../java/google/registry/model/host/Host.java | 12 +- .../google/registry/model/host/HostBase.java | 13 +- .../registry/model/host/HostCommand.java | 8 +- .../registry/model/host/HostHistory.java | 14 +- .../registry/model/host/HostInfoData.java | 6 +- .../model/host/InetAddressAdapter.java | 10 +- .../registry/model/host/package-info.java | 15 +- .../model/mark/CommonMarkContactFields.java | 4 +- .../registry/model/mark/CommonMarkFields.java | 4 +- .../google/registry/model/mark/CourtMark.java | 4 +- .../java/google/registry/model/mark/Mark.java | 4 +- .../registry/model/mark/MarkContact.java | 6 +- .../registry/model/mark/MarkHolder.java | 6 +- .../registry/model/mark/MarkProtection.java | 2 +- .../registry/model/mark/ProtectedMark.java | 4 +- .../google/registry/model/mark/Trademark.java | 4 +- .../model/mark/TreatyOrStatuteMark.java | 4 +- .../registry/model/mark/package-info.java | 13 +- .../google/registry/model/package-info.java | 12 +- .../registry/model/poll/MessageQueueInfo.java | 4 +- .../PendingActionNotificationResponse.java | 14 +- .../registry/model/poll/PollMessage.java | 26 +- .../registry/model/poll/package-info.java | 13 +- .../registry/model/rde/RdeRevision.java | 14 +- .../registry/model/registrar/Registrar.java | 16 +- .../model/registrar/RegistrarAddress.java | 2 +- .../model/registrar/RegistrarBase.java | 41 +- .../model/registrar/RegistrarPoc.java | 10 +- .../model/registrar/RegistrarPocBase.java | 32 +- .../reporting/DomainTransactionRecord.java | 14 +- .../model/reporting/HistoryEntry.java | 24 +- .../model/reporting/HistoryEntryDao.java | 4 +- .../model/reporting/Spec11ThreatMatch.java | 17 +- .../model/reporting/Spec11ThreatMatchDao.java | 6 +- .../google/registry/model/server/Lock.java | 14 +- .../registry/model/server/ServerSecret.java | 4 +- .../registry/model/smd/EncodedSignedMark.java | 6 +- .../google/registry/model/smd/IssuerInfo.java | 4 +- .../google/registry/model/smd/SignedMark.java | 8 +- .../model/smd/SignedMarkRevocationList.java | 18 +- .../registry/model/smd/package-info.java | 13 +- .../java/google/registry/model/tld/Tld.java | 64 +- .../java/google/registry/model/tld/Tlds.java | 2 +- .../model/tld/label/BaseDomainLabelList.java | 10 +- .../model/tld/label/DomainLabelEntry.java | 6 +- .../registry/model/tld/label/PremiumList.java | 15 +- .../model/tld/label/ReservedList.java | 25 +- .../registry/model/tmch/ClaimsEntry.java | 11 +- .../registry/model/tmch/ClaimsList.java | 26 +- .../google/registry/model/tmch/TmchCrl.java | 4 +- .../model/transfer/BaseTransferObject.java | 12 +- .../model/transfer/ContactTransferData.java | 2 +- .../model/transfer/DomainTransferData.java | 10 +- .../registry/model/transfer/TransferData.java | 10 +- .../model/transfer/TransferResponse.java | 10 +- .../model/transfer/TransferStatus.java | 2 +- .../registry/model/transfer/package-info.java | 13 +- .../persistence/EntityCallbacksListener.java | 24 +- .../persistence/HibernateSchemaExporter.java | 6 +- .../registry/persistence/JpaRetries.java | 2 +- .../persistence/NomulusPostgreSQLDialect.java | 72 +- .../persistence/PersistenceComponent.java | 2 +- .../persistence/PersistenceModule.java | 4 +- .../google/registry/persistence/WithVKey.java | 4 +- .../AllocationTokenListConverter.java | 33 - ...ocationTokenStatusTransitionUserType.java} | 15 +- .../AllocationTokenVkeyListUserType.java | 53 + ...ava => BillingCostTransitionUserType.java} | 14 +- .../BillingEventFlagSetConverter.java | 35 - .../converter/BloomFilterConverter.java | 4 +- .../converter/CidrBlockListUserType.java | 42 + .../converter/CommandNameSetConverter.java | 34 - .../converter/CurrencyToBillingConverter.java | 50 - .../CurrencyToStringMapUserType.java | 42 + .../converter/CurrencyUnitConverter.java | 2 +- .../converter/DateTimeConverter.java | 20 +- ...onConverter.java => DurationUserType.java} | 102 +- ...a => FeatureStatusTransitionUserType.java} | 14 +- .../converter/IdnTableEnumSetConverter.java | 34 - .../converter/InetAddressSetConverter.java | 33 - .../converter/InetAddressSetUserType.java | 49 + .../converter/IntervalDescriptor.java | 139 --- .../persistence/converter/JodaMoneyType.java | 139 +-- .../converter/LocalDateConverter.java | 4 +- .../persistence/converter/MapUserType.java | 104 ++ .../PostalInfoChoiceListConverter.java | 35 - .../PostalInfoChoiceListUserType.java | 50 + .../converter/RegistrarPocSetConverter.java | 33 - .../converter/RegistrarToRoleConverter.java | 50 - .../converter/RegistrarToRoleMapUserType.java | 41 + ...ec11ThreatMatchThreatTypeSetConverter.java | 34 - .../converter/StatusValueSetConverter.java | 34 - .../converter/StringCollectionDescriptor.java | 191 ---- .../converter/StringCollectionUserType.java | 128 +++ .../converter/StringListConverter.java | 33 - .../converter/StringListConverterBase.java | 48 - .../converter/StringMapConverterBase.java | 70 -- .../converter/StringMapDescriptor.java | 177 ---- ...tConverter.java => StringMapUserType.java} | 28 +- .../converter/StringSetConverter.java | 33 - .../converter/StringSetConverterBase.java | 47 - .../TimedTransitionBaseUserType.java | 62 ++ .../TimedTransitionPropertyConverterBase.java | 44 - ...r.java => TldStateTransitionUserType.java} | 14 +- .../converter/ToStringConverterBase.java | 2 +- ...ansferServerApproveEntitySetConverter.java | 37 - .../persistence/converter/VKeyConverter.java | 2 +- .../transaction/CriteriaQueryBuilder.java | 12 +- .../transaction/DatabaseException.java | 2 +- .../persistence/transaction/IdService.java | 6 +- .../transaction/JpaTransactionManager.java | 8 +- .../JpaTransactionManagerImpl.java | 69 +- .../transaction/QueryComposer.java | 6 +- .../registry/rdap/RdapDomainSearchAction.java | 4 +- .../registry/rdap/RdapJsonFormatter.java | 2 +- .../rdap/RdapNameserverSearchAction.java | 2 +- .../registry/rdap/RdapSearchActionBase.java | 2 +- .../google/registry/rde/RdeMarshaller.java | 4 +- .../tools/UniformRapidSuspensionCommand.java | 2 +- .../tools/ValidateEscrowDepositCommand.java | 2 +- .../tools/server/GenerateZoneFilesAction.java | 4 +- .../server/RefreshDnsForAllDomainsAction.java | 5 +- .../console/ConsoleDomainListAction.java | 2 +- .../java/google/registry/xjc/XjcObject.java | 8 +- .../java/google/registry/xjc/bindings.xjb | 6 +- .../google/registry/xjc/package-info.java.in | 62 +- .../java/google/registry/xml/DateAdapter.java | 2 +- .../google/registry/xml/PeriodAdapter.java | 2 +- .../registry/xml/TrimWhitespaceAdapter.java | 2 +- .../registry/xml/UtcDateTimeAdapter.java | 2 +- .../google/registry/xml/XmlException.java | 2 +- .../registry/xml/XmlFragmentMarshaller.java | 10 +- .../google/registry/xml/XmlTransformer.java | 28 +- .../main/resources/META-INF/persistence.xml | 20 - .../billing/sql/cloud_sql_billing_events.sql | 4 +- .../beam/billing/InvoicingPipelineTest.java | 19 +- .../beam/common/RegistryJpaReadTest.java | 4 +- .../writer/dnsupdate/DnsUpdateWriterTest.java | 11 +- .../model/CreateAutoTimestampTest.java | 4 +- .../registry/model/ImmutableObjectTest.java | 4 +- .../model/UpdateAutoTimestampTest.java | 4 +- .../registry/model/eppcommon/AddressTest.java | 22 +- .../model/tmch/ClaimsListDaoTest.java | 2 +- .../EntityCallbacksListenerTest.java | 26 +- .../HibernateSchemaExporterTest.java | 6 +- .../persistence/PersistenceModuleTest.java | 4 +- .../persistence/PersistenceXmlTest.java | 4 +- ...ionTokenStatusTransitionUserTypeTest.java} | 13 +- ... AllocationTokenVkeyListUserTypeTest.java} | 10 +- ...=> BillingCostTransitionUserTypeTest.java} | 13 +- .../converter/BloomFilterConverterTest.java | 4 +- ...st.java => CidrBlockListUserTypeTest.java} | 10 +- ...a => CurrencyToStringMapUserTypeTest.java} | 10 +- .../converter/CurrencyUnitConverterTest.java | 6 +- .../converter/DateTimeConverterTest.java | 15 +- ...terTest.java => DurationUserTypeTest.java} | 28 +- ...t.java => InetAddressSetUserTypeTest.java} | 10 +- ...verterTest.java => JodaMoneyTypeTest.java} | 41 +- .../converter/LocalDateConverterTest.java | 4 +- ...va => RegistrarToRoleMapUserTypeTest.java} | 10 +- .../StatusValueSetConverterTest.java | 63 -- .../StringCollectionUserTypeTest.java | 157 +++ ...est.java => StringListConversionTest.java} | 10 +- ...seTest.java => StringMapUserTypeTest.java} | 79 +- ...Test.java => StringSetConversionTest.java} | 8 +- .../converter/StringValueEnumeratedTest.java | 8 +- ...a => TimedTransitionBaseUserTypeTest.java} | 33 +- ...va => TldStateTransitionUserTypeTest.java} | 13 +- .../converter/VKeyConverterTest.java | 4 +- .../transaction/CriteriaQueryBuilderTest.java | 6 +- .../HibernateLoggingSuppressionTest.java | 4 +- .../JpaEntityCoverageExtension.java | 4 +- .../JpaTransactionManagerExtension.java | 4 +- .../JpaTransactionManagerExtensionTest.java | 6 +- .../JpaTransactionManagerImplTest.java | 19 +- .../transaction/QueryComposerTest.java | 10 +- .../transaction/TransactionManagerTest.java | 8 +- .../registry/testing/DatabaseHelper.java | 2 +- .../google/registry/testing/SqlHelper.java | 2 +- .../UniformRapidSuspensionCommandTest.java | 2 +- db/buildscript-gradle.lockfile | 4 +- db/gradle.lockfile | 32 +- .../sql/schema/db-schema.sql.generated | 982 +++++++++++------- dependencies.gradle | 34 +- jetty/gradle.lockfile | 186 ++-- load-testing/gradle.lockfile | 16 +- networking/gradle.lockfile | 118 +-- prober/gradle.lockfile | 118 +-- processor/build.gradle | 2 +- processor/gradle.lockfile | 2 +- .../registry/processors/VKeyProcessor.java | 4 +- proxy/gradle.lockfile | 189 ++-- services/backend/gradle.lockfile | 193 ++-- services/bsa/gradle.lockfile | 193 ++-- services/default/gradle.lockfile | 193 ++-- services/pubapi/gradle.lockfile | 193 ++-- services/tools/gradle.lockfile | 193 ++-- util/build.gradle | 2 +- util/gradle.lockfile | 103 +- .../google/registry/util/XmlEnumUtils.java | 2 +- .../google/registry/util/XmlToEnumMapper.java | 2 +- 379 files changed, 4162 insertions(+), 4354 deletions(-) delete mode 100644 core/src/main/java/google/registry/persistence/converter/AllocationTokenListConverter.java rename core/src/main/java/google/registry/persistence/converter/{AllocationTokenStatusTransitionConverter.java => AllocationTokenStatusTransitionUserType.java} (62%) create mode 100644 core/src/main/java/google/registry/persistence/converter/AllocationTokenVkeyListUserType.java rename core/src/main/java/google/registry/persistence/converter/{BillingCostTransitionConverter.java => BillingCostTransitionUserType.java} (63%) delete mode 100644 core/src/main/java/google/registry/persistence/converter/BillingEventFlagSetConverter.java create mode 100644 core/src/main/java/google/registry/persistence/converter/CidrBlockListUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/CommandNameSetConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/CurrencyToBillingConverter.java create mode 100644 core/src/main/java/google/registry/persistence/converter/CurrencyToStringMapUserType.java rename core/src/main/java/google/registry/persistence/converter/{DurationConverter.java => DurationUserType.java} (53%) rename core/src/main/java/google/registry/persistence/converter/{FeatureFlagStatusConverter.java => FeatureStatusTransitionUserType.java} (65%) delete mode 100644 core/src/main/java/google/registry/persistence/converter/IdnTableEnumSetConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/InetAddressSetConverter.java create mode 100644 core/src/main/java/google/registry/persistence/converter/InetAddressSetUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/IntervalDescriptor.java create mode 100644 core/src/main/java/google/registry/persistence/converter/MapUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListConverter.java create mode 100644 core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/RegistrarToRoleConverter.java create mode 100644 core/src/main/java/google/registry/persistence/converter/RegistrarToRoleMapUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/Spec11ThreatMatchThreatTypeSetConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java create mode 100644 core/src/main/java/google/registry/persistence/converter/StringCollectionUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringListConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringListConverterBase.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringMapConverterBase.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringMapDescriptor.java rename core/src/main/java/google/registry/persistence/converter/{CidrAddressBlockListConverter.java => StringMapUserType.java} (50%) delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringSetConverter.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/StringSetConverterBase.java create mode 100644 core/src/main/java/google/registry/persistence/converter/TimedTransitionBaseUserType.java delete mode 100644 core/src/main/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBase.java rename core/src/main/java/google/registry/persistence/converter/{TldStateTransitionConverter.java => TldStateTransitionUserType.java} (63%) delete mode 100644 core/src/main/java/google/registry/persistence/converter/TransferServerApproveEntitySetConverter.java rename core/src/test/java/google/registry/persistence/converter/{AllocationTokenStatusTransitionConverterTest.java => AllocationTokenStatusTransitionUserTypeTest.java} (88%) rename core/src/test/java/google/registry/persistence/converter/{AllocationTokenListConverterTest.java => AllocationTokenVkeyListUserTypeTest.java} (91%) rename core/src/test/java/google/registry/persistence/converter/{BillingCostTransitionConverterTest.java => BillingCostTransitionUserTypeTest.java} (86%) rename core/src/test/java/google/registry/persistence/converter/{CidrAddressBlockListConverterTest.java => CidrBlockListUserTypeTest.java} (91%) rename core/src/test/java/google/registry/persistence/converter/{CurrencyToBillingConverterTest.java => CurrencyToStringMapUserTypeTest.java} (90%) rename core/src/test/java/google/registry/persistence/converter/{DurationConverterTest.java => DurationUserTypeTest.java} (79%) rename core/src/test/java/google/registry/persistence/converter/{InetAddressSetConverterTest.java => InetAddressSetUserTypeTest.java} (92%) rename core/src/test/java/google/registry/persistence/converter/{JodaMoneyConverterTest.java => JodaMoneyTypeTest.java} (90%) rename core/src/test/java/google/registry/persistence/converter/{RegistrarToRoleConverterTest.java => RegistrarToRoleMapUserTypeTest.java} (89%) delete mode 100644 core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java create mode 100644 core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java rename core/src/test/java/google/registry/persistence/converter/{StringListConverterTest.java => StringListConversionTest.java} (95%) rename core/src/test/java/google/registry/persistence/converter/{StringMapConverterBaseTest.java => StringMapUserTypeTest.java} (70%) rename core/src/test/java/google/registry/persistence/converter/{StringSetConverterTest.java => StringSetConversionTest.java} (93%) rename core/src/test/java/google/registry/persistence/converter/{TimedTransitionPropertyConverterBaseTest.java => TimedTransitionBaseUserTypeTest.java} (84%) rename core/src/test/java/google/registry/persistence/converter/{TldStateTransitionConverterTest.java => TldStateTransitionUserTypeTest.java} (87%) diff --git a/common/gradle.lockfile b/common/gradle.lockfile index fb36913d9..fc81ac51e 100644 --- a/common/gradle.lockfile +++ b/common/gradle.lockfile @@ -30,7 +30,7 @@ com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProce com.google.j2objc:j2objc-annotations:1.3=checkstyle com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath,testingCompileClasspath com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor -com.google.truth:truth:1.4.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath +com.google.truth:truth:1.4.4=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath com.puppycrawl.tools:checkstyle:9.3=checkstyle commons-beanutils:commons-beanutils:1.9.4=checkstyle commons-collections:commons-collections:3.2.2=checkstyle @@ -55,11 +55,11 @@ org.jacoco:org.jacoco.core:0.8.11=jacocoAnt org.jacoco:org.jacoco.report:0.8.11=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jspecify:jspecify:0.3.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.6=jacocoAnt org.ow2.asm:asm-tree:9.6=jacocoAnt diff --git a/core/build.gradle b/core/build.gradle index 8e1743dbb..a9cfe11f6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -192,9 +192,9 @@ dependencies { testRuntimeOnly deps['io.github.java-diff-utils:java-diff-utils'] implementation deps['jakarta.inject:jakarta.inject-api'] implementation deps['jakarta.mail:jakarta.mail-api'] - implementation deps['javax.persistence:javax.persistence-api'] + implementation deps['jakarta.persistence:jakarta.persistence-api'] implementation deps['jakarta.servlet:jakarta.servlet-api'] - implementation deps['javax.xml.bind:jaxb-api'] + implementation deps['jakarta.xml.bind:jakarta.xml.bind-api'] implementation deps['joda-time:joda-time'] implementation deps['org.apache.avro:avro'] testImplementation deps['org.apache.beam:beam-runners-core-construction-java'] @@ -219,8 +219,9 @@ dependencies { implementation deps['org.bouncycastle:bcprov-jdk18on'] implementation deps['com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'] testImplementation deps['com.fasterxml.jackson.core:jackson-databind'] - implementation deps['org.hibernate:hibernate-core'] - implementation deps['org.hibernate:hibernate-hikaricp'] + implementation deps['org.hibernate.orm:hibernate-ant'] + implementation deps['org.hibernate.orm:hibernate-core'] + implementation deps['org.hibernate.orm:hibernate-hikaricp'] implementation deps['org.jcommander:jcommander'] implementation deps['org.jline:jline'] implementation deps['org.joda:joda-money'] @@ -289,10 +290,7 @@ dependencies { implementation deps['com.google.oauth-client:google-oauth-client-java6'] // Dependencies needed for jaxb compilation. - // Use jaxb 2.2.11 because 2.3 is known to break the Ant task we use. - // TODO: upgrade jaxb versions to 2.4.0, already in beta by Sept 2018 - jaxb deps['javax.xml.bind:jaxb-api'] - jaxb deps['com.sun.activation:javax.activation'] + jaxb deps['jakarta.xml.bind:jakarta.xml.bind-api'] jaxb deps['com.sun.xml.bind:jaxb-xjc'] jaxb deps['com.sun.xml.bind:jaxb-impl'] jaxb deps['com.sun.xml.bind:jaxb-osgi'] diff --git a/core/gradle.lockfile b/core/gradle.lockfile index 2fa8a5b8f..ab5ff1719 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=annotationProcessor,compileClasspath,deploy_jar,errorprone,nonprodAnnotationProcessor,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.0.23=soy args4j:args4j:2.0.26=css @@ -16,12 +15,12 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +48,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=compileCl com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha=testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -60,42 +59,42 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=compileClasspath,depl com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha=testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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-rev20240514-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0=testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor @@ -126,11 +125,11 @@ com.google.cloud:google-cloud-monitoring:3.44.0=compileClasspath,deploy_jar,nonp com.google.cloud:google-cloud-nio:0.127.20=testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath com.google.cloud:google-cloud-storage:2.40.1=testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.1=css @@ -144,7 +143,7 @@ com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar, com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.7.1=checkstyle,soy com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor @@ -165,8 +164,7 @@ com.google.guava:guava:20.0=css com.google.guava:guava:31.0.1-jre=checkstyle,soy com.google.guava:guava:32.1.1-jre=errorprone,nonprodAnnotationProcessor com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.2.1-android=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -com.google.guava:guava:33.2.1-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -202,7 +200,7 @@ com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,nonprodA com.google.protobuf:protobuf-java:3.25.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:57.1=soy com.ibm.icu:icu4j:73.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -229,16 +227,14 @@ com.squareup:javapoet:1.13.0=annotationProcessor,compileClasspath,deploy_jar,non com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor com.squareup:kotlinpoet:1.15.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.2=jaxb -com.sun.activation:javax.activation:1.2.0=jaxb -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.9=jaxb +com.sun.istack:istack-commons-runtime:4.1.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.sun.xml.bind:jaxb-core:4.0.5=jaxb +com.sun.xml.bind:jaxb-impl:4.0.5=jaxb com.sun.xml.bind:jaxb-osgi:4.0.5=jaxb -com.sun.xml.bind:jaxb-xjc:2.3.9=jaxb -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.xml.bind:jaxb-xjc:4.0.5=jaxb com.zaxxer:HikariCP:5.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.17.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-dbutils:commons-dbutils:1.8.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -256,24 +252,27 @@ io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspat io.github.classgraph:classgraph:4.8.162=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,errorprone,nonprodAnnotationProcessor,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.62.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath +io.grpc:grpc-services:1.65.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.62.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath +io.grpc:grpc-util:1.65.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.62.2=compileClasspath,nonprodCompileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.65.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -309,58 +308,58 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath,deploy_jar,nonp io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,deploy_jar,jaxb,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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.mail:jakarta.mail-api:2.1.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.0.0=testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jaxb +jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,deploy_jar,jaxb,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javacc:javacc:4.1=css -javax.activation:javax.activation-api:1.2.0=compileClasspath,deploy_jar,jaxb,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,compileClasspath,deploy_jar,errorprone,nonprodAnnotationProcessor,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.4.0-b180830.0359=jaxb joda-time:joda-time:2.10.14=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=nonprodCompileClasspath,nonprodRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.arnx:nashorn-promise:0.1.1=testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -net.bytebuddy:byte-buddy:1.14.15=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.12=compileClasspath,nonprodCompileClasspath +net.bytebuddy:byte-buddy:1.14.15=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.javacc:javacc:4.1=css net.java.dev.jna:jna:5.13.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.ltgt.gradle.incap:incap:0.2=annotationProcessor,testAnnotationProcessor net.sf.saxon:Saxon-HE:10.6=checkstyle -org.antlr:antlr4-runtime:4.7=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.7=compileClasspath,nonprodCompileClasspath,testCompileClasspath org.antlr:antlr4-runtime:4.9.3=checkstyle org.apache.arrow:arrow-format:15.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-runners-core-construction-java:2.54.0=testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-direct-java:2.57.0=testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-direct-java:2.58.0=testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-sdks-java-fn-execution:2.54.0=testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -373,11 +372,11 @@ org.apache.ftpserver:ftpserver-core:1.2.0=testCompileClasspath,testRuntimeClassp org.apache.httpcomponents:httpclient:4.5.14=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.mina:mina-core:2.1.6=testCompileClasspath,testRuntimeClasspath -org.apache.sshd:sshd-common:2.13.1=testCompileClasspath,testRuntimeClasspath -org.apache.sshd:sshd-core:2.13.1=testCompileClasspath,testRuntimeClasspath -org.apache.sshd:sshd-scp:2.13.1=testCompileClasspath,testRuntimeClasspath -org.apache.sshd:sshd-sftp:2.13.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:11.0.0-M22=testCompileClasspath,testRuntimeClasspath +org.apache.sshd:sshd-common:2.13.2=testCompileClasspath,testRuntimeClasspath +org.apache.sshd:sshd-core:2.13.2=testCompileClasspath,testRuntimeClasspath +org.apache.sshd:sshd-scp:2.13.2=testCompileClasspath,testRuntimeClasspath +org.apache.sshd:sshd-sftp:2.13.2=testCompileClasspath,testRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.0-M24=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.bouncycastle:bcpg-jdk18on:1.78.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcpkix-jdk18on:1.78.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -389,46 +388,46 @@ org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,nonprodRuntimeClasspat org.checkerframework:checker-qual:3.12.0=checkstyle,soy org.checkerframework:checker-qual:3.33.0=errorprone,nonprodAnnotationProcessor org.checkerframework:checker-qual:3.41.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.44.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=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.angus:angus-activation:2.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.eclipse.angus:angus-activation:2.0.2=deploy_jar,jaxb,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-ee:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-security:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.0.11=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.0.11=testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-ee:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.0.12=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.0.12=testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.17.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.1=css org.hamcrest:hamcrest-core:1.3=nonprodCompileClasspath,nonprodRuntimeClasspath -org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest-library:2.2=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:3.0=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-library:3.0=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt org.jacoco:org.jacoco.core:0.8.11=jacocoAnt org.jacoco:org.jacoco.report:0.8.11=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle -org.jboss.logging:jboss-logging:3.4.3.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor @@ -447,25 +446,24 @@ org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=deploy_jar,nonprodRun org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20160212=soy org.json:json:20240303=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit-pioneer:junit-pioneer:2.2.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-migrationsupport:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.11.0-M2=testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-migrationsupport:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.0-RC1=testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:1.10.19=css org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:5.12.0=testCompileClasspath,testRuntimeClasspath @@ -506,24 +504,24 @@ org.slf4j:jul-to-slf4j:1.7.30=testRuntimeClasspath org.slf4j:slf4j-api:2.0.13=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:selenium:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:selenium:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.webjars.npm:viz.js-graphviz-java:2.1.3=testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=devtool,nomulus_test diff --git a/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java b/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java index 7d6575338..c038d0043 100644 --- a/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java +++ b/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java @@ -103,10 +103,10 @@ public class CheckBulkComplianceAction implements Runnable { Long creates = (Long) tm().query( - "SELECT COUNT(*) FROM DomainHistory WHERE current_package_token =" + "SELECT COUNT(*) FROM DomainHistory WHERE resource.currentBulkToken =" + " :token AND modificationTime >= :lastBilling AND type =" + " 'DOMAIN_CREATE'") - .setParameter("token", bulkPricingPackage.getToken().getKey().toString()) + .setParameter("token", bulkPricingPackage.getToken()) .setParameter( "lastBilling", bulkPricingPackage.getNextBillingDate().minusYears(1)) .getSingleResult(); diff --git a/core/src/main/java/google/registry/batch/DeleteProberDataAction.java b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java index 4a74e7abc..4dd9cd2ee 100644 --- a/core/src/main/java/google/registry/batch/DeleteProberDataAction.java +++ b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java @@ -45,11 +45,11 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.RegistryEnvironment; +import jakarta.persistence.TypedQuery; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; -import javax.persistence.TypedQuery; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -95,8 +95,8 @@ public class DeleteProberDataAction implements Runnable { // be compared directly to the SQL timestamp (it's a DateTime) private static final String DOMAIN_QUERY_STRING = "FROM Domain d WHERE d.tld IN :tlds AND d.domainName NOT LIKE 'nic.%%' AND" - + " (d.subordinateHosts IS EMPTY OR d.subordinateHosts IS NULL) AND d.creationTime <" - + " :creationTimeCutoff AND (d.deletionTime > :now OR d.deletionTime <" + + " (d.subordinateHosts IS NULL OR array_length(d.subordinateHosts) = 0) AND" + + " d.creationTime < :creationTimeCutoff AND (d.deletionTime > :now OR d.deletionTime <" + " :nowMinusSoftDeleteDelay)"; /** Number of domains to retrieve and delete per SQL transaction. */ diff --git a/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java b/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java index 7c903139f..8c8461c15 100644 --- a/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java +++ b/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java @@ -53,7 +53,6 @@ import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.util.Clock; import google.registry.util.SystemClock; import java.io.Serializable; -import java.math.BigInteger; import java.util.Optional; import java.util.Set; import javax.inject.Singleton; @@ -202,7 +201,7 @@ public class ExpandBillingRecurrencesPipeline implements Serializable { "oneYearAgo", endTime.minusYears(1)), true, - (BigInteger id) -> { + (Long id) -> { recurrencesInScopeCounter.inc(); // Note that because all elements are mapped to the same dummy key, the next // batching transform will effectively be serial. This however does not matter for diff --git a/core/src/main/java/google/registry/beam/billing/InvoicingPipeline.java b/core/src/main/java/google/registry/beam/billing/InvoicingPipeline.java index 7b375daa3..7f60e6da6 100644 --- a/core/src/main/java/google/registry/beam/billing/InvoicingPipeline.java +++ b/core/src/main/java/google/registry/beam/billing/InvoicingPipeline.java @@ -222,10 +222,10 @@ public class InvoicingPipeline implements Serializable { SqlTemplate.create( ResourceUtils.readResourceUtf8( InvoicingPipeline.class, "sql/cloud_sql_billing_events.sql")) - .put("FIRST_TIMESTAMP_OF_MONTH", yearMonth + "-01") + .put("FIRST_TIMESTAMP_OF_MONTH", yearMonth + "-01T00:00:00Z") .put( "LAST_TIMESTAMP_OF_MONTH", - String.format("%d-%d-01", endMonth.getYear(), endMonth.getMonthValue())) + String.format("%d-%d-01T00:00:00Z", endMonth.getYear(), endMonth.getMonthValue())) .build(); // Remove the comments from the query string return SQL_COMMENT_REGEX.matcher(queryWithComments).replaceAll(""); diff --git a/core/src/main/java/google/registry/beam/common/RegistryJpaIO.java b/core/src/main/java/google/registry/beam/common/RegistryJpaIO.java index f0c79321d..a36b451a7 100644 --- a/core/src/main/java/google/registry/beam/common/RegistryJpaIO.java +++ b/core/src/main/java/google/registry/beam/common/RegistryJpaIO.java @@ -23,10 +23,10 @@ import com.google.common.collect.Streams; import google.registry.beam.common.RegistryQuery.CriteriaQuerySupplier; import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.persistence.transaction.TransactionManagerFactory; +import jakarta.persistence.criteria.CriteriaQuery; import java.util.Map; import java.util.Objects; import javax.annotation.Nullable; -import javax.persistence.criteria.CriteriaQuery; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.metrics.Counter; import org.apache.beam.sdk.metrics.Metrics; diff --git a/core/src/main/java/google/registry/beam/common/RegistryQuery.java b/core/src/main/java/google/registry/beam/common/RegistryQuery.java index 908c92275..192dcc2b6 100644 --- a/core/src/main/java/google/registry/beam/common/RegistryQuery.java +++ b/core/src/main/java/google/registry/beam/common/RegistryQuery.java @@ -17,16 +17,16 @@ package google.registry.beam.common; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import google.registry.persistence.transaction.JpaTransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; import java.io.Serializable; import java.util.Map; import java.util.function.Supplier; import java.util.stream.Stream; import javax.annotation.Nullable; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; import org.joda.time.DateTime; /** Interface for query instances used by {@link RegistryJpaIO.Read}. */ diff --git a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java index a5a4d275a..eb255869b 100644 --- a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java +++ b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java @@ -116,7 +116,7 @@ public class Spec11Pipeline implements Serializable { RegistryJpaIO.read( "select d.repoId, r.emailAddress from Domain d join Registrar r on" + " d.currentSponsorRegistrarId = r.registrarId where r.type = 'REAL' and" - + " d.deletionTime > now()", + + " d.deletionTime > CAST(now() AS timestamp)", false, Spec11Pipeline::parseRow) .withCoder(KvCoder.of(StringUtf8Coder.of(), StringUtf8Coder.of())); diff --git a/core/src/main/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipeline.java b/core/src/main/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipeline.java index 270f92861..7b548f21a 100644 --- a/core/src/main/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipeline.java +++ b/core/src/main/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipeline.java @@ -125,8 +125,8 @@ public class WipeOutContactHistoryPiiPipeline implements Serializable { // checking if it's null is one way to avoid processing contact history entities that // have been processed previously. Refer to RFC 5733 for more information. RegistryJpaIO.read( - "SELECT repoId, revisionId FROM ContactHistory WHERE email IS NOT NULL AND" - + " modificationTime < :cutoffTime", + "SELECT repoId, revisionId FROM ContactHistory WHERE resource.email IS NOT NULL" + + " AND modificationTime < :cutoffTime", ImmutableMap.of("cutoffTime", cutoffTime), Object[].class, row -> KV.of((String) row[0], (long) row[1])) diff --git a/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java b/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java index 5e59c0718..2fedf0377 100644 --- a/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java +++ b/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java @@ -45,6 +45,7 @@ import google.registry.request.Action; import google.registry.request.Action.Service; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.persistence.TypedQuery; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -53,7 +54,6 @@ import java.io.Writer; import java.util.Optional; import java.util.zip.GZIPOutputStream; import javax.inject.Inject; -import javax.persistence.TypedQuery; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; diff --git a/core/src/main/java/google/registry/bsa/persistence/BsaDomainRefresh.java b/core/src/main/java/google/registry/bsa/persistence/BsaDomainRefresh.java index 288f27a38..47718d745 100644 --- a/core/src/main/java/google/registry/bsa/persistence/BsaDomainRefresh.java +++ b/core/src/main/java/google/registry/bsa/persistence/BsaDomainRefresh.java @@ -22,13 +22,13 @@ import google.registry.bsa.RefreshStage; import google.registry.model.CreateAutoTimestamp; import google.registry.model.UpdateAutoTimestamp; import google.registry.persistence.VKey; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/bsa/persistence/BsaDownload.java b/core/src/main/java/google/registry/bsa/persistence/BsaDownload.java index db2eb3654..f9cfbfe99 100644 --- a/core/src/main/java/google/registry/bsa/persistence/BsaDownload.java +++ b/core/src/main/java/google/registry/bsa/persistence/BsaDownload.java @@ -28,16 +28,16 @@ import google.registry.bsa.DownloadStage; import google.registry.model.CreateAutoTimestamp; import google.registry.model.UpdateAutoTimestamp; import google.registry.persistence.VKey; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.util.Locale; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; import org.joda.time.DateTime; /** Records of ongoing and completed download jobs. */ diff --git a/core/src/main/java/google/registry/bsa/persistence/BsaLabel.java b/core/src/main/java/google/registry/bsa/persistence/BsaLabel.java index bcca7954d..b735607dc 100644 --- a/core/src/main/java/google/registry/bsa/persistence/BsaLabel.java +++ b/core/src/main/java/google/registry/bsa/persistence/BsaLabel.java @@ -16,9 +16,9 @@ package google.registry.bsa.persistence; import com.google.common.base.Objects; import google.registry.persistence.VKey; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/bsa/persistence/BsaUnblockableDomain.java b/core/src/main/java/google/registry/bsa/persistence/BsaUnblockableDomain.java index 30d0d2b4a..08d88e555 100644 --- a/core/src/main/java/google/registry/bsa/persistence/BsaUnblockableDomain.java +++ b/core/src/main/java/google/registry/bsa/persistence/BsaUnblockableDomain.java @@ -24,13 +24,13 @@ import google.registry.bsa.api.UnblockableDomain; import google.registry.bsa.persistence.BsaUnblockableDomain.BsaUnblockableDomainId; import google.registry.model.CreateAutoTimestamp; import google.registry.persistence.VKey; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; /** A domain matching a BSA label but is in use (registered or reserved), so cannot be blocked. */ @Entity diff --git a/core/src/main/java/google/registry/bsa/persistence/Queries.java b/core/src/main/java/google/registry/bsa/persistence/Queries.java index 4dc08e06d..0e53dfba7 100644 --- a/core/src/main/java/google/registry/bsa/persistence/Queries.java +++ b/core/src/main/java/google/registry/bsa/persistence/Queries.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import google.registry.bsa.api.UnblockableDomain; import google.registry.model.CreateAutoTimestamp; -import java.sql.Timestamp; +import java.time.Instant; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -167,7 +167,7 @@ public final class Queries { JOIN (SELECT concat(label, '.', :tld) AS domain_name from "BsaLabel") b ON b.domain_name = d.domain_name - WHERE deletion_time > ':now') l + WHERE deletion_time > :now) l LEFT OUTER JOIN (SELECT concat(label, '.', tld) as domain_name FROM "BsaUnblockableDomain" @@ -175,27 +175,24 @@ public final class Queries { ON l.domain_name = r.domain_name WHERE r.domain_name is null; """; - // Native query: Hibernate's setParameter wrongly converts DateTime to bytea - String sql = sqlTemplate.replace(":now", now.toString()); return ((Stream) tm().getEntityManager() - .createNativeQuery(sql) + .createNativeQuery(sqlTemplate) .setParameter("tld", tld) + .setParameter("now", Instant.ofEpochMilli(now.getMillis())) .getResultStream()) .map(Object[].class::cast) .map( row -> new DomainLifeSpan( - (String) row[0], - toDateTime((Timestamp) row[1]), - toDateTime((Timestamp) row[2]))) + (String) row[0], toDateTime((Instant) row[1]), toDateTime((Instant) row[2]))) .collect(toImmutableList()); } // For testing convenience: 'assertEquals' fails between `new DateTime(timestamp)` and below. - static DateTime toDateTime(Timestamp timestamp) { - return new DateTime(timestamp.getTime(), UTC); + static DateTime toDateTime(Instant timestamp) { + return new DateTime(timestamp.toEpochMilli(), UTC); } public record DomainLifeSpan(String domainName, DateTime creationTime, DateTime deletionTime) {} diff --git a/core/src/main/java/google/registry/model/CreateAutoTimestamp.java b/core/src/main/java/google/registry/model/CreateAutoTimestamp.java index 85b5f8ddf..f4000da00 100644 --- a/core/src/main/java/google/registry/model/CreateAutoTimestamp.java +++ b/core/src/main/java/google/registry/model/CreateAutoTimestamp.java @@ -17,11 +17,11 @@ package google.registry.model; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import com.google.gson.annotations.Expose; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; import org.joda.time.DateTime; /** A timestamp that auto-updates when first saved to the database. */ diff --git a/core/src/main/java/google/registry/model/EntityYamlUtils.java b/core/src/main/java/google/registry/model/EntityYamlUtils.java index 42be563ee..32e59a75a 100644 --- a/core/src/main/java/google/registry/model/EntityYamlUtils.java +++ b/core/src/main/java/google/registry/model/EntityYamlUtils.java @@ -60,6 +60,7 @@ public class EntityYamlUtils { module.addSerializer(Money.class, new MoneySerializer()); module.addDeserializer(Money.class, new MoneyDeserializer()); module.addSerializer(Duration.class, new DurationSerializer()); + module.addSerializer(TimedTransitionProperty.class, new TimedTransitionPropertySerializer()); ObjectMapper mapper = JsonMapper.builder(new YAMLFactory().disable(Feature.WRITE_DOC_START_MARKER)) .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) @@ -311,6 +312,24 @@ public class EntityYamlUtils { } } + /** A custom JSON serializer for a {@link TimedTransitionProperty} of {@link Enum} values. */ + public static class TimedTransitionPropertySerializer> + extends StdSerializer> { + + TimedTransitionPropertySerializer() { + super(null, true); + } + + @Override + public void serialize( + TimedTransitionProperty data, + JsonGenerator jsonGenerator, + SerializerProvider serializerProvider) + throws IOException { + jsonGenerator.writeObject(data.toValueMap()); + } + } + /** A custom JSON deserializer for a {@link TimedTransitionProperty} of {@link TldState}. */ public static class TimedTransitionPropertyTldStateDeserializer extends StdDeserializer> { diff --git a/core/src/main/java/google/registry/model/EppResource.java b/core/src/main/java/google/registry/model/EppResource.java index efe736792..b8a6c3840 100644 --- a/core/src/main/java/google/registry/model/EppResource.java +++ b/core/src/main/java/google/registry/model/EppResource.java @@ -37,16 +37,18 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.transfer.TransferData; import google.registry.persistence.VKey; import google.registry.util.NonFinalForTesting; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; import java.time.Duration; import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; import org.joda.time.DateTime; /** An EPP entity object (i.e. a domain, contact, or host). */ @@ -133,7 +135,9 @@ public abstract class EppResource extends UpdateAutoTimestampEntity implements B @Expose DateTime lastEppUpdateTime; /** Status values associated with this resource. */ - @Expose Set statuses; + @Enumerated(EnumType.STRING) + @Expose + Set statuses; public String getRepoId() { return repoId; diff --git a/core/src/main/java/google/registry/model/EppResourceUtils.java b/core/src/main/java/google/registry/model/EppResourceUtils.java index 164626cf6..7751aff0e 100644 --- a/core/src/main/java/google/registry/model/EppResourceUtils.java +++ b/core/src/main/java/google/registry/model/EppResourceUtils.java @@ -40,13 +40,13 @@ import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferData; import google.registry.model.transfer.TransferStatus; import google.registry.persistence.VKey; +import jakarta.persistence.Query; import java.util.Collection; import java.util.Comparator; import java.util.Optional; import java.util.function.Function; import java.util.function.Supplier; import javax.annotation.Nullable; -import javax.persistence.Query; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/core/src/main/java/google/registry/model/ImmutableObject.java b/core/src/main/java/google/registry/model/ImmutableObject.java index 224e242a5..6682b64a4 100644 --- a/core/src/main/java/google/registry/model/ImmutableObject.java +++ b/core/src/main/java/google/registry/model/ImmutableObject.java @@ -23,6 +23,8 @@ import static java.util.stream.Collectors.toList; import com.google.common.base.Joiner; import google.registry.persistence.VKey; +import jakarta.persistence.Transient; +import jakarta.xml.bind.annotation.XmlTransient; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -38,7 +40,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; import javax.annotation.concurrent.Immutable; -import javax.xml.bind.annotation.XmlTransient; /** An immutable object that implements {@link #equals}, {@link #hashCode} and {@link #toString}. */ @Immutable @@ -63,10 +64,7 @@ public abstract class ImmutableObject implements Cloneable { @Target(FIELD) public @interface Insignificant {} - // Note: if this class is made to implement Serializable, this field must become 'transient' since - // hashing is not stable across executions. Also note that @XmlTransient is forbidden on transient - // fields and need to be removed if transient is added. - @XmlTransient protected Integer hashCode; + @XmlTransient @Transient protected Integer hashCode; private boolean equalsImmutableObject(ImmutableObject other) { return getClass().equals(other.getClass()) @@ -80,6 +78,7 @@ public abstract class ImmutableObject implements Cloneable { * *

Isolated into a method so that derived classes can override it. */ + @Transient protected Map getSignificantFields() { // Can't use streams or ImmutableMap because we can have null values. Map result = new LinkedHashMap<>(); diff --git a/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java b/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java index 87644d529..44cd49858 100644 --- a/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java +++ b/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java @@ -17,12 +17,12 @@ package google.registry.model; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.util.DateTimeUtils.START_OF_TIME; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; import org.joda.time.DateTime; /** A timestamp that auto-updates on each save to Cloud SQL. */ diff --git a/core/src/main/java/google/registry/model/UpdateAutoTimestampEntity.java b/core/src/main/java/google/registry/model/UpdateAutoTimestampEntity.java index a5f87d350..097f121b4 100644 --- a/core/src/main/java/google/registry/model/UpdateAutoTimestampEntity.java +++ b/core/src/main/java/google/registry/model/UpdateAutoTimestampEntity.java @@ -15,10 +15,10 @@ package google.registry.model; import google.registry.util.PreconditionsUtils; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; +import jakarta.xml.bind.annotation.XmlTransient; /** * Base class for entities that contains an {@link UpdateAutoTimestamp} which is updated every time diff --git a/core/src/main/java/google/registry/model/adapters/CurrencyUnitAdapter.java b/core/src/main/java/google/registry/model/adapters/CurrencyUnitAdapter.java index f2bcd5b29..c722e08e8 100644 --- a/core/src/main/java/google/registry/model/adapters/CurrencyUnitAdapter.java +++ b/core/src/main/java/google/registry/model/adapters/CurrencyUnitAdapter.java @@ -16,7 +16,7 @@ package google.registry.model.adapters; import static com.google.common.base.Strings.nullToEmpty; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.joda.money.CurrencyUnit; /** Adapter to use Joda {@link CurrencyUnit} when marshalling strings. */ diff --git a/core/src/main/java/google/registry/model/adapters/EnumToAttributeAdapter.java b/core/src/main/java/google/registry/model/adapters/EnumToAttributeAdapter.java index d9dd66cae..4803b08d7 100644 --- a/core/src/main/java/google/registry/model/adapters/EnumToAttributeAdapter.java +++ b/core/src/main/java/google/registry/model/adapters/EnumToAttributeAdapter.java @@ -14,8 +14,8 @@ package google.registry.model.adapters; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Used by JAXB to convert enums to the peculiar EPP format that puts the value in an attribute. diff --git a/core/src/main/java/google/registry/model/billing/BillingBase.java b/core/src/main/java/google/registry/model/billing/BillingBase.java index f5db66116..90914264e 100644 --- a/core/src/main/java/google/registry/model/billing/BillingBase.java +++ b/core/src/main/java/google/registry/model/billing/BillingBase.java @@ -28,13 +28,13 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.persistence.VKey; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; import org.joda.time.DateTime; /** A billable event in a domain's lifecycle. */ @@ -154,7 +154,9 @@ public abstract class BillingBase extends ImmutableObject @Column(name = "domain_name", nullable = false) String targetId; - @Nullable Set flags; + @Nullable + @Enumerated(EnumType.STRING) + Set flags; public String getRegistrarId() { return clientId; diff --git a/core/src/main/java/google/registry/model/billing/BillingCancellation.java b/core/src/main/java/google/registry/model/billing/BillingCancellation.java index 88d7b914c..410af5b7c 100644 --- a/core/src/main/java/google/registry/model/billing/BillingCancellation.java +++ b/core/src/main/java/google/registry/model/billing/BillingCancellation.java @@ -25,11 +25,11 @@ import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/billing/BillingEvent.java b/core/src/main/java/google/registry/model/billing/BillingEvent.java index 2f7fc6d49..3e73d5e36 100644 --- a/core/src/main/java/google/registry/model/billing/BillingEvent.java +++ b/core/src/main/java/google/registry/model/billing/BillingEvent.java @@ -22,16 +22,13 @@ import google.registry.model.domain.DomainHistory; import google.registry.model.domain.token.AllocationToken; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; -import google.registry.persistence.converter.JodaMoneyType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import org.hibernate.annotations.Columns; -import org.hibernate.annotations.Type; import org.joda.money.Money; import org.joda.time.DateTime; @@ -52,8 +49,11 @@ import org.joda.time.DateTime; public class BillingEvent extends BillingBase { /** The billable value. */ - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "cost_amount"), @Column(name = "cost_currency")}) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = @Column(name = "cost_amount", precision = 19, scale = 2)) + @AttributeOverride(name = "currency", column = @Column(name = "cost_currency")) Money cost; /** When the cost should be billed. */ diff --git a/core/src/main/java/google/registry/model/billing/BillingRecurrence.java b/core/src/main/java/google/registry/model/billing/BillingRecurrence.java index bdefb26b1..67730f62a 100644 --- a/core/src/main/java/google/registry/model/billing/BillingRecurrence.java +++ b/core/src/main/java/google/registry/model/billing/BillingRecurrence.java @@ -21,20 +21,17 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME; import google.registry.model.common.TimeOfYear; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; -import google.registry.persistence.converter.JodaMoneyType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Index; -import javax.persistence.Table; -import org.hibernate.annotations.Columns; -import org.hibernate.annotations.Type; import org.joda.money.Money; import org.joda.time.DateTime; @@ -100,8 +97,11 @@ public class BillingRecurrence extends BillingBase { * SPECIFIED. This column is used for internal registrations. */ @Nullable - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "renewalPriceAmount"), @Column(name = "renewalPriceCurrency")}) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = @Column(name = "renewalPriceAmount", precision = 19, scale = 2)) + @AttributeOverride(name = "currency", column = @Column(name = "renewalPriceCurrency")) Money renewalPrice; @Enumerated(EnumType.STRING) diff --git a/core/src/main/java/google/registry/model/common/CrossTldSingleton.java b/core/src/main/java/google/registry/model/common/CrossTldSingleton.java index 3dc6f4cce..4ecbba4fa 100644 --- a/core/src/main/java/google/registry/model/common/CrossTldSingleton.java +++ b/core/src/main/java/google/registry/model/common/CrossTldSingleton.java @@ -15,8 +15,8 @@ package google.registry.model.common; import google.registry.model.ImmutableObject; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** A singleton entity in the database. */ @MappedSuperclass diff --git a/core/src/main/java/google/registry/model/common/Cursor.java b/core/src/main/java/google/registry/model/common/Cursor.java index eb5cc3bd6..8a30521de 100644 --- a/core/src/main/java/google/registry/model/common/Cursor.java +++ b/core/src/main/java/google/registry/model/common/Cursor.java @@ -24,14 +24,14 @@ import google.registry.model.UpdateAutoTimestampEntity; import google.registry.model.common.Cursor.CursorId; import google.registry.model.tld.Tld; import google.registry.persistence.VKey; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.util.Optional; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/common/DnsRefreshRequest.java b/core/src/main/java/google/registry/model/common/DnsRefreshRequest.java index b65ccae99..b8fb36e37 100644 --- a/core/src/main/java/google/registry/model/common/DnsRefreshRequest.java +++ b/core/src/main/java/google/registry/model/common/DnsRefreshRequest.java @@ -22,16 +22,16 @@ import google.registry.dns.DnsUtils.TargetType; import google.registry.dns.PublishDnsUpdatesAction; import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; import org.joda.time.DateTime; @Entity diff --git a/core/src/main/java/google/registry/model/common/FeatureFlag.java b/core/src/main/java/google/registry/model/common/FeatureFlag.java index db8c7d4c7..77abde610 100644 --- a/core/src/main/java/google/registry/model/common/FeatureFlag.java +++ b/core/src/main/java/google/registry/model/common/FeatureFlag.java @@ -36,14 +36,16 @@ import google.registry.model.CacheUtils; import google.registry.model.EntityYamlUtils.TimedTransitionPropertyFeatureStatusDeserializer; import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; +import google.registry.persistence.converter.FeatureStatusTransitionUserType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import org.hibernate.annotations.Type; import org.joda.time.DateTime; @Entity @@ -74,6 +76,7 @@ public class FeatureFlag extends ImmutableObject implements Buildable { /** A map of times for each {@link FeatureStatus} the FeatureFlag should hold. */ @Column(nullable = false) + @Type(FeatureStatusTransitionUserType.class) @JsonDeserialize(using = TimedTransitionPropertyFeatureStatusDeserializer.class) TimedTransitionProperty status = TimedTransitionProperty.withInitialValue(FeatureStatus.INACTIVE); diff --git a/core/src/main/java/google/registry/model/common/TimeOfYear.java b/core/src/main/java/google/registry/model/common/TimeOfYear.java index 3401fb461..b84f45b7e 100644 --- a/core/src/main/java/google/registry/model/common/TimeOfYear.java +++ b/core/src/main/java/google/registry/model/common/TimeOfYear.java @@ -27,8 +27,8 @@ import com.google.common.collect.ContiguousSet; import com.google.common.collect.Range; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; +import jakarta.persistence.Embeddable; import java.util.List; -import javax.persistence.Embeddable; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/common/TimedTransitionProperty.java b/core/src/main/java/google/registry/model/common/TimedTransitionProperty.java index fc50ffc04..418490fee 100644 --- a/core/src/main/java/google/registry/model/common/TimedTransitionProperty.java +++ b/core/src/main/java/google/registry/model/common/TimedTransitionProperty.java @@ -20,7 +20,6 @@ import static google.registry.util.CollectionUtils.nullToEmpty; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.latestOf; -import com.google.common.collect.ForwardingMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Ordering; @@ -28,6 +27,7 @@ import google.registry.model.UnsafeSerializable; import java.io.Serializable; import java.util.Iterator; import java.util.NavigableMap; +import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.joda.time.DateTime; @@ -36,13 +36,12 @@ import org.joda.time.DateTime; * corresponding instant, and remains active until the next transition occurs. At least one "start * of time" value (corresponding to {@code START_OF_TIME}, i.e. the Unix epoch) must be provided so * that the property will have a value for all possible times. - * - *

This concept is naturally represented by a sorted map of {@link DateTime} to {@link V}. This - * class implements {@link ForwardingMap} and stores the data in a backing map and exposes several - * convenient methods to extrapolate the value at arbitrary point in time. */ -public class TimedTransitionProperty extends ForwardingMap - implements UnsafeSerializable { +// Implementation note: this class used to implement the Guava ForwardingMap. This breaks in +// Hibernate 6, which assumes that any class implementing Map would also have as its +// first two generic type parameters. If this is fixed, we can add back the ForwardingMap, which +// can simplify the code in a few places. +public class TimedTransitionProperty implements UnsafeSerializable { private static final long serialVersionUID = -7274659848856323290L; @@ -145,11 +144,6 @@ public class TimedTransitionProperty extends ForwardingM "Timed transition values missing required entry for the start of time (Unix Epoch)"); } - @Override - protected ImmutableSortedMap delegate() { - return backingMap; - } - /** Exposes the underlying {@link ImmutableSortedMap}. */ public ImmutableSortedMap toValueMap() { return backingMap; @@ -171,4 +165,24 @@ public class TimedTransitionProperty extends ForwardingM public DateTime getNextTransitionAfter(DateTime time) { return backingMap.higherKey(latestOf(START_OF_TIME, time)); } + + public int size() { + return backingMap.size(); + } + + @Override + public boolean equals(@CheckForNull Object object) { + if (this == object) { + return true; + } + if (object instanceof TimedTransitionProperty other) { + return this.backingMap.equals(other.backingMap); + } + return false; + } + + @Override + public int hashCode() { + return this.backingMap.hashCode(); + } } diff --git a/core/src/main/java/google/registry/model/console/ConsoleEppActionHistory.java b/core/src/main/java/google/registry/model/console/ConsoleEppActionHistory.java index e0140d4f8..df5875e02 100644 --- a/core/src/main/java/google/registry/model/console/ConsoleEppActionHistory.java +++ b/core/src/main/java/google/registry/model/console/ConsoleEppActionHistory.java @@ -19,13 +19,13 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.persistence.VKey; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.Table; /** * A persisted history object representing an EPP action via the console. diff --git a/core/src/main/java/google/registry/model/console/ConsoleUpdateHistory.java b/core/src/main/java/google/registry/model/console/ConsoleUpdateHistory.java index 89218d44a..a4fb4497d 100644 --- a/core/src/main/java/google/registry/model/console/ConsoleUpdateHistory.java +++ b/core/src/main/java/google/registry/model/console/ConsoleUpdateHistory.java @@ -19,15 +19,15 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.annotations.IdAllocation; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/console/RegistrarPocUpdateHistory.java b/core/src/main/java/google/registry/model/console/RegistrarPocUpdateHistory.java index 70a863138..2b292bb87 100644 --- a/core/src/main/java/google/registry/model/console/RegistrarPocUpdateHistory.java +++ b/core/src/main/java/google/registry/model/console/RegistrarPocUpdateHistory.java @@ -19,13 +19,13 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.registrar.RegistrarPoc; import google.registry.model.registrar.RegistrarPocBase; import google.registry.persistence.VKey; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.PostLoad; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Table; /** * A persisted history object representing an update to a RegistrarPoc. diff --git a/core/src/main/java/google/registry/model/console/RegistrarUpdateHistory.java b/core/src/main/java/google/registry/model/console/RegistrarUpdateHistory.java index 55d0dc89c..31ad1e753 100644 --- a/core/src/main/java/google/registry/model/console/RegistrarUpdateHistory.java +++ b/core/src/main/java/google/registry/model/console/RegistrarUpdateHistory.java @@ -18,13 +18,13 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.registrar.RegistrarBase; import google.registry.persistence.VKey; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.PostLoad; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Table; /** * A persisted history object representing an update to a Registrar. diff --git a/core/src/main/java/google/registry/model/console/User.java b/core/src/main/java/google/registry/model/console/User.java index c3d26cd78..c1c0fb4d4 100644 --- a/core/src/main/java/google/registry/model/console/User.java +++ b/core/src/main/java/google/registry/model/console/User.java @@ -30,15 +30,15 @@ import google.registry.tools.ServiceConnection; import google.registry.tools.server.UpdateUserGroupAction; import google.registry.tools.server.UpdateUserGroupAction.Mode; import google.registry.util.RegistryEnvironment; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.IOException; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; /** A console user, either a registry employee or a registrar partner. */ @Embeddable diff --git a/core/src/main/java/google/registry/model/console/UserBase.java b/core/src/main/java/google/registry/model/console/UserBase.java index 132b16ab1..22cf35242 100644 --- a/core/src/main/java/google/registry/model/console/UserBase.java +++ b/core/src/main/java/google/registry/model/console/UserBase.java @@ -25,15 +25,15 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.Buildable; import google.registry.model.UpdateAutoTimestampEntity; import google.registry.util.PasswordUtils; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; /** * A console user, either a registry employee or a registrar partner. diff --git a/core/src/main/java/google/registry/model/console/UserRoles.java b/core/src/main/java/google/registry/model/console/UserRoles.java index cb43320e1..8244f6e73 100644 --- a/core/src/main/java/google/registry/model/console/UserRoles.java +++ b/core/src/main/java/google/registry/model/console/UserRoles.java @@ -20,13 +20,15 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.collect.ImmutableMap; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; +import google.registry.persistence.converter.RegistrarToRoleMapUserType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.util.Map; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import org.hibernate.annotations.Type; /** * Contains the global and per-registrar roles for a given user. @@ -51,6 +53,7 @@ public class UserRoles extends ImmutableObject implements Buildable { private GlobalRole globalRole = GlobalRole.NONE; /** Any per-registrar roles that this user may have. */ + @Type(RegistrarToRoleMapUserType.class) private Map registrarRoles = ImmutableMap.of(); /** Whether the user is a global admin, who has access to everything. */ diff --git a/core/src/main/java/google/registry/model/console/UserUpdateHistory.java b/core/src/main/java/google/registry/model/console/UserUpdateHistory.java index 65308dee4..5cb2196d8 100644 --- a/core/src/main/java/google/registry/model/console/UserUpdateHistory.java +++ b/core/src/main/java/google/registry/model/console/UserUpdateHistory.java @@ -17,13 +17,13 @@ package google.registry.model.console; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.persistence.VKey; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.PostLoad; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Table; /** * A persisted history object representing an update to a User. diff --git a/core/src/main/java/google/registry/model/contact/Contact.java b/core/src/main/java/google/registry/model/contact/Contact.java index 4b3897094..6ca9fb88e 100644 --- a/core/src/main/java/google/registry/model/contact/Contact.java +++ b/core/src/main/java/google/registry/model/contact/Contact.java @@ -18,12 +18,12 @@ import google.registry.model.EppResource.ForeignKeyedEppResource; import google.registry.model.annotations.ExternalMessagingName; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/contact/ContactAddress.java b/core/src/main/java/google/registry/model/contact/ContactAddress.java index 38bf62a44..52c637b06 100644 --- a/core/src/main/java/google/registry/model/contact/ContactAddress.java +++ b/core/src/main/java/google/registry/model/contact/ContactAddress.java @@ -15,7 +15,7 @@ package google.registry.model.contact; import google.registry.model.eppcommon.Address; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * EPP Contact Address diff --git a/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java b/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java index e037824bf..cb488a7e2 100644 --- a/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java +++ b/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java @@ -15,8 +15,8 @@ package google.registry.model.contact; import google.registry.model.eppcommon.AuthInfo; -import javax.persistence.Embeddable; -import javax.xml.bind.annotation.XmlType; +import jakarta.persistence.Embeddable; +import jakarta.xml.bind.annotation.XmlType; /** A version of authInfo specifically for contacts. */ @Embeddable diff --git a/core/src/main/java/google/registry/model/contact/ContactBase.java b/core/src/main/java/google/registry/model/contact/ContactBase.java index c9c291621..c04912343 100644 --- a/core/src/main/java/google/registry/model/contact/ContactBase.java +++ b/core/src/main/java/google/registry/model/contact/ContactBase.java @@ -23,24 +23,24 @@ import google.registry.model.EppResource; import google.registry.model.EppResource.ResourceWithTransferData; import google.registry.model.transfer.ContactTransferData; import google.registry.persistence.VKey; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; +import jakarta.xml.bind.annotation.XmlElement; import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; -import javax.xml.bind.annotation.XmlElement; import org.joda.time.DateTime; /** * A persistable contact resource including mutable and non-mutable fields. * - *

This class deliberately does not include an {@link javax.persistence.Id} so that any + *

This class deliberately does not include an {@link jakarta.persistence.Id} so that any * foreign-keyed fields can refer to the proper parent entity's ID, whether we're storing this in * the DB itself or as part of another entity * diff --git a/core/src/main/java/google/registry/model/contact/ContactCommand.java b/core/src/main/java/google/registry/model/contact/ContactCommand.java index 99108619d..be0639d7f 100644 --- a/core/src/main/java/google/registry/model/contact/ContactCommand.java +++ b/core/src/main/java/google/registry/model/contact/ContactCommand.java @@ -25,14 +25,14 @@ import google.registry.model.eppinput.ResourceCommand.ResourceCheck; import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** A collection of {@link Contact} commands. */ public class ContactCommand { diff --git a/core/src/main/java/google/registry/model/contact/ContactHistory.java b/core/src/main/java/google/registry/model/contact/ContactHistory.java index 03e7a7b44..9750233f7 100644 --- a/core/src/main/java/google/registry/model/contact/ContactHistory.java +++ b/core/src/main/java/google/registry/model/contact/ContactHistory.java @@ -17,15 +17,15 @@ package google.registry.model.contact; import google.registry.model.EppResource; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; /** * A persisted history entry representing an EPP modification to a contact. diff --git a/core/src/main/java/google/registry/model/contact/ContactInfoData.java b/core/src/main/java/google/registry/model/contact/ContactInfoData.java index 9ec131a42..2353ac82c 100644 --- a/core/src/main/java/google/registry/model/contact/ContactInfoData.java +++ b/core/src/main/java/google/registry/model/contact/ContactInfoData.java @@ -20,12 +20,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppoutput.EppResponse.ResponseData; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.joda.time.DateTime; /** The {@link ResponseData} returned for an EPP info flow on a contact. */ diff --git a/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java b/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java index 039c84478..bd8bf1c88 100644 --- a/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java +++ b/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java @@ -15,7 +15,7 @@ package google.registry.model.contact; import google.registry.model.eppcommon.PhoneNumber; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * EPP Contact Phone Number diff --git a/core/src/main/java/google/registry/model/contact/Disclose.java b/core/src/main/java/google/registry/model/contact/Disclose.java index 0f04d29b8..78bca7629 100644 --- a/core/src/main/java/google/registry/model/contact/Disclose.java +++ b/core/src/main/java/google/registry/model/contact/Disclose.java @@ -21,22 +21,27 @@ import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; import google.registry.model.eppcommon.PresenceMarker; +import google.registry.persistence.converter.PostalInfoChoiceListUserType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import java.io.Serializable; import java.util.List; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import org.hibernate.annotations.Type; /** The "discloseType" from RFC5733. */ @Embeddable @XmlType(propOrder = {"name", "org", "addr", "voice", "fax", "email"}) public class Disclose extends ImmutableObject implements UnsafeSerializable { + @Type(PostalInfoChoiceListUserType.class) List name; + @Type(PostalInfoChoiceListUserType.class) List org; + @Type(PostalInfoChoiceListUserType.class) List addr; @Embedded PresenceMarker voice; diff --git a/core/src/main/java/google/registry/model/contact/PostalInfo.java b/core/src/main/java/google/registry/model/contact/PostalInfo.java index 4a29033ab..209ecfc82 100644 --- a/core/src/main/java/google/registry/model/contact/PostalInfo.java +++ b/core/src/main/java/google/registry/model/contact/PostalInfo.java @@ -20,16 +20,16 @@ import google.registry.model.Buildable; import google.registry.model.Buildable.Overlayable; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Optional; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.NormalizedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Implementation of both "postalInfoType" and "chgPostalInfoType" from RFC5731. */ @Embeddable diff --git a/core/src/main/java/google/registry/model/domain/RegistryLock.java b/core/src/main/java/google/registry/model/domain/RegistryLock.java index ecb43665a..374ce5753 100644 --- a/core/src/main/java/google/registry/model/domain/RegistryLock.java +++ b/core/src/main/java/google/registry/model/domain/RegistryLock.java @@ -22,22 +22,22 @@ import com.google.gson.annotations.Expose; import google.registry.model.Buildable; import google.registry.model.CreateAutoTimestamp; import google.registry.model.UpdateAutoTimestampEntity; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java index 5c36ed5be..78132b3b0 100644 --- a/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java +++ b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java @@ -16,7 +16,7 @@ package google.registry.model.domain.bulktoken; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** A bulk token extension that may be present on EPP domain commands. */ @XmlRootElement(name = "info") diff --git a/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java index 1a23bdcad..0cb3c6ce6 100644 --- a/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java +++ b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java @@ -19,9 +19,9 @@ import google.registry.model.domain.token.AllocationToken; import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.persistence.VKey; import google.registry.xml.TrimWhitespaceAdapter; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Optional; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * An XML data object that represents a bulk token extension that may be present on the response to diff --git a/core/src/main/java/google/registry/model/domain/bulktoken/package-info.java b/core/src/main/java/google/registry/model/domain/bulktoken/package-info.java index 8f9d9f944..b4192f99f 100644 --- a/core/src/main/java/google/registry/model/domain/bulktoken/package-info.java +++ b/core/src/main/java/google/registry/model/domain/bulktoken/package-info.java @@ -19,8 +19,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.domain.bulktoken; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/domain/fee/BaseFee.java b/core/src/main/java/google/registry/model/domain/fee/BaseFee.java index 954d9a027..897ecd654 100644 --- a/core/src/main/java/google/registry/model/domain/fee/BaseFee.java +++ b/core/src/main/java/google/registry/model/domain/fee/BaseFee.java @@ -23,13 +23,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import google.registry.model.ImmutableObject; import google.registry.xml.PeriodAdapter; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.math.BigDecimal; import java.util.stream.Stream; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.joda.time.DateTime; import org.joda.time.Period; diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java index f480dd00a..15e5e77e8 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java @@ -14,7 +14,7 @@ package google.registry.model.domain.fee; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** * Interface for individual fee extension items in Check commands. These are derived from the more diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java index 5a5a40e3e..823743ec4 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java @@ -14,7 +14,7 @@ package google.registry.model.domain.fee; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** * Abstract class for individual fee extension items in Check responses. These are derived from the diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java index 6922ac076..0e39137e7 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java @@ -14,7 +14,7 @@ package google.registry.model.domain.fee; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** A fee extension that may be present on domain create commands. */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java b/core/src/main/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java index 8ce8f8886..ea5a169f4 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java @@ -17,9 +17,9 @@ package google.registry.model.domain.fee; import com.google.common.base.Ascii; import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlValue; import java.util.Locale; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; /** A command name along with the launch phase and subphase it is to be executed in. */ public class FeeExtensionCommandDescriptor extends ImmutableObject { diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java index bbb564d89..03222958b 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java @@ -18,8 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument; import google.registry.model.ImmutableObject; import google.registry.model.domain.Period; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.Optional; -import javax.xml.bind.annotation.XmlTransient; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java index 6096db619..310b1406b 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java @@ -22,9 +22,9 @@ import google.registry.model.Buildable.GenericBuilder; import google.registry.model.ImmutableObject; import google.registry.model.domain.Period; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java index 0b8c3606b..efe0b6472 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java @@ -14,7 +14,7 @@ package google.registry.model.domain.fee; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** A fee extension that may be present on domain renew commands. */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java index 802d59816..b2be083e7 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java @@ -14,7 +14,7 @@ package google.registry.model.domain.fee; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** A fee extension that may be present on domain transfer commands. */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java index b3f8da5a2..6245fc062 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java @@ -19,9 +19,9 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; import org.joda.money.CurrencyUnit; /** Base class for general transform commands with fees (create, renew, update, transfer). */ diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java index be2b3c77f..b7afae101 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java @@ -21,9 +21,9 @@ import com.google.common.collect.ImmutableList; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.eppoutput.EppResponse.ResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; import org.joda.money.CurrencyUnit; /** Base class for fee responses on general transform commands (create, update, renew, transfer). */ diff --git a/core/src/main/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java index fbaeefc54..7f0a72fb4 100644 --- a/core/src/main/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java +++ b/core/src/main/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java @@ -14,7 +14,7 @@ package google.registry.model.domain.fee; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** A fee extension that may be present on domain update commands. */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java index 9816a732f..0c682b797 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java @@ -16,8 +16,8 @@ package google.registry.model.domain.fee06; import google.registry.model.domain.fee.FeeCheckCommandExtensionItem; import google.registry.model.domain.fee.FeeExtensionCommandDescriptor; +import jakarta.xml.bind.annotation.XmlType; import java.util.Optional; -import javax.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java index 9cd050ea3..ea47e5bde 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java @@ -20,9 +20,9 @@ import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.FeeCheckCommandExtension; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; import org.joda.money.CurrencyUnit; /** Version 0.6 of the fee extension that may be present on domain check commands. */ diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java index 3aa5c629a..530a110bc 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java @@ -17,7 +17,7 @@ package google.registry.model.domain.fee06; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; import google.registry.model.domain.fee.FeeExtensionCommandDescriptor; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; /** The version 0.6 response for a domain check on a single resource. */ diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java index e2f3e4e58..79de7cd70 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java @@ -18,8 +18,8 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.FeeCheckResponseExtension; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.joda.money.CurrencyUnit; /** diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java index ac510ef63..7b4071496 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java @@ -18,8 +18,8 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeCreateCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain create commands. */ @XmlRootElement(name = "create") diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java index 5f8f61e14..b58dde263 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java @@ -17,8 +17,8 @@ package google.registry.model.domain.fee06; import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java index 725e09762..749865610 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee06; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java index 124f6b79d..ba875b0d5 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java @@ -17,9 +17,9 @@ package google.registry.model.domain.fee06; import google.registry.model.domain.fee.FeeExtensionCommandDescriptor; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem; import google.registry.model.eppinput.EppInput.CommandExtension; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.Optional; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java index 5f88f434d..71693cd74 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java @@ -18,8 +18,8 @@ import google.registry.model.domain.fee.FeeExtensionCommandDescriptor; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; import google.registry.model.domain.fee.FeeQueryResponseExtensionItem; import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; /** diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java index 7284ada35..73e593913 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java @@ -18,8 +18,8 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeRenewCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain renew commands. */ @XmlRootElement(name = "renew") diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java index 417d03d07..7f11aa5bc 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java @@ -17,8 +17,8 @@ package google.registry.model.domain.fee06; import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java index 8879efa93..e3c1ec1f7 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java @@ -18,8 +18,8 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransferCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain transfer requests. */ @XmlRootElement(name = "transfer") diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java index e9b5e3915..1d92391b2 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java @@ -17,8 +17,8 @@ package google.registry.model.domain.fee06; import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java index d429f3b0b..3fce12cba 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java @@ -18,8 +18,8 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; import google.registry.model.domain.fee.FeeUpdateCommandExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain update commands. */ @XmlRootElement(name = "update") diff --git a/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java index c39cb353e..154b78d76 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java +++ b/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java @@ -17,8 +17,8 @@ package google.registry.model.domain.fee06; import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee06/package-info.java b/core/src/main/java/google/registry/model/domain/fee06/package-info.java index 891ab0987..770e685c1 100644 --- a/core/src/main/java/google/registry/model/domain/fee06/package-info.java +++ b/core/src/main/java/google/registry/model/domain/fee06/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.domain.fee06; import google.registry.model.adapters.CurrencyUnitAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java index cb312649c..e276544ca 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java @@ -24,10 +24,10 @@ import google.registry.model.domain.fee.FeeCheckCommandExtensionItem; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; import google.registry.model.domain.fee.FeeExtensionCommandDescriptor; import google.registry.model.domain.fee11.FeeCheckCommandExtensionV11.FeeCheckCommandExtensionItemV11; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.Optional; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java index f028ca145..5c0b58c3d 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java @@ -18,8 +18,8 @@ import google.registry.model.domain.DomainObjectSpec; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; import google.registry.model.domain.fee.FeeExtensionCommandDescriptor; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; /** The version 0.11 response for a domain check on a single resource. */ diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java index 97671a9c3..75f5f9819 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java @@ -18,8 +18,8 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.FeeCheckResponseExtension; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.joda.money.CurrencyUnit; /** diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java index 04a5e1bcc..85dce99c4 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeCreateCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain create commands. */ @XmlRootElement(name = "create") diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java index f765a194a..0ef509d1d 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee11; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java index 470d812ec..5f44fc9ff 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee11; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java index ddf7fb3f1..292fbde94 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeRenewCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain renew commands. */ @XmlRootElement(name = "renew") diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java index 2de70381a..b725a90e7 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee11; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java index 03da74a73..a4407ea69 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransferCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain transfer requests. */ @XmlRootElement(name = "transfer") diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java index 93a0e781c..d67eaf2d2 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee11; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java index 889be3435..76285bde4 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; import google.registry.model.domain.fee.FeeUpdateCommandExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain update commands. */ @XmlRootElement(name = "update") diff --git a/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java index 7a39430eb..97ea472f0 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java +++ b/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee11; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee11/package-info.java b/core/src/main/java/google/registry/model/domain/fee11/package-info.java index 872f1e4ee..ba8e7fa1b 100644 --- a/core/src/main/java/google/registry/model/domain/fee11/package-info.java +++ b/core/src/main/java/google/registry/model/domain/fee11/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.domain.fee11; import google.registry.model.adapters.CurrencyUnitAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java index 23c984070..eaf5ef562 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java @@ -17,11 +17,11 @@ package google.registry.model.domain.fee12; import com.google.common.base.Ascii; import google.registry.model.domain.Period; import google.registry.model.domain.fee.FeeCheckCommandExtensionItem; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.Locale; import java.util.Optional; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java index 4bcf1bf54..ec4890bc8 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.FeeCheckCommandExtension; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; /** Version 0.12 of the fee extension that may be present on domain check commands. */ diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java index 86217d536..dcfd8904d 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java @@ -23,10 +23,10 @@ import google.registry.model.ImmutableObject; import google.registry.model.domain.Period; import google.registry.model.domain.fee.Fee; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** The version 0.12 response command entity for a domain check on a single resource. */ diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java index d4f57627d..0071857d6 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java @@ -22,7 +22,7 @@ import google.registry.model.domain.Period; import google.registry.model.domain.fee.Fee; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java index 4da664bda..e627ccd1f 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java @@ -18,9 +18,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.domain.fee.FeeCheckResponseExtension; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.joda.money.CurrencyUnit; /** diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java index 3b0ad2dc3..2ff8fcbe1 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeCreateCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain create commands. */ @XmlRootElement(name = "create") diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java index 90799ed36..ec3445b32 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee12; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java index 30ae7e011..a2c695d2a 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee12; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java index e97cbae1d..d1a0b120f 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeRenewCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain renew commands. */ @XmlRootElement(name = "renew") diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java index 89778372b..0dc8d2d99 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee12; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java index 983678819..53049bb9d 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransferCommandExtension; import google.registry.model.domain.fee.FeeTransformResponseExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain transfer requests. */ @XmlRootElement(name = "transfer") diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java index dad1dfa08..6bdd93dc5 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee12; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java index 63f33363a..71a430093 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.fee.Credit; import google.registry.model.domain.fee.FeeTransformResponseExtension; import google.registry.model.domain.fee.FeeUpdateCommandExtension; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** A fee extension that may be present on domain update commands. */ @XmlRootElement(name = "update") diff --git a/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java index 2fc3bbd0a..6d9d0fb36 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java +++ b/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java @@ -15,8 +15,8 @@ package google.registry.model.domain.fee12; import google.registry.model.domain.fee.FeeTransformResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * An XML data object that represents a fee extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/fee12/package-info.java b/core/src/main/java/google/registry/model/domain/fee12/package-info.java index 7cc8db6ef..9bf29e3ce 100644 --- a/core/src/main/java/google/registry/model/domain/fee12/package-info.java +++ b/core/src/main/java/google/registry/model/domain/fee12/package-info.java @@ -24,11 +24,10 @@ package google.registry.model.domain.fee12; import google.registry.model.adapters.CurrencyUnitAdapter; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchCheckExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchCheckExtension.java index 642137d0d..5c3d2d0b8 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchCheckExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchCheckExtension.java @@ -18,9 +18,9 @@ import static com.google.common.base.MoreObjects.firstNonNull; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlRootElement; /** * An XML data object that represents a launch extension that may be present on EPP domain check diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java index d44554028..6061effc9 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java @@ -18,11 +18,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * An XML data object that represents a launch extension that may be present on the response to EPP diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchCreateExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchCreateExtension.java index 02d187fb2..3901b1e40 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchCreateExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchCreateExtension.java @@ -21,12 +21,12 @@ import google.registry.model.eppinput.EppInput.CommandExtension; import google.registry.model.smd.AbstractSignedMark; import google.registry.model.smd.EncodedSignedMark; import google.registry.model.smd.SignedMark; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlRootElement; /** * An XML data object that represents a launch extension that may be present on EPP domain create diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchDeleteExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchDeleteExtension.java index 6e64663c2..34ccbc2b3 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchDeleteExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchDeleteExtension.java @@ -14,7 +14,7 @@ package google.registry.model.domain.launch; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * An XML data object that represents a launch extension that may be present on EPP domain delete diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchExtension.java index 4b62c427a..e42e46c5b 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchExtension.java @@ -16,7 +16,7 @@ package google.registry.model.domain.launch; import google.registry.model.Buildable.GenericBuilder; import google.registry.model.ImmutableObject; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** * A launch extension which can be passed in to domain update and delete, and also returned from diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchInfoExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchInfoExtension.java index 3076a122a..523681bb1 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchInfoExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchInfoExtension.java @@ -14,8 +14,8 @@ package google.registry.model.domain.launch; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; /** * An XML data object that represents a launch extension that may be present on EPP domain info diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchNotice.java b/core/src/main/java/google/registry/model/domain/launch/LaunchNotice.java index 4626fa2f2..8c4b6f64b 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchNotice.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchNotice.java @@ -25,13 +25,13 @@ import com.google.common.base.CharMatcher; import com.google.common.primitives.Ints; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.util.Optional; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; import org.joda.time.DateTime; /** The claims notice id from the claims phase. */ diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java b/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java index 4e196a890..5b991aa21 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java @@ -17,9 +17,9 @@ package google.registry.model.domain.launch; import static java.util.Objects.hash; import google.registry.model.ImmutableObject; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlValue; import java.util.Objects; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; /** * The launch phase of the TLD being addressed by this command. diff --git a/core/src/main/java/google/registry/model/domain/launch/LaunchUpdateExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchUpdateExtension.java index 42956b467..92cba4408 100644 --- a/core/src/main/java/google/registry/model/domain/launch/LaunchUpdateExtension.java +++ b/core/src/main/java/google/registry/model/domain/launch/LaunchUpdateExtension.java @@ -14,7 +14,7 @@ package google.registry.model.domain.launch; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * An XML data object that represents a launch extension that may be present on EPP domain update diff --git a/core/src/main/java/google/registry/model/domain/launch/package-info.java b/core/src/main/java/google/registry/model/domain/launch/package-info.java index ba3c3e378..38432a2ca 100644 --- a/core/src/main/java/google/registry/model/domain/launch/package-info.java +++ b/core/src/main/java/google/registry/model/domain/launch/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.domain.launch; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/domain/metadata/MetadataExtension.java b/core/src/main/java/google/registry/model/domain/metadata/MetadataExtension.java index 2e7ef2851..f098982c7 100644 --- a/core/src/main/java/google/registry/model/domain/metadata/MetadataExtension.java +++ b/core/src/main/java/google/registry/model/domain/metadata/MetadataExtension.java @@ -16,8 +16,8 @@ package google.registry.model.domain.metadata; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** A metadata extension that may be present on EPP create/mutate commands. */ @XmlRootElement(name = "metadata") diff --git a/core/src/main/java/google/registry/model/domain/metadata/package-info.java b/core/src/main/java/google/registry/model/domain/metadata/package-info.java index c0c70f1b4..0db7377be 100644 --- a/core/src/main/java/google/registry/model/domain/metadata/package-info.java +++ b/core/src/main/java/google/registry/model/domain/metadata/package-info.java @@ -19,8 +19,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.domain.metadata; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/domain/package-info.java b/core/src/main/java/google/registry/model/domain/package-info.java index b33d62cb8..f1f4172cf 100644 --- a/core/src/main/java/google/registry/model/domain/package-info.java +++ b/core/src/main/java/google/registry/model/domain/package-info.java @@ -24,11 +24,10 @@ package google.registry.model.domain; import google.registry.xml.DateAdapter; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; diff --git a/core/src/main/java/google/registry/model/domain/rgp/GracePeriodStatus.java b/core/src/main/java/google/registry/model/domain/rgp/GracePeriodStatus.java index 4ba768235..651b191c9 100644 --- a/core/src/main/java/google/registry/model/domain/rgp/GracePeriodStatus.java +++ b/core/src/main/java/google/registry/model/domain/rgp/GracePeriodStatus.java @@ -19,10 +19,10 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import com.google.common.collect.ImmutableMap; import google.registry.model.adapters.EnumToAttributeAdapter; import google.registry.model.adapters.EnumToAttributeAdapter.EppEnum; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.stream.Stream; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Represents a Registry Grace Period status, as defined by diff --git a/core/src/main/java/google/registry/model/domain/rgp/RestoreCommand.java b/core/src/main/java/google/registry/model/domain/rgp/RestoreCommand.java index 739566000..ee26ddf4b 100644 --- a/core/src/main/java/google/registry/model/domain/rgp/RestoreCommand.java +++ b/core/src/main/java/google/registry/model/domain/rgp/RestoreCommand.java @@ -14,9 +14,9 @@ package google.registry.model.domain.rgp; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; /** The EPP RGP restore command. */ public class RestoreCommand { diff --git a/core/src/main/java/google/registry/model/domain/rgp/RgpInfoExtension.java b/core/src/main/java/google/registry/model/domain/rgp/RgpInfoExtension.java index 58b56dbed..7fc05ffac 100644 --- a/core/src/main/java/google/registry/model/domain/rgp/RgpInfoExtension.java +++ b/core/src/main/java/google/registry/model/domain/rgp/RgpInfoExtension.java @@ -17,7 +17,7 @@ package google.registry.model.domain.rgp; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** The EPP registry grace period extension to be returned with domain info commands. */ @XmlRootElement(name = "infData") diff --git a/core/src/main/java/google/registry/model/domain/rgp/RgpUpdateExtension.java b/core/src/main/java/google/registry/model/domain/rgp/RgpUpdateExtension.java index 3affc5970..218fe0418 100644 --- a/core/src/main/java/google/registry/model/domain/rgp/RgpUpdateExtension.java +++ b/core/src/main/java/google/registry/model/domain/rgp/RgpUpdateExtension.java @@ -16,7 +16,7 @@ package google.registry.model.domain.rgp; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** The EPP RGP extension that may be present on domain update commands. */ @XmlRootElement(name = "update") diff --git a/core/src/main/java/google/registry/model/domain/rgp/package-info.java b/core/src/main/java/google/registry/model/domain/rgp/package-info.java index a3f7c5b7b..ca513504e 100644 --- a/core/src/main/java/google/registry/model/domain/rgp/package-info.java +++ b/core/src/main/java/google/registry/model/domain/rgp/package-info.java @@ -19,8 +19,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.domain.rgp; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/domain/secdns/DomainDsData.java b/core/src/main/java/google/registry/model/domain/secdns/DomainDsData.java index 1124e4a5e..25154685c 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/DomainDsData.java +++ b/core/src/main/java/google/registry/model/domain/secdns/DomainDsData.java @@ -18,16 +18,16 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.ImmutableObject; import google.registry.model.domain.secdns.DomainDsData.DomainDsDataId; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import jakarta.xml.bind.DatatypeConverter; +import jakarta.xml.bind.annotation.XmlType; import java.io.Serializable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.xml.bind.DatatypeConverter; -import javax.xml.bind.annotation.XmlType; /** * Holds the data necessary to construct a single Delegation Signer (DS) record for a domain. diff --git a/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataBase.java b/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataBase.java index 4c5e517ff..4e3bd85c6 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataBase.java +++ b/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataBase.java @@ -16,15 +16,15 @@ package google.registry.model.domain.secdns; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.xml.bind.DatatypeConverter; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.xml.bind.DatatypeConverter; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** Base class for {@link DomainDsData} and {@link DomainDsDataHistory}. */ @MappedSuperclass diff --git a/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java b/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java index 89591e27a..fc2f109d9 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java +++ b/core/src/main/java/google/registry/model/domain/secdns/DomainDsDataHistory.java @@ -18,11 +18,11 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import google.registry.model.domain.DomainHistory; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** Entity class to represent a historic {@link DomainDsData}. */ @Entity diff --git a/core/src/main/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java b/core/src/main/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java index e54c7f98b..a7a12e796 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java +++ b/core/src/main/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java @@ -19,9 +19,9 @@ import static google.registry.util.CollectionUtils.nullSafeImmutableCopy; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.Set; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; /** The EPP secDNS extension that may be present on domain create commands. */ @XmlRootElement(name = "create") diff --git a/core/src/main/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java b/core/src/main/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java index 250763104..118f6f7e1 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java +++ b/core/src/main/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java @@ -17,7 +17,7 @@ package google.registry.model.domain.secdns; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.model.eppoutput.EppResponse.ResponseExtension; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** The EPP secDNS extension to be returned with domain info commands. */ @XmlRootElement(name = "infData") diff --git a/core/src/main/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java b/core/src/main/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java index 9ff2840b8..a3c17586b 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java +++ b/core/src/main/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java @@ -19,12 +19,12 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.Set; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; /** The EPP secDNS extension that may be present on domain update commands. */ @XmlRootElement(name = "update") diff --git a/core/src/main/java/google/registry/model/domain/secdns/package-info.java b/core/src/main/java/google/registry/model/domain/secdns/package-info.java index 8b91616b5..aafcee8a4 100644 --- a/core/src/main/java/google/registry/model/domain/secdns/package-info.java +++ b/core/src/main/java/google/registry/model/domain/secdns/package-info.java @@ -19,8 +19,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.domain.secdns; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java index ae8f17a68..e63d895b0 100644 --- a/core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java +++ b/core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java @@ -14,8 +14,8 @@ package google.registry.model.domain.superuser; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** A superuser extension that may be present on domain delete commands. */ @XmlRootElement(name = "domainDelete") diff --git a/core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java index 93f55fe32..21ae00a9b 100644 --- a/core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java +++ b/core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java @@ -15,8 +15,8 @@ package google.registry.model.domain.superuser; import google.registry.model.domain.Period; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** A superuser extension that may be present on domain transfer request commands. */ @XmlRootElement(name = "domainTransferRequest") diff --git a/core/src/main/java/google/registry/model/domain/superuser/DomainUpdateSuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/DomainUpdateSuperuserExtension.java index 7c0ab6803..ac715d90c 100644 --- a/core/src/main/java/google/registry/model/domain/superuser/DomainUpdateSuperuserExtension.java +++ b/core/src/main/java/google/registry/model/domain/superuser/DomainUpdateSuperuserExtension.java @@ -16,10 +16,10 @@ package google.registry.model.domain.superuser; import static com.google.common.base.Strings.isNullOrEmpty; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.Optional; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; /** A superuser extension that may be present on domain update commands. */ @XmlRootElement(name = "domainUpdate") diff --git a/core/src/main/java/google/registry/model/domain/superuser/SuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/SuperuserExtension.java index 171925666..e0dd32189 100644 --- a/core/src/main/java/google/registry/model/domain/superuser/SuperuserExtension.java +++ b/core/src/main/java/google/registry/model/domain/superuser/SuperuserExtension.java @@ -16,7 +16,7 @@ package google.registry.model.domain.superuser; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** Base class for superuser EPP extensions. */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/domain/superuser/package-info.java b/core/src/main/java/google/registry/model/domain/superuser/package-info.java index 525b1ba8b..abe4e587b 100644 --- a/core/src/main/java/google/registry/model/domain/superuser/package-info.java +++ b/core/src/main/java/google/registry/model/domain/superuser/package-info.java @@ -19,8 +19,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.domain.superuser; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/domain/token/AllocationToken.java b/core/src/main/java/google/registry/model/domain/token/AllocationToken.java index dcd897c4e..6a23f90c6 100644 --- a/core/src/main/java/google/registry/model/domain/token/AllocationToken.java +++ b/core/src/main/java/google/registry/model/domain/token/AllocationToken.java @@ -50,21 +50,20 @@ import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; -import google.registry.persistence.converter.JodaMoneyType; +import google.registry.persistence.converter.AllocationTokenStatusTransitionUserType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.util.Map; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; -import org.hibernate.annotations.Columns; import org.hibernate.annotations.Type; import org.joda.money.Money; import org.joda.time.DateTime; @@ -242,8 +241,11 @@ public class AllocationToken extends UpdateAutoTimestampEntity implements Builda /** The price used for renewals iff the renewalPriceBehavior is SPECIFIED. */ @Nullable - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "renewalPriceAmount"), @Column(name = "renewalPriceCurrency")}) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = @Column(name = "renewalPriceAmount", precision = 19, scale = 2)) + @AttributeOverride(name = "currency", column = @Column(name = "renewalPriceCurrency")) Money renewalPrice; @Enumerated(EnumType.STRING) @@ -256,11 +258,14 @@ public class AllocationToken extends UpdateAutoTimestampEntity implements Builda *

If the token is promotional, the status will be VALID at the start of the promotion and * ENDED at the end. If manually cancelled, we will add a CANCELLED status. */ + @Type(AllocationTokenStatusTransitionUserType.class) TimedTransitionProperty tokenStatusTransitions = TimedTransitionProperty.withInitialValue(NOT_STARTED); /** Allowed EPP actions for this token, or null if all actions are allowed. */ - @Nullable Set allowedEppActions; + @Nullable + @Enumerated(EnumType.STRING) + Set allowedEppActions; public String getToken() { return token; diff --git a/core/src/main/java/google/registry/model/domain/token/AllocationTokenExtension.java b/core/src/main/java/google/registry/model/domain/token/AllocationTokenExtension.java index 7295db33c..fdeee6285 100644 --- a/core/src/main/java/google/registry/model/domain/token/AllocationTokenExtension.java +++ b/core/src/main/java/google/registry/model/domain/token/AllocationTokenExtension.java @@ -17,9 +17,9 @@ package google.registry.model.domain.token; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; import google.registry.xml.TrimWhitespaceAdapter; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * An allocation token extension that may be present on EPP domain commands. diff --git a/core/src/main/java/google/registry/model/domain/token/BulkPricingPackage.java b/core/src/main/java/google/registry/model/domain/token/BulkPricingPackage.java index cfea6c055..85c771eb2 100644 --- a/core/src/main/java/google/registry/model/domain/token/BulkPricingPackage.java +++ b/core/src/main/java/google/registry/model/domain/token/BulkPricingPackage.java @@ -23,16 +23,15 @@ import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.domain.token.AllocationToken.TokenType; import google.registry.persistence.VKey; -import google.registry.persistence.converter.JodaMoneyType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import org.hibernate.annotations.Columns; -import org.hibernate.annotations.Type; import org.joda.money.Money; import org.joda.time.DateTime; @@ -41,7 +40,7 @@ import org.joda.time.DateTime; * PackagePromotion in Cloud SQL. */ @Entity(name = "PackagePromotion") -@javax.persistence.Table(indexes = {@javax.persistence.Index(columnList = "token")}) +@Table(indexes = {@jakarta.persistence.Index(columnList = "token")}) public class BulkPricingPackage extends ImmutableObject implements Buildable { /** An autogenerated identifier for the bulk pricing promotion. */ @@ -63,12 +62,13 @@ public class BulkPricingPackage extends ImmutableObject implements Buildable { int maxCreates; /** The annual price of the bulk pricing package. */ - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns( - columns = { - @Column(name = "package_price_amount", nullable = false), - @Column(name = "package_price_currency", nullable = false) - }) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = @Column(name = "package_price_amount", precision = 19, scale = 2, nullable = false)) + @AttributeOverride( + name = "currency", + column = @Column(name = "package_price_currency", nullable = false)) Money bulkPrice; /** The next billing date of the bulk pricing package. */ diff --git a/core/src/main/java/google/registry/model/domain/token/package-info.java b/core/src/main/java/google/registry/model/domain/token/package-info.java index 2a2c4cf40..de33c6fc8 100644 --- a/core/src/main/java/google/registry/model/domain/token/package-info.java +++ b/core/src/main/java/google/registry/model/domain/token/package-info.java @@ -24,8 +24,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.domain.token; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/eppcommon/Address.java b/core/src/main/java/google/registry/model/eppcommon/Address.java index dcd3ec7fb..37cd429ee 100644 --- a/core/src/main/java/google/registry/model/eppcommon/Address.java +++ b/core/src/main/java/google/registry/model/eppcommon/Address.java @@ -27,20 +27,20 @@ import google.registry.model.JsonMapBuilder; import google.registry.model.Jsonifiable; import google.registry.model.UnsafeSerializable; import google.registry.tools.GsonUtils.GsonPostProcessable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Transient; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Stream; -import javax.persistence.Embeddable; -import javax.persistence.MappedSuperclass; -import javax.persistence.PostLoad; -import javax.persistence.Transient; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.NormalizedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Container for generic street address. diff --git a/core/src/main/java/google/registry/model/eppcommon/AuthInfo.java b/core/src/main/java/google/registry/model/eppcommon/AuthInfo.java index 5d67505e3..9c41530a3 100644 --- a/core/src/main/java/google/registry/model/eppcommon/AuthInfo.java +++ b/core/src/main/java/google/registry/model/eppcommon/AuthInfo.java @@ -16,17 +16,17 @@ package google.registry.model.eppcommon; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.annotation.Nullable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.NormalizedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * The "authInfoType" complex type. diff --git a/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java b/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java index dfb1919e5..32cca4c50 100644 --- a/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java +++ b/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java @@ -19,13 +19,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; -import javax.persistence.Embeddable; -import javax.persistence.MappedSuperclass; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.MappedSuperclass; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Container for generic E164 phone number. diff --git a/core/src/main/java/google/registry/model/eppcommon/PresenceMarker.java b/core/src/main/java/google/registry/model/eppcommon/PresenceMarker.java index 225d5bf08..2d1bc6601 100644 --- a/core/src/main/java/google/registry/model/eppcommon/PresenceMarker.java +++ b/core/src/main/java/google/registry/model/eppcommon/PresenceMarker.java @@ -15,9 +15,9 @@ package google.registry.model.eppcommon; import google.registry.model.ImmutableObject; +import jakarta.persistence.Embeddable; +import jakarta.xml.bind.annotation.XmlTransient; import java.io.Serializable; -import javax.persistence.Embeddable; -import javax.xml.bind.annotation.XmlTransient; /** * Used as the value of a tag that is present in the XML but has no children or value. diff --git a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java index eb2ddf2b7..d6d6423b5 100644 --- a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java +++ b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java @@ -31,8 +31,8 @@ import google.registry.model.domain.rgp.RgpUpdateExtension; import google.registry.model.domain.secdns.SecDnsCreateExtension; import google.registry.model.eppinput.EppInput.CommandExtension; import google.registry.model.eppoutput.EppResponse.ResponseExtension; +import jakarta.xml.bind.annotation.XmlSchema; import java.util.EnumSet; -import javax.xml.bind.annotation.XmlSchema; /** Constants that define the EPP protocol version we support. */ public class ProtocolDefinition { diff --git a/core/src/main/java/google/registry/model/eppcommon/StatusValue.java b/core/src/main/java/google/registry/model/eppcommon/StatusValue.java index f26f6c773..1b89bdff7 100644 --- a/core/src/main/java/google/registry/model/eppcommon/StatusValue.java +++ b/core/src/main/java/google/registry/model/eppcommon/StatusValue.java @@ -28,7 +28,7 @@ import google.registry.model.domain.Domain; import google.registry.model.domain.DomainBase; import google.registry.model.host.Host; import google.registry.model.host.HostBase; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Represents an EPP status value for hosts, contacts, and domains, as defined in RFC 5731, 5732, diff --git a/core/src/main/java/google/registry/model/eppcommon/Trid.java b/core/src/main/java/google/registry/model/eppcommon/Trid.java index 0d4e258a7..37040c7f6 100644 --- a/core/src/main/java/google/registry/model/eppcommon/Trid.java +++ b/core/src/main/java/google/registry/model/eppcommon/Trid.java @@ -18,11 +18,11 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; +import jakarta.persistence.Embeddable; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Embeddable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; /** * "A {@code TRID} (transaction identifier) element containing the transaction identifier assigned diff --git a/core/src/main/java/google/registry/model/eppinput/EppInput.java b/core/src/main/java/google/registry/model/eppinput/EppInput.java index 8ad63bd78..04855737c 100644 --- a/core/src/main/java/google/registry/model/eppinput/EppInput.java +++ b/core/src/main/java/google/registry/model/eppinput/EppInput.java @@ -56,22 +56,22 @@ import google.registry.model.domain.token.AllocationTokenExtension; import google.registry.model.eppinput.ResourceCommand.ResourceCheck; import google.registry.model.eppinput.ResourceCommand.SingleResourceCommand; import google.registry.model.host.HostCommand; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.List; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** This class represents the root EPP XML element for input. */ @XmlRootElement(name = "epp") diff --git a/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java b/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java index 75a115292..de81fce7d 100644 --- a/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java +++ b/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java @@ -26,11 +26,11 @@ import google.registry.model.eppcommon.AuthInfo; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.ResourceCommand.ResourceUpdate.AddRemove; import google.registry.util.TypeUtils.TypeInstantiator; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlTransient; /** Commands for EPP resources. */ public interface ResourceCommand { diff --git a/core/src/main/java/google/registry/model/eppinput/package-info.java b/core/src/main/java/google/registry/model/eppinput/package-info.java index 95339b86b..c717d3d84 100644 --- a/core/src/main/java/google/registry/model/eppinput/package-info.java +++ b/core/src/main/java/google/registry/model/eppinput/package-info.java @@ -19,8 +19,8 @@ @XmlAccessorType(XmlAccessType.FIELD) package google.registry.model.eppinput; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/model/eppoutput/CheckData.java b/core/src/main/java/google/registry/model/eppoutput/CheckData.java index 3d0726df0..8fac92c59 100644 --- a/core/src/main/java/google/registry/model/eppoutput/CheckData.java +++ b/core/src/main/java/google/registry/model/eppoutput/CheckData.java @@ -17,14 +17,14 @@ package google.registry.model.eppoutput; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.model.eppoutput.EppResponse.ResponseData; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; /** The "chkDataType" complex type. */ @XmlTransient diff --git a/core/src/main/java/google/registry/model/eppoutput/CreateData.java b/core/src/main/java/google/registry/model/eppoutput/CreateData.java index 34dae3e9d..fd5daec3c 100644 --- a/core/src/main/java/google/registry/model/eppoutput/CreateData.java +++ b/core/src/main/java/google/registry/model/eppoutput/CreateData.java @@ -15,10 +15,10 @@ package google.registry.model.eppoutput; import google.registry.model.eppoutput.EppResponse.ResponseData; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** The {@link ResponseData} returned when creating a resource. */ diff --git a/core/src/main/java/google/registry/model/eppoutput/EppOutput.java b/core/src/main/java/google/registry/model/eppoutput/EppOutput.java index 2ddc5b9d5..aa35cf13e 100644 --- a/core/src/main/java/google/registry/model/eppoutput/EppOutput.java +++ b/core/src/main/java/google/registry/model/eppoutput/EppOutput.java @@ -16,9 +16,9 @@ package google.registry.model.eppoutput; import com.google.common.annotations.VisibleForTesting; import google.registry.model.ImmutableObject; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; /** This class represents the root EPP XML element for output. */ @XmlRootElement(name = "epp") diff --git a/core/src/main/java/google/registry/model/eppoutput/EppResponse.java b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java index eab60f3e0..4d0543773 100644 --- a/core/src/main/java/google/registry/model/eppoutput/EppResponse.java +++ b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java @@ -61,13 +61,13 @@ import google.registry.model.poll.PendingActionNotificationResponse.DomainPendin import google.registry.model.poll.PendingActionNotificationResponse.HostPendingActionNotificationResponse; import google.registry.model.transfer.TransferResponse.ContactTransferResponse; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; /** * The EppResponse class represents an EPP response message. diff --git a/core/src/main/java/google/registry/model/eppoutput/Greeting.java b/core/src/main/java/google/registry/model/eppoutput/Greeting.java index b03b75475..02aa71cd9 100644 --- a/core/src/main/java/google/registry/model/eppoutput/Greeting.java +++ b/core/src/main/java/google/registry/model/eppoutput/Greeting.java @@ -18,9 +18,9 @@ import google.registry.model.ImmutableObject; import google.registry.model.eppcommon.PresenceMarker; import google.registry.model.eppcommon.ProtocolDefinition; import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; import java.util.Set; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/eppoutput/Result.java b/core/src/main/java/google/registry/model/eppoutput/Result.java index f3952b943..2181287f0 100644 --- a/core/src/main/java/google/registry/model/eppoutput/Result.java +++ b/core/src/main/java/google/registry/model/eppoutput/Result.java @@ -19,8 +19,8 @@ import static google.registry.util.XmlEnumUtils.enumToXml; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import google.registry.model.ImmutableObject; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlEnumValue; /** * "If the command was processed successfully, only one {@code Result} element MUST be returned. If diff --git a/core/src/main/java/google/registry/model/eppoutput/package-info.java b/core/src/main/java/google/registry/model/eppoutput/package-info.java index 8586d75fc..a00cab57a 100644 --- a/core/src/main/java/google/registry/model/eppoutput/package-info.java +++ b/core/src/main/java/google/registry/model/eppoutput/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.eppoutput; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/host/Host.java b/core/src/main/java/google/registry/model/host/Host.java index 0ee095cf2..7c7544912 100644 --- a/core/src/main/java/google/registry/model/host/Host.java +++ b/core/src/main/java/google/registry/model/host/Host.java @@ -18,12 +18,12 @@ import google.registry.model.EppResource.ForeignKeyedEppResource; import google.registry.model.annotations.ExternalMessagingName; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; /** * A persistable Host resource including mutable and non-mutable fields. diff --git a/core/src/main/java/google/registry/model/host/HostBase.java b/core/src/main/java/google/registry/model/host/HostBase.java index 7a29c8c9d..e8af4d3aa 100644 --- a/core/src/main/java/google/registry/model/host/HostBase.java +++ b/core/src/main/java/google/registry/model/host/HostBase.java @@ -26,14 +26,16 @@ import google.registry.model.EppResource; import google.registry.model.domain.Domain; import google.registry.model.transfer.TransferData; import google.registry.persistence.VKey; +import google.registry.persistence.converter.InetAddressSetUserType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.MappedSuperclass; import java.net.InetAddress; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.MappedSuperclass; +import org.hibernate.annotations.Type; import org.joda.time.DateTime; /** @@ -42,7 +44,7 @@ import org.joda.time.DateTime; *

A host's {@link TransferData} is stored on the superordinate domain. Non-subordinate hosts * don't carry a full set of TransferData; all they have is lastTransferTime. * - *

This class deliberately does not include an {@link javax.persistence.Id} so that any + *

This class deliberately does not include an {@link jakarta.persistence.Id} so that any * foreign-keyed fields can refer to the proper parent entity's ID, whether we're storing this in * the DB itself or as part of another entity * @@ -63,6 +65,7 @@ public class HostBase extends EppResource { String hostName; /** IP Addresses for this host. Can be null if this is an external host. */ + @Type(InetAddressSetUserType.class) Set inetAddresses; /** The superordinate domain of this host, or null if this is an external host. */ diff --git a/core/src/main/java/google/registry/model/host/HostCommand.java b/core/src/main/java/google/registry/model/host/HostCommand.java index ae77d4f5a..b1baa0f68 100644 --- a/core/src/main/java/google/registry/model/host/HostCommand.java +++ b/core/src/main/java/google/registry/model/host/HostCommand.java @@ -22,12 +22,12 @@ import google.registry.model.eppinput.ResourceCommand.AbstractSingleResourceComm import google.registry.model.eppinput.ResourceCommand.ResourceCheck; import google.registry.model.eppinput.ResourceCommand.ResourceCreateOrChange; import google.registry.model.eppinput.ResourceCommand.ResourceUpdate; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.net.InetAddress; import java.util.Set; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; /** A collection of {@link Host} commands. */ public class HostCommand { diff --git a/core/src/main/java/google/registry/model/host/HostHistory.java b/core/src/main/java/google/registry/model/host/HostHistory.java index da8196eee..400e590c6 100644 --- a/core/src/main/java/google/registry/model/host/HostHistory.java +++ b/core/src/main/java/google/registry/model/host/HostHistory.java @@ -14,15 +14,15 @@ package google.registry.model.host; import google.registry.model.EppResource; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; /** * A persisted history entry representing an EPP modification to a host. diff --git a/core/src/main/java/google/registry/model/host/HostInfoData.java b/core/src/main/java/google/registry/model/host/HostInfoData.java index 043e5a1df..2ae5027ed 100644 --- a/core/src/main/java/google/registry/model/host/HostInfoData.java +++ b/core/src/main/java/google/registry/model/host/HostInfoData.java @@ -19,11 +19,11 @@ import com.google.auto.value.AutoValue.CopyAnnotations; import com.google.common.collect.ImmutableSet; import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppoutput.EppResponse.ResponseData; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.net.InetAddress; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** The {@link ResponseData} returned for an EPP info flow on a host. */ diff --git a/core/src/main/java/google/registry/model/host/InetAddressAdapter.java b/core/src/main/java/google/registry/model/host/InetAddressAdapter.java index 3bd29488f..6fecff373 100644 --- a/core/src/main/java/google/registry/model/host/InetAddressAdapter.java +++ b/core/src/main/java/google/registry/model/host/InetAddressAdapter.java @@ -15,13 +15,13 @@ package google.registry.model.host; import com.google.common.net.InetAddresses; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.net.Inet6Address; import java.net.InetAddress; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Used by JAXB to convert InetAddress objects to and from AddrType objects, which are the diff --git a/core/src/main/java/google/registry/model/host/package-info.java b/core/src/main/java/google/registry/model/host/package-info.java index 27f5ff8db..cb0859056 100644 --- a/core/src/main/java/google/registry/model/host/package-info.java +++ b/core/src/main/java/google/registry/model/host/package-info.java @@ -23,11 +23,10 @@ package google.registry.model.host; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; diff --git a/core/src/main/java/google/registry/model/mark/CommonMarkContactFields.java b/core/src/main/java/google/registry/model/mark/CommonMarkContactFields.java index 66c03748c..950398ecd 100644 --- a/core/src/main/java/google/registry/model/mark/CommonMarkContactFields.java +++ b/core/src/main/java/google/registry/model/mark/CommonMarkContactFields.java @@ -15,8 +15,8 @@ package google.registry.model.mark; import google.registry.model.ImmutableObject; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * Common fields shared amongst all mark contact subclasses. diff --git a/core/src/main/java/google/registry/model/mark/CommonMarkFields.java b/core/src/main/java/google/registry/model/mark/CommonMarkFields.java index 4cc090274..32795f366 100644 --- a/core/src/main/java/google/registry/model/mark/CommonMarkFields.java +++ b/core/src/main/java/google/registry/model/mark/CommonMarkFields.java @@ -18,9 +18,9 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; /** * Common fields shared amongst all mark instances. diff --git a/core/src/main/java/google/registry/model/mark/CourtMark.java b/core/src/main/java/google/registry/model/mark/CourtMark.java index 3ead91916..ad8cc79cf 100644 --- a/core/src/main/java/google/registry/model/mark/CourtMark.java +++ b/core/src/main/java/google/registry/model/mark/CourtMark.java @@ -17,9 +17,9 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; /** Holds information about a mark derived from a court opinion. */ @XmlType(propOrder = { diff --git a/core/src/main/java/google/registry/model/mark/Mark.java b/core/src/main/java/google/registry/model/mark/Mark.java index 284cb602a..0072df5d3 100644 --- a/core/src/main/java/google/registry/model/mark/Mark.java +++ b/core/src/main/java/google/registry/model/mark/Mark.java @@ -18,9 +18,9 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; /** * Information about one or more marks. diff --git a/core/src/main/java/google/registry/model/mark/MarkContact.java b/core/src/main/java/google/registry/model/mark/MarkContact.java index 9de3fcb15..069daf2a6 100644 --- a/core/src/main/java/google/registry/model/mark/MarkContact.java +++ b/core/src/main/java/google/registry/model/mark/MarkContact.java @@ -14,9 +14,9 @@ package google.registry.model.mark; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; /** Contact information for the representative of the mark. */ public class MarkContact extends CommonMarkContactFields { diff --git a/core/src/main/java/google/registry/model/mark/MarkHolder.java b/core/src/main/java/google/registry/model/mark/MarkHolder.java index f05036dba..ac42a14ef 100644 --- a/core/src/main/java/google/registry/model/mark/MarkHolder.java +++ b/core/src/main/java/google/registry/model/mark/MarkHolder.java @@ -14,9 +14,9 @@ package google.registry.model.mark; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; /** Contact information for the holder of the mark. */ public class MarkHolder extends CommonMarkContactFields { diff --git a/core/src/main/java/google/registry/model/mark/MarkProtection.java b/core/src/main/java/google/registry/model/mark/MarkProtection.java index f29c8f4b2..e841df710 100644 --- a/core/src/main/java/google/registry/model/mark/MarkProtection.java +++ b/core/src/main/java/google/registry/model/mark/MarkProtection.java @@ -18,8 +18,8 @@ import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; +import jakarta.xml.bind.annotation.XmlElement; import java.util.List; -import javax.xml.bind.annotation.XmlElement; /** A country and region of a country where a mark is protected. */ public class MarkProtection extends ImmutableObject { diff --git a/core/src/main/java/google/registry/model/mark/ProtectedMark.java b/core/src/main/java/google/registry/model/mark/ProtectedMark.java index 1e6fab96a..097969a19 100644 --- a/core/src/main/java/google/registry/model/mark/ProtectedMark.java +++ b/core/src/main/java/google/registry/model/mark/ProtectedMark.java @@ -14,8 +14,8 @@ package google.registry.model.mark; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.joda.time.DateTime; /** Common fields for {@link CourtMark} and {@link TreatyOrStatuteMark}. */ diff --git a/core/src/main/java/google/registry/model/mark/Trademark.java b/core/src/main/java/google/registry/model/mark/Trademark.java index 8dbf545cb..713b1a7cf 100644 --- a/core/src/main/java/google/registry/model/mark/Trademark.java +++ b/core/src/main/java/google/registry/model/mark/Trademark.java @@ -17,9 +17,9 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** Holds information about a registered trademark. */ diff --git a/core/src/main/java/google/registry/model/mark/TreatyOrStatuteMark.java b/core/src/main/java/google/registry/model/mark/TreatyOrStatuteMark.java index 38aecf24f..595c69d30 100644 --- a/core/src/main/java/google/registry/model/mark/TreatyOrStatuteMark.java +++ b/core/src/main/java/google/registry/model/mark/TreatyOrStatuteMark.java @@ -17,9 +17,9 @@ package google.registry.model.mark; import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy; import com.google.common.collect.ImmutableList; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** Information about a mark derived from a treaty or statute. */ diff --git a/core/src/main/java/google/registry/model/mark/package-info.java b/core/src/main/java/google/registry/model/mark/package-info.java index 17ae19ae1..bd382c345 100644 --- a/core/src/main/java/google/registry/model/mark/package-info.java +++ b/core/src/main/java/google/registry/model/mark/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.mark; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/package-info.java b/core/src/main/java/google/registry/model/package-info.java index 13f82bb93..dae97c46a 100644 --- a/core/src/main/java/google/registry/model/package-info.java +++ b/core/src/main/java/google/registry/model/package-info.java @@ -21,12 +21,12 @@ package google.registry.model; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /* * This package defines all entities which are managed via EPP XML and persisted to SQL via diff --git a/core/src/main/java/google/registry/model/poll/MessageQueueInfo.java b/core/src/main/java/google/registry/model/poll/MessageQueueInfo.java index 04753d844..bf40c36a0 100644 --- a/core/src/main/java/google/registry/model/poll/MessageQueueInfo.java +++ b/core/src/main/java/google/registry/model/poll/MessageQueueInfo.java @@ -19,8 +19,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; import org.joda.time.DateTime; /** Information about the message queue for the currently logged in registrar. */ diff --git a/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java b/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java index 97078c7ca..a8b2028d9 100644 --- a/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java +++ b/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java @@ -19,13 +19,13 @@ import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; import google.registry.model.eppcommon.Trid; import google.registry.model.eppoutput.EppResponse.ResponseData; -import javax.persistence.Embeddable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.persistence.Embeddable; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.joda.time.DateTime; /** The {@link ResponseData} returned when completing a pending action on a domain. */ diff --git a/core/src/main/java/google/registry/model/poll/PollMessage.java b/core/src/main/java/google/registry/model/poll/PollMessage.java index 15b9d0893..ed9f82e00 100644 --- a/core/src/main/java/google/registry/model/poll/PollMessage.java +++ b/core/src/main/java/google/registry/model/poll/PollMessage.java @@ -46,20 +46,20 @@ import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; import google.registry.util.NullIgnoringCollectionBuilder; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Table; import java.util.Optional; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PostLoad; -import javax.persistence.Table; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/poll/package-info.java b/core/src/main/java/google/registry/model/poll/package-info.java index 936608e34..305c63435 100644 --- a/core/src/main/java/google/registry/model/poll/package-info.java +++ b/core/src/main/java/google/registry/model/poll/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.poll; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/rde/RdeRevision.java b/core/src/main/java/google/registry/model/rde/RdeRevision.java index 256ae56c9..2250c83e1 100644 --- a/core/src/main/java/google/registry/model/rde/RdeRevision.java +++ b/core/src/main/java/google/registry/model/rde/RdeRevision.java @@ -24,15 +24,15 @@ import google.registry.model.UpdateAutoTimestampEntity; import google.registry.model.rde.RdeRevision.RdeRevisionId; import google.registry.persistence.VKey; import google.registry.persistence.converter.LocalDateConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.io.Serializable; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index 7d7efa872..b2a5fefa3 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -14,14 +14,14 @@ package google.registry.model.registrar; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; /** Information about a registrar. */ @Access(AccessType.FIELD) diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarAddress.java b/core/src/main/java/google/registry/model/registrar/RegistrarAddress.java index 7bc94878d..521a38264 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarAddress.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarAddress.java @@ -19,7 +19,7 @@ import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.google.common.annotations.VisibleForTesting; import google.registry.model.eppcommon.Address; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * Registrar Address diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarBase.java b/core/src/main/java/google/registry/model/registrar/RegistrarBase.java index be5b41f4c..d3f79233d 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarBase.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarBase.java @@ -60,10 +60,24 @@ import google.registry.model.UpdateAutoTimestampEntity; import google.registry.model.tld.Tld; import google.registry.model.tld.Tld.TldType; import google.registry.persistence.VKey; +import google.registry.persistence.converter.CidrBlockListUserType; +import google.registry.persistence.converter.CurrencyToStringMapUserType; import google.registry.util.CidrAddressBlock; import google.registry.util.PasswordUtils; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; import java.security.cert.CertificateParsingException; import java.util.Comparator; import java.util.List; @@ -74,18 +88,6 @@ import java.util.Set; import java.util.function.Predicate; import java.util.function.Supplier; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; @@ -255,6 +257,7 @@ public class RegistrarBase extends UpdateAutoTimestampEntity implements Buildabl * Whether registration of premium names should be blocked over EPP. If this is set to true, then * the only way to register premium names is with the superuser flag. */ + @Column(nullable = false) boolean blockPremiumNames; // Authentication. @@ -276,7 +279,9 @@ public class RegistrarBase extends UpdateAutoTimestampEntity implements Buildabl String failoverClientCertificateHash; /** An allow list of netmasks (in CIDR notation) which the client is allowed to connect from. */ - @Expose List ipAddressAllowList; + @org.hibernate.annotations.Type(CidrBlockListUserType.class) + @Expose + List ipAddressAllowList; /** A hashed password for EPP access. The hash is a base64 encoded SHA256 string. */ String passwordHash; @@ -365,7 +370,10 @@ public class RegistrarBase extends UpdateAutoTimestampEntity implements Buildabl * accessed by {@link #getBillingAccountMap}, a sorted map is returned to guarantee deterministic * behavior when serializing the map, for display purpose for instance. */ - @Expose @Nullable Map billingAccountMap; + @Expose + @Nullable + @org.hibernate.annotations.Type(CurrencyToStringMapUserType.class) + Map billingAccountMap; /** URL of registrar's website. */ @Expose String url; @@ -404,10 +412,13 @@ public class RegistrarBase extends UpdateAutoTimestampEntity implements Buildabl * A dirty bit for whether RegistrarContact changes have been made that haven't been synced to * Google Groups yet. When creating a new instance, contacts require syncing by default. */ + @Column(nullable = false) boolean contactsRequireSyncing = true; /** Whether or not registry lock is allowed for this registrar. */ - @Expose boolean registryLockAllowed = false; + @Column(nullable = false) + @Expose + boolean registryLockAllowed = false; public String getRegistrarId() { return registrarId; diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java b/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java index bc011d2c5..4912c271c 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java @@ -19,12 +19,12 @@ import com.google.common.annotations.VisibleForTesting; import google.registry.model.ImmutableObject; import google.registry.model.registrar.RegistrarPoc.RegistrarPocId; import google.registry.persistence.VKey; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.io.Serializable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; /** * A contact for a Registrar. Note, equality, hashCode and comparable have been overridden to only diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java b/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java index 085475d33..eece3884d 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java @@ -35,16 +35,19 @@ import google.registry.model.JsonMapBuilder; import google.registry.model.Jsonifiable; import google.registry.model.UnsafeSerializable; import google.registry.util.PasswordUtils; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; import java.util.Map; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; /** * A contact for a Registrar. Note, equality, hashCode and comparable have been overridden to only @@ -116,29 +119,38 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un * Multiple types are used to associate the registrar contact with various mailing groups. This * data is internal to the registry. */ - @Expose Set types; + @Enumerated(EnumType.STRING) + @Expose + Set types; /** * Whether this contact is publicly visible in WHOIS registrar query results as an Admin contact. */ - @Expose boolean visibleInWhoisAsAdmin = false; + @Column(nullable = false) + @Expose + boolean visibleInWhoisAsAdmin = false; /** * Whether this contact is publicly visible in WHOIS registrar query results as a Technical * contact. */ - @Expose boolean visibleInWhoisAsTech = false; + @Column(nullable = false) + @Expose + boolean visibleInWhoisAsTech = false; /** * Whether this contact's phone number and email address is publicly visible in WHOIS domain query * results as registrar abuse contact info. */ - @Expose boolean visibleInDomainWhoisAsAbuse = false; + @Column(nullable = false) + @Expose + boolean visibleInDomainWhoisAsAbuse = false; /** * Whether the contact is allowed to set their registry lock password through the registrar * console. This will be set to false on contact creation and when the user sets a password. */ + @Column(nullable = false) boolean allowedToSetRegistryLockPassword = false; /** diff --git a/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java index fef8a558b..89da52277 100644 --- a/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java +++ b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java @@ -22,13 +22,13 @@ import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java index 76e6dc993..616c1e646 100644 --- a/core/src/main/java/google/registry/model/reporting/HistoryEntry.java +++ b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java @@ -31,20 +31,20 @@ import google.registry.model.eppcommon.Trid; import google.registry.model.host.HostBase; import google.registry.model.host.HostHistory; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PostLoad; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; -import javax.persistence.PostLoad; import org.apache.commons.lang3.BooleanUtils; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java b/core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java index 0f0868662..65bb01dd1 100644 --- a/core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java +++ b/core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java @@ -33,11 +33,11 @@ import google.registry.model.host.Host; import google.registry.model.host.HostHistory; import google.registry.persistence.VKey; import google.registry.persistence.transaction.CriteriaQueryBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import java.util.Comparator; import java.util.List; import java.util.stream.Stream; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; import org.joda.time.DateTime; /** Retrieves {@link HistoryEntry} descendants (e.g. {@link DomainHistory}). */ diff --git a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java index ec92b1e99..42b84d149 100644 --- a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java +++ b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java @@ -22,15 +22,17 @@ import com.google.common.collect.ImmutableSet; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.util.DomainNameUtils; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; import org.joda.time.LocalDate; @Entity @@ -62,6 +64,7 @@ public class Spec11ThreatMatch extends ImmutableObject implements Buildable, Ser /** The types of threat detected. */ @Column(nullable = false) + @Enumerated(EnumType.STRING) Set threatTypes; /** Primary key of the domain table and unique identifier for all EPP resources. */ diff --git a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatchDao.java b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatchDao.java index 950d7f737..35217e7ae 100644 --- a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatchDao.java +++ b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatchDao.java @@ -16,8 +16,6 @@ package google.registry.model.reporting; import com.google.common.collect.ImmutableList; import google.registry.persistence.transaction.JpaTransactionManager; -import google.registry.util.DateTimeUtils; -import javax.persistence.TemporalType; import org.joda.time.LocalDate; /** @@ -32,8 +30,8 @@ public class Spec11ThreatMatchDao { public static void deleteEntriesByDate(JpaTransactionManager jpaTm, LocalDate date) { jpaTm.assertInTransaction(); jpaTm - .query("DELETE FROM Spec11ThreatMatch WHERE check_date = :date") - .setParameter("date", DateTimeUtils.toSqlDate(date), TemporalType.DATE) + .query("DELETE FROM Spec11ThreatMatch WHERE checkDate = :date") + .setParameter("date", date) .executeUpdate(); } diff --git a/core/src/main/java/google/registry/model/server/Lock.java b/core/src/main/java/google/registry/model/server/Lock.java index 78d60a910..4c856d2ed 100644 --- a/core/src/main/java/google/registry/model/server/Lock.java +++ b/core/src/main/java/google/registry/model/server/Lock.java @@ -26,17 +26,17 @@ import com.google.common.flogger.FluentLogger; import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; import google.registry.persistence.transaction.TransactionManager.ThrowingRunnable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.PostLoad; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; import java.util.Optional; import java.util.concurrent.Callable; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.PostLoad; -import javax.persistence.Table; -import javax.persistence.Transient; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/model/server/ServerSecret.java b/core/src/main/java/google/registry/model/server/ServerSecret.java index a25176f91..a68915898 100644 --- a/core/src/main/java/google/registry/model/server/ServerSecret.java +++ b/core/src/main/java/google/registry/model/server/ServerSecret.java @@ -21,11 +21,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Longs; import google.registry.model.CacheUtils; import google.registry.model.common.CrossTldSingleton; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import java.nio.ByteBuffer; import java.util.Optional; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; /** A secret number used for generating tokens (such as XSRF tokens). */ @Entity diff --git a/core/src/main/java/google/registry/model/smd/EncodedSignedMark.java b/core/src/main/java/google/registry/model/smd/EncodedSignedMark.java index c2da520ab..8079481af 100644 --- a/core/src/main/java/google/registry/model/smd/EncodedSignedMark.java +++ b/core/src/main/java/google/registry/model/smd/EncodedSignedMark.java @@ -19,9 +19,9 @@ import static com.google.common.io.BaseEncoding.base64; import com.google.common.base.CharMatcher; import google.registry.model.ImmutableObject; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; /** * Encoded data representation of a {@link SignedMark} object. diff --git a/core/src/main/java/google/registry/model/smd/IssuerInfo.java b/core/src/main/java/google/registry/model/smd/IssuerInfo.java index 8e7a1be99..d283bd3d9 100644 --- a/core/src/main/java/google/registry/model/smd/IssuerInfo.java +++ b/core/src/main/java/google/registry/model/smd/IssuerInfo.java @@ -16,8 +16,8 @@ package google.registry.model.smd; import google.registry.model.ImmutableObject; import google.registry.model.mark.MarkPhoneNumber; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; /** Holds information about the issuer of a mark registration. */ public class IssuerInfo extends ImmutableObject { diff --git a/core/src/main/java/google/registry/model/smd/SignedMark.java b/core/src/main/java/google/registry/model/smd/SignedMark.java index 5fc481561..ce80ccfcd 100644 --- a/core/src/main/java/google/registry/model/smd/SignedMark.java +++ b/core/src/main/java/google/registry/model/smd/SignedMark.java @@ -16,10 +16,10 @@ package google.registry.model.smd; import google.registry.model.ImmutableObject; import google.registry.model.mark.Mark; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlRootElement; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java b/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java index cf5867d65..72435884c 100644 --- a/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java +++ b/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java @@ -21,16 +21,16 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/smd/package-info.java b/core/src/main/java/google/registry/model/smd/package-info.java index d244a0333..219bd574a 100644 --- a/core/src/main/java/google/registry/model/smd/package-info.java +++ b/core/src/main/java/google/registry/model/smd/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.smd; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/model/tld/Tld.java b/core/src/main/java/google/registry/model/tld/Tld.java index cd2676d4e..2a621ddac 100644 --- a/core/src/main/java/google/registry/model/tld/Tld.java +++ b/core/src/main/java/google/registry/model/tld/Tld.java @@ -69,9 +69,18 @@ import google.registry.model.domain.token.AllocationToken.TokenType; import google.registry.model.tld.label.PremiumList; import google.registry.model.tld.label.ReservedList; import google.registry.persistence.VKey; -import google.registry.persistence.converter.JodaMoneyType; +import google.registry.persistence.converter.AllocationTokenVkeyListUserType; +import google.registry.persistence.converter.BillingCostTransitionUserType; +import google.registry.persistence.converter.TldStateTransitionUserType; import google.registry.tldconfig.idn.IdnTableEnum; import google.registry.util.Idn; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.PostPersist; import java.util.List; import java.util.Map; import java.util.Optional; @@ -80,13 +89,6 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.PostPersist; -import org.hibernate.annotations.Columns; import org.hibernate.annotations.Type; import org.joda.money.CurrencyUnit; import org.joda.money.Money; @@ -334,6 +336,7 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl */ @JsonSerialize(using = OptionalDurationSerializer.class) Duration dnsDsTtl; + /** * The unicode-aware representation of the TLD associated with this {@link Tld}. * @@ -366,6 +369,7 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl /** A property that transitions to different {@link TldState}s at different times. */ @Column(nullable = false) + @Type(TldStateTransitionUserType.class) @JsonDeserialize(using = TimedTransitionPropertyTldStateDeserializer.class) TimedTransitionProperty tldStateTransitions = TimedTransitionProperty.withInitialValue(DEFAULT_TLD_STATE); @@ -456,35 +460,38 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl /** A property that transitions to different create billing costs at different times. */ @Column(nullable = false) + @Type(BillingCostTransitionUserType.class) @JsonDeserialize(using = TimedTransitionPropertyMoneyDeserializer.class) TimedTransitionProperty createBillingCostTransitions = TimedTransitionProperty.withInitialValue(DEFAULT_CREATE_BILLING_COST); /** The one-time billing cost for restoring a domain name from the redemption grace period. */ - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns( - columns = { - @Column(name = "restore_billing_cost_amount"), - @Column(name = "restore_billing_cost_currency") - }) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = @Column(name = "restore_billing_cost_amount", precision = 19, scale = 2)) + @AttributeOverride(name = "currency", column = @Column(name = "restore_billing_cost_currency")) Money restoreBillingCost = DEFAULT_RESTORE_BILLING_COST; /** The one-time billing cost for changing the server status (i.e. lock). */ - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns( - columns = { - @Column(name = "server_status_change_billing_cost_amount"), - @Column(name = "server_status_change_billing_cost_currency") - }) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = + @Column(name = "server_status_change_billing_cost_amount", precision = 19, scale = 2)) + @AttributeOverride( + name = "currency", + column = @Column(name = "server_status_change_billing_cost_currency")) Money serverStatusChangeBillingCost = DEFAULT_SERVER_STATUS_CHANGE_BILLING_COST; /** The one-time billing cost for a registry lock/unlock action initiated by a registrar. */ - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns( - columns = { - @Column(name = "registry_lock_or_unlock_cost_amount"), - @Column(name = "registry_lock_or_unlock_cost_currency") - }) + @AttributeOverride( + name = "amount", + // Override Hibernate default (numeric(38,2)) to match real schema definition (numeric(19,2)). + column = @Column(name = "registry_lock_or_unlock_cost_amount", precision = 19, scale = 2)) + @AttributeOverride( + name = "currency", + column = @Column(name = "registry_lock_or_unlock_cost_currency")) Money registryLockOrUnlockBillingCost = DEFAULT_REGISTRY_LOCK_OR_UNLOCK_BILLING_COST; /** @@ -495,12 +502,14 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl * renewal to ensure transfers have a cost. */ @Column(nullable = false) + @Type(BillingCostTransitionUserType.class) @JsonDeserialize(using = TimedTransitionPropertyMoneyDeserializer.class) TimedTransitionProperty renewBillingCostTransitions = TimedTransitionProperty.withInitialValue(DEFAULT_RENEW_BILLING_COST); /** A property that tracks the EAP fee schedule (if any) for the TLD. */ @Column(nullable = false) + @Type(BillingCostTransitionUserType.class) @JsonDeserialize(using = TimedTransitionPropertyMoneyDeserializer.class) TimedTransitionProperty eapFeeSchedule = TimedTransitionProperty.withInitialValue(DEFAULT_EAP_BILLING_COST); @@ -540,11 +549,14 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl * (ex: add a token to the list or remove a token from the list) should not be allowed without * resetting the entire list contents. */ + @Type(AllocationTokenVkeyListUserType.class) @JsonSerialize(using = TokenVKeyListSerializer.class) @JsonDeserialize(using = TokenVKeyListDeserializer.class) List> defaultPromoTokens; /** A set of allowed {@link IdnTableEnum}s for this TLD, or empty if we should use the default. */ + // @Type(IdnTableEnumSetUserType.class) + @Enumerated(EnumType.STRING) @JsonSerialize(using = SortedEnumSetSerializer.class) Set idnTables; diff --git a/core/src/main/java/google/registry/model/tld/Tlds.java b/core/src/main/java/google/registry/model/tld/Tlds.java index fbba3c17e..e34e606fb 100644 --- a/core/src/main/java/google/registry/model/tld/Tlds.java +++ b/core/src/main/java/google/registry/model/tld/Tlds.java @@ -35,10 +35,10 @@ import com.google.common.collect.Streams; import com.google.common.net.InternetDomainName; import google.registry.model.tld.Tld.TldType; import google.registry.util.DomainNameUtils; +import jakarta.persistence.EntityManager; import java.util.Optional; import java.util.function.Supplier; import java.util.stream.Stream; -import javax.persistence.EntityManager; import org.joda.time.DateTime; /** Utilities for finding and listing {@link Tld} entities. */ diff --git a/core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java b/core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java index 97dcd1547..41e53ecf4 100644 --- a/core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java +++ b/core/src/main/java/google/registry/model/tld/label/BaseDomainLabelList.java @@ -28,15 +28,15 @@ import com.google.common.collect.Multiset; import google.registry.model.Buildable; import google.registry.model.ImmutableObject; import google.registry.model.tld.Tld; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java b/core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java index 2fef50d48..764fa0be1 100644 --- a/core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java +++ b/core/src/main/java/google/registry/model/tld/label/DomainLabelEntry.java @@ -22,9 +22,9 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.net.InternetDomainName; import google.registry.model.Buildable.GenericBuilder; import google.registry.model.ImmutableObject; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; /** * Represents a label entry parsed from a line in a reserved/premium list txt file. diff --git a/core/src/main/java/google/registry/model/tld/label/PremiumList.java b/core/src/main/java/google/registry/model/tld/label/PremiumList.java index 0bac8f3e4..ffe3930b1 100644 --- a/core/src/main/java/google/registry/model/tld/label/PremiumList.java +++ b/core/src/main/java/google/registry/model/tld/label/PremiumList.java @@ -25,6 +25,11 @@ import com.google.common.hash.BloomFilter; import google.registry.model.Buildable; import google.registry.model.tld.Tld; import google.registry.model.tld.label.PremiumList.PremiumEntry; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; import java.math.BigDecimal; import java.math.RoundingMode; @@ -32,11 +37,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; import org.joda.money.CurrencyUnit; import org.joda.money.Money; @@ -118,9 +118,10 @@ public final class PremiumList extends BaseDomainLabelList implements Buildable, Serializable { - @Insignificant @javax.persistence.Id Long revisionId; + @Insignificant @jakarta.persistence.Id Long revisionId; - @Column(nullable = false) + // Override defaulting Hibernate 6 mapping (numeric(38,2)) to match amount real schema. + @Column(nullable = false, precision = 19, scale = 2) BigDecimal price; @Override diff --git a/core/src/main/java/google/registry/model/tld/label/ReservedList.java b/core/src/main/java/google/registry/model/tld/label/ReservedList.java index 22568fe77..c9628fb97 100644 --- a/core/src/main/java/google/registry/model/tld/label/ReservedList.java +++ b/core/src/main/java/google/registry/model/tld/label/ReservedList.java @@ -35,18 +35,18 @@ import google.registry.model.Buildable; import google.registry.model.CacheUtils; import google.registry.model.tld.Tld; import google.registry.model.tld.label.DomainLabelMetrics.MetricsReservedListMatch; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.PostPersist; -import javax.persistence.PreRemove; -import javax.persistence.Table; -import javax.persistence.Transient; import org.joda.time.DateTime; /** @@ -57,7 +57,7 @@ import org.joda.time.DateTime; * succeeds, we will end up with having two exact same reserved lists that differ only by * revisionId. This is fine though, because we only use the list with the highest revisionId. */ -@javax.persistence.Entity +@jakarta.persistence.Entity @Table(indexes = {@Index(columnList = "name", name = "reservedlist_name_idx")}) public final class ReservedList extends BaseDomainLabelList { @@ -73,7 +73,7 @@ public final class ReservedList @PreRemove void preRemove() { - tm().query("DELETE FROM ReservedEntry WHERE revision_id = :revisionId") + tm().query("DELETE FROM ReservedEntry WHERE revisionId = :revisionId") .setParameter("revisionId", revisionId) .executeUpdate(); } @@ -104,13 +104,16 @@ public final class ReservedList * A reserved list entry entity, persisted to the database, that represents a single label and its * reservation type. */ - @javax.persistence.Entity(name = "ReservedEntry") + @jakarta.persistence.Entity(name = "ReservedEntry") public static class ReservedListEntry extends DomainLabelEntry implements Buildable, Serializable { @Insignificant @Id Long revisionId; - @Column(nullable = false) + // This Enum field was mapped (unintended) by ordinal and is an int column in the real schema. + // In Hibernate 6, ordinal enum field is mapped to smallint instead of int. We override the def + // so that the generated schema is consistent with the real schema. + @Column(nullable = false, columnDefinition = "integer") ReservationType reservationType; String comment; diff --git a/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java b/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java index fa407fb16..b15f5eee5 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java +++ b/core/src/main/java/google/registry/model/tmch/ClaimsEntry.java @@ -15,10 +15,10 @@ package google.registry.model.tmch; import google.registry.model.ImmutableObject; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; /** * Claims entry record, used by ClaimsList for persistence. @@ -30,7 +30,10 @@ import javax.persistence.Id; */ @Entity(name = "ClaimsEntry") class ClaimsEntry extends ImmutableObject implements Serializable { - @Id private Long revisionId; + @SuppressWarnings("unused") + @Id + private Long revisionId; + @Id private String domainLabel; @Column(nullable = false) diff --git a/core/src/main/java/google/registry/model/tmch/ClaimsList.java b/core/src/main/java/google/registry/model/tmch/ClaimsList.java index 8098c7e1e..665963f5d 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsList.java +++ b/core/src/main/java/google/registry/model/tmch/ClaimsList.java @@ -26,20 +26,20 @@ import com.google.common.collect.ImmutableMap; import google.registry.model.CacheUtils; import google.registry.model.CreateAutoTimestamp; import google.registry.model.ImmutableObject; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PreRemove; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.util.Map; import java.util.Optional; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PostPersist; -import javax.persistence.PostUpdate; -import javax.persistence.PreRemove; -import javax.persistence.Table; -import javax.persistence.Transient; import org.joda.time.DateTime; /** @@ -104,7 +104,7 @@ public class ClaimsList extends ImmutableObject { @PreRemove void preRemove() { - tm().query("DELETE FROM ClaimsEntry WHERE revision_id = :revisionId") + tm().query("DELETE FROM ClaimsEntry WHERE revisionId = :revisionId") .setParameter("revisionId", revisionId) .executeUpdate(); } diff --git a/core/src/main/java/google/registry/model/tmch/TmchCrl.java b/core/src/main/java/google/registry/model/tmch/TmchCrl.java index 445156d7b..a5420b010 100644 --- a/core/src/main/java/google/registry/model/tmch/TmchCrl.java +++ b/core/src/main/java/google/registry/model/tmch/TmchCrl.java @@ -18,13 +18,13 @@ import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import google.registry.model.common.CrossTldSingleton; +import jakarta.persistence.Column; import java.util.Optional; import javax.annotation.concurrent.Immutable; -import javax.persistence.Column; import org.joda.time.DateTime; /** Singleton for ICANN's TMCH CA certificate revocation list (CRL). */ -@javax.persistence.Entity +@jakarta.persistence.Entity @Immutable public final class TmchCrl extends CrossTldSingleton { diff --git a/core/src/main/java/google/registry/model/transfer/BaseTransferObject.java b/core/src/main/java/google/registry/model/transfer/BaseTransferObject.java index b7e3bc5bb..1c68e7be3 100644 --- a/core/src/main/java/google/registry/model/transfer/BaseTransferObject.java +++ b/core/src/main/java/google/registry/model/transfer/BaseTransferObject.java @@ -17,12 +17,12 @@ package google.registry.model.transfer; import google.registry.model.Buildable.GenericBuilder; import google.registry.model.ImmutableObject; import google.registry.model.UnsafeSerializable; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.MappedSuperclass; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MappedSuperclass; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.joda.time.DateTime; /** Fields common to {@link TransferData} and {@link TransferResponse}. */ diff --git a/core/src/main/java/google/registry/model/transfer/ContactTransferData.java b/core/src/main/java/google/registry/model/transfer/ContactTransferData.java index a20627925..5a13695c9 100644 --- a/core/src/main/java/google/registry/model/transfer/ContactTransferData.java +++ b/core/src/main/java/google/registry/model/transfer/ContactTransferData.java @@ -14,7 +14,7 @@ package google.registry.model.transfer; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** Transfer data for contact. */ @Embeddable diff --git a/core/src/main/java/google/registry/model/transfer/DomainTransferData.java b/core/src/main/java/google/registry/model/transfer/DomainTransferData.java index d7ede3c8d..13d9e7736 100644 --- a/core/src/main/java/google/registry/model/transfer/DomainTransferData.java +++ b/core/src/main/java/google/registry/model/transfer/DomainTransferData.java @@ -25,13 +25,13 @@ import google.registry.model.domain.Period.Unit; import google.registry.model.poll.PollMessage; import google.registry.persistence.VKey; import google.registry.util.NullIgnoringCollectionBuilder; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; import org.joda.time.DateTime; /** Transfer data for domain. */ diff --git a/core/src/main/java/google/registry/model/transfer/TransferData.java b/core/src/main/java/google/registry/model/transfer/TransferData.java index 84dfa1585..e3e374fc9 100644 --- a/core/src/main/java/google/registry/model/transfer/TransferData.java +++ b/core/src/main/java/google/registry/model/transfer/TransferData.java @@ -27,13 +27,13 @@ import google.registry.model.eppcommon.Trid; import google.registry.model.poll.PollMessage; import google.registry.persistence.VKey; import google.registry.util.NullIgnoringCollectionBuilder; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; /** * Common transfer data for {@link EppResource} types. Only applies to domains and contacts; hosts diff --git a/core/src/main/java/google/registry/model/transfer/TransferResponse.java b/core/src/main/java/google/registry/model/transfer/TransferResponse.java index 58129998f..c7ee86753 100644 --- a/core/src/main/java/google/registry/model/transfer/TransferResponse.java +++ b/core/src/main/java/google/registry/model/transfer/TransferResponse.java @@ -16,11 +16,11 @@ package google.registry.model.transfer; import google.registry.model.EppResource; import google.registry.model.eppoutput.EppResponse.ResponseData; -import javax.persistence.Embeddable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.persistence.Embeddable; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/transfer/TransferStatus.java b/core/src/main/java/google/registry/model/transfer/TransferStatus.java index 634bbad52..f4746f271 100644 --- a/core/src/main/java/google/registry/model/transfer/TransferStatus.java +++ b/core/src/main/java/google/registry/model/transfer/TransferStatus.java @@ -15,7 +15,7 @@ package google.registry.model.transfer; import com.google.common.base.CaseFormat; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; /** Represents the EPP transfer status as defined in RFC 5730. */ public enum TransferStatus { diff --git a/core/src/main/java/google/registry/model/transfer/package-info.java b/core/src/main/java/google/registry/model/transfer/package-info.java index 328f9944a..55313b7a8 100644 --- a/core/src/main/java/google/registry/model/transfer/package-info.java +++ b/core/src/main/java/google/registry/model/transfer/package-info.java @@ -21,10 +21,9 @@ package google.registry.model.transfer; import google.registry.xml.UtcDateTimeAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; diff --git a/core/src/main/java/google/registry/persistence/EntityCallbacksListener.java b/core/src/main/java/google/registry/persistence/EntityCallbacksListener.java index 776b1e133..e88b4ba09 100644 --- a/core/src/main/java/google/registry/persistence/EntityCallbacksListener.java +++ b/core/src/main/java/google/registry/persistence/EntityCallbacksListener.java @@ -14,6 +14,17 @@ package google.registry.persistence; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -22,17 +33,6 @@ import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.Objects; import java.util.stream.Stream; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; /** * A listener class to invoke entity callbacks in cases where Hibernate doesn't invoke the callback @@ -41,7 +41,7 @@ import javax.persistence.Transient; *

JPA defines a few annotations, e.g. {@link PostLoad}, that we can use for the application to * react to certain events that occur inside the persistence mechanism. However, Hibernate only * supports a few basic use cases, e.g. defining a {@link PostLoad} method directly in an {@link - * javax.persistence.Entity} class or in an {@link Embeddable} class. If the annotated method is + * jakarta.persistence.Entity} class or in an {@link Embeddable} class. If the annotated method is * defined in an {@link Embeddable} class that is a property of another {@link Embeddable} class, or * it is defined in a parent class of the {@link Embeddable} class, Hibernate doesn't invoke it. * diff --git a/core/src/main/java/google/registry/persistence/HibernateSchemaExporter.java b/core/src/main/java/google/registry/persistence/HibernateSchemaExporter.java index 4ef3b1fa5..dab3355e2 100644 --- a/core/src/main/java/google/registry/persistence/HibernateSchemaExporter.java +++ b/core/src/main/java/google/registry/persistence/HibernateSchemaExporter.java @@ -18,11 +18,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; +import jakarta.persistence.AttributeConverter; import java.io.File; import java.util.EnumSet; import java.util.Map; import java.util.stream.Stream; -import javax.persistence.AttributeConverter; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @@ -30,7 +30,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; -/** Utility class to export DDL script for given {@link javax.persistence.Entity} classes. */ +/** Utility class to export DDL script for given {@link jakarta.persistence.Entity} classes. */ public class HibernateSchemaExporter { // Hibernate proprietary mappings. private static final String HIBERNATE_MAPPING_RESOURCES = "META-INF/orm.xml"; @@ -53,7 +53,7 @@ public class HibernateSchemaExporter { /** Exports DDL script to the {@code outputFile} for the given {@code entityClasses}. */ public void export(ImmutableList> entityClasses, File outputFile) { // Configure Hibernate settings. - Map settings = Maps.newHashMap(); + Map settings = Maps.newHashMap(); settings.put(Environment.DIALECT, NomulusPostgreSQLDialect.class.getName()); settings.put(Environment.URL, jdbcUrl); settings.put(Environment.USER, username); diff --git a/core/src/main/java/google/registry/persistence/JpaRetries.java b/core/src/main/java/google/registry/persistence/JpaRetries.java index 077beb386..58467cb5c 100644 --- a/core/src/main/java/google/registry/persistence/JpaRetries.java +++ b/core/src/main/java/google/registry/persistence/JpaRetries.java @@ -15,9 +15,9 @@ package google.registry.persistence; import com.google.common.collect.ImmutableSet; +import jakarta.persistence.OptimisticLockException; import java.sql.SQLException; import java.util.function.Predicate; -import javax.persistence.OptimisticLockException; /** Helpers for identifying retriable database operations. */ public final class JpaRetries { diff --git a/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java b/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java index 2f7b0af1b..ce3f95d8e 100644 --- a/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java +++ b/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java @@ -13,41 +13,67 @@ // limitations under the License. package google.registry.persistence; -import google.registry.persistence.converter.IntervalDescriptor; +import google.registry.persistence.converter.DurationUserType; import google.registry.persistence.converter.JodaMoneyType; -import google.registry.persistence.converter.StringCollectionDescriptor; -import google.registry.persistence.converter.StringMapDescriptor; -import java.sql.Types; import org.hibernate.boot.model.TypeContributions; -import org.hibernate.dialect.PostgreSQL95Dialect; +import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.service.ServiceRegistry; +import org.hibernate.type.SqlTypes; +import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl; +import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; /** Nomulus mapping rules for column types in Postgresql. */ -public class NomulusPostgreSQLDialect extends PostgreSQL95Dialect { +public class NomulusPostgreSQLDialect extends PostgreSQLDialect { + + // Custom Sql type codes that tie custom `UserType` subclasses to their desired database column + // definitions. See `contributeTypes` below. + // These codes may take arbitrary values as long as they do not conflict with existing codes. + + /** Represents a type backed by an `hstore` column in the database. */ + public static final int NATIVE_MAP_TYPE = Integer.MAX_VALUE - 1; + + /** Represents a type backed by an `text[]` column in the database. */ + public static final int NATIVE_ARRAY_OF_POJO_TYPE = Integer.MAX_VALUE - 2; + + /** Represents a type backed by an `interval` column in the database. */ + public static final int NATIVE_INTERVAL_TYPE = Integer.MAX_VALUE - 3; + public NomulusPostgreSQLDialect() { super(); - registerColumnType(Types.VARCHAR, "text"); - registerColumnType(Types.TIMESTAMP_WITH_TIMEZONE, "timestamptz"); - registerColumnType(Types.TIMESTAMP, "timestamptz"); - registerColumnType(StringMapDescriptor.COLUMN_TYPE, StringMapDescriptor.COLUMN_NAME); - registerColumnType( - StringCollectionDescriptor.COLUMN_TYPE, StringCollectionDescriptor.COLUMN_DDL_NAME); - registerColumnType(IntervalDescriptor.COLUMN_TYPE, IntervalDescriptor.COLUMN_NAME); } - @SuppressWarnings("deprecation") // See comments below on JodaMoneyType. + @Override + public String getArrayTypeName( + String javaElementTypeName, String elementTypeName, Integer maxLength) { + return elementTypeName + "[]"; + } + @Override public void contributeTypes( TypeContributions typeContributions, ServiceRegistry serviceRegistry) { super.contributeTypes(typeContributions, serviceRegistry); - typeContributions.contributeJavaTypeDescriptor(StringCollectionDescriptor.getInstance()); - typeContributions.contributeSqlTypeDescriptor(StringCollectionDescriptor.getInstance()); - typeContributions.contributeJavaTypeDescriptor(StringMapDescriptor.getInstance()); - typeContributions.contributeSqlTypeDescriptor(StringMapDescriptor.getInstance()); - typeContributions.contributeJavaTypeDescriptor(IntervalDescriptor.getInstance()); - typeContributions.contributeSqlTypeDescriptor(IntervalDescriptor.getInstance()); - // Below method (contributing CompositeUserType) is deprecated. Please see javadoc of - // JodaMoneyType for reasons. - typeContributions.contributeType(JodaMoneyType.INSTANCE, JodaMoneyType.TYPE_NAME); + // Register custom user types for auto conversion. For now, this only works if the Java type to + // convert does not have generic type parameters. + typeContributions.contributeType(new DurationUserType()); + typeContributions.contributeType(new JodaMoneyType()); + + // Verify that custom codes do not conflict with built-in types. + for (int customType : + new int[] {NATIVE_MAP_TYPE, NATIVE_ARRAY_OF_POJO_TYPE, NATIVE_INTERVAL_TYPE}) { + try { + super.columnType(customType); + throw new IllegalStateException( + "Custom code " + customType + " conflicts with built-in type"); + } catch (IllegalArgumentException expected) { + // OK + } + } + + DdlTypeRegistry ddlTypes = typeContributions.getTypeConfiguration().getDdlTypeRegistry(); + ddlTypes.addDescriptor(new DdlTypeImpl(NATIVE_MAP_TYPE, "hstore", this)); + ddlTypes.addDescriptor(new DdlTypeImpl(NATIVE_ARRAY_OF_POJO_TYPE, "text[]", this)); + ddlTypes.addDescriptor(new DdlTypeImpl(NATIVE_INTERVAL_TYPE, "interval", this)); + // Use text instead of varchar to match real schema from psql dump. + ddlTypes.addDescriptor(new DdlTypeImpl(SqlTypes.VARCHAR, "text", this)); } } diff --git a/core/src/main/java/google/registry/persistence/PersistenceComponent.java b/core/src/main/java/google/registry/persistence/PersistenceComponent.java index 00e51faa6..7fcd08659 100644 --- a/core/src/main/java/google/registry/persistence/PersistenceComponent.java +++ b/core/src/main/java/google/registry/persistence/PersistenceComponent.java @@ -23,8 +23,8 @@ import google.registry.persistence.PersistenceModule.ReadOnlyReplicaJpaTm; import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.privileges.secretmanager.SecretManagerModule; import google.registry.util.UtilsModule; +import jakarta.persistence.EntityManagerFactory; import javax.inject.Singleton; -import javax.persistence.EntityManagerFactory; /** Dagger component to provide {@link EntityManagerFactory} instances. */ @Singleton diff --git a/core/src/main/java/google/registry/persistence/PersistenceModule.java b/core/src/main/java/google/registry/persistence/PersistenceModule.java index 3471954c5..f292eac55 100644 --- a/core/src/main/java/google/registry/persistence/PersistenceModule.java +++ b/core/src/main/java/google/registry/persistence/PersistenceModule.java @@ -45,6 +45,8 @@ import google.registry.privileges.secretmanager.SqlUser.RobotId; import google.registry.privileges.secretmanager.SqlUser.RobotUser; import google.registry.tools.AuthModule.CloudSqlClientCredential; import google.registry.util.Clock; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import java.lang.annotation.Documented; import java.sql.Connection; import java.sql.DriverManager; @@ -58,8 +60,6 @@ import javax.annotation.Nullable; import javax.inject.Provider; import javax.inject.Qualifier; import javax.inject.Singleton; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; import org.hibernate.cfg.Environment; /** Dagger module class for the persistence layer. */ diff --git a/core/src/main/java/google/registry/persistence/WithVKey.java b/core/src/main/java/google/registry/persistence/WithVKey.java index 283667c57..a5732793d 100644 --- a/core/src/main/java/google/registry/persistence/WithVKey.java +++ b/core/src/main/java/google/registry/persistence/WithVKey.java @@ -14,11 +14,11 @@ package google.registry.persistence; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Entity; import java.io.Serializable; import java.lang.annotation.ElementType; import java.lang.annotation.Target; -import javax.persistence.AttributeConverter; -import javax.persistence.Entity; /** * Annotation for {@link Entity} that can be saved as a foreign key in the form of a {@link VKey} in diff --git a/core/src/main/java/google/registry/persistence/converter/AllocationTokenListConverter.java b/core/src/main/java/google/registry/persistence/converter/AllocationTokenListConverter.java deleted file mode 100644 index 0ad13bca9..000000000 --- a/core/src/main/java/google/registry/persistence/converter/AllocationTokenListConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2022 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.persistence.converter; - -import google.registry.model.domain.token.AllocationToken; -import google.registry.persistence.VKey; -import javax.persistence.Converter; - -@Converter(autoApply = true) -public class AllocationTokenListConverter extends StringListConverterBase> { - - @Override - String toString(VKey element) { - return element.getKey().toString(); - } - - @Override - VKey fromString(String value) { - return VKey.create(AllocationToken.class, value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverter.java b/core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserType.java similarity index 62% rename from core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverter.java rename to core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserType.java index 72739f612..843a5385b 100644 --- a/core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserType.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Nomulus Authors. All Rights Reserved. +// Copyright 2024 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. @@ -14,21 +14,20 @@ package google.registry.persistence.converter; +import google.registry.model.common.TimedTransitionProperty; import google.registry.model.domain.token.AllocationToken.TokenStatus; -import javax.persistence.Converter; -/** JPA converter for storing/retrieving {@code TimedTransitionProperty} objects. */ -@Converter(autoApply = true) -public class AllocationTokenStatusTransitionConverter - extends TimedTransitionPropertyConverterBase { +/** Hibernate custom type for {@link TimedTransitionProperty} of {@link TokenStatus}. */ +public class AllocationTokenStatusTransitionUserType + extends TimedTransitionBaseUserType { @Override - protected String convertValueToString(TokenStatus value) { + String valueToString(TokenStatus value) { return value.name(); } @Override - protected TokenStatus convertStringToValue(String string) { + TokenStatus stringToValue(String string) { return TokenStatus.valueOf(string); } } diff --git a/core/src/main/java/google/registry/persistence/converter/AllocationTokenVkeyListUserType.java b/core/src/main/java/google/registry/persistence/converter/AllocationTokenVkeyListUserType.java new file mode 100644 index 000000000..bb38ef4fd --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/AllocationTokenVkeyListUserType.java @@ -0,0 +1,53 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.ImmutableList.toImmutableList; + +import google.registry.model.domain.token.AllocationToken; +import google.registry.persistence.VKey; +import java.util.List; +import java.util.stream.Stream; +import javax.annotation.Nullable; + +/** Hibernate custom type for {@link List} of {@link VKey} of {@link AllocationToken}. */ +public class AllocationTokenVkeyListUserType + extends StringCollectionUserType, List>> { + + @Override + String[] toJdbcObject(List> collection) { + return collection.stream() + .map(VKey::getKey) + .map(Object::toString) + .toList() + .toArray(new String[0]); + } + + @Nullable + @Override + List> toEntity(@Nullable String[] data) { + return data == null + ? null + : Stream.of(data) + .map(value -> VKey.create(AllocationToken.class, value)) + .collect(toImmutableList()); + } + + @SuppressWarnings("unchecked") + @Override + public Class>> returnedClass() { + return (Class>>) ((Object) List.class); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java b/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionUserType.java similarity index 63% rename from core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java rename to core/src/main/java/google/registry/persistence/converter/BillingCostTransitionUserType.java index 8e3d28bcc..b4394bbb9 100644 --- a/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/BillingCostTransitionUserType.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Nomulus Authors. All Rights Reserved. +// Copyright 2024 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. @@ -14,19 +14,19 @@ package google.registry.persistence.converter; -import javax.persistence.Converter; +import google.registry.model.common.TimedTransitionProperty; import org.joda.money.Money; -/** JPA converter for storing/retrieving {@code TimedTransitionProperty} objects. */ -@Converter(autoApply = true) -public class BillingCostTransitionConverter extends TimedTransitionPropertyConverterBase { +/** Hibernate custom type for {@link TimedTransitionProperty} of {@link Money}. */ +public class BillingCostTransitionUserType extends TimedTransitionBaseUserType { + @Override - protected String convertValueToString(Money value) { + String valueToString(Money value) { return value.toString(); } @Override - protected Money convertStringToValue(String string) { + Money stringToValue(String string) { return Money.parse(string); } } diff --git a/core/src/main/java/google/registry/persistence/converter/BillingEventFlagSetConverter.java b/core/src/main/java/google/registry/persistence/converter/BillingEventFlagSetConverter.java deleted file mode 100644 index dea0583ef..000000000 --- a/core/src/main/java/google/registry/persistence/converter/BillingEventFlagSetConverter.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import google.registry.model.billing.BillingBase.Flag; -import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@link Set}. */ -@Converter(autoApply = true) -public class BillingEventFlagSetConverter extends StringSetConverterBase { - - @Override - String toString(Flag element) { - return element.name(); - } - - @Override - Flag fromString(String value) { - return Flag.valueOf(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java b/core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java index 6588bd217..9f180f0a3 100644 --- a/core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java @@ -17,13 +17,13 @@ import static com.google.common.base.Charsets.US_ASCII; import static com.google.common.hash.Funnels.stringFunnel; import com.google.common.hash.BloomFilter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UncheckedIOException; import javax.annotation.Nullable; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; /** JPA converter for ASCII String {@link BloomFilter}s. */ @Converter(autoApply = true) diff --git a/core/src/main/java/google/registry/persistence/converter/CidrBlockListUserType.java b/core/src/main/java/google/registry/persistence/converter/CidrBlockListUserType.java new file mode 100644 index 000000000..3c4e24203 --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/CidrBlockListUserType.java @@ -0,0 +1,42 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.ImmutableList.toImmutableList; + +import google.registry.util.CidrAddressBlock; +import java.util.List; +import java.util.stream.Stream; + +/** Hibernate custom type for {@link List} of {@link CidrAddressBlock}. */ +public class CidrBlockListUserType + extends StringCollectionUserType> { + + @Override + String[] toJdbcObject(List collection) { + return collection.stream().map(Object::toString).toArray(String[]::new); + } + + @Override + List toEntity(String[] data) { + return Stream.of(data).map(CidrAddressBlock::create).collect(toImmutableList()); + } + + @SuppressWarnings("unchecked") + @Override + public Class> returnedClass() { + return (Class>) ((Object) List.class); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/CommandNameSetConverter.java b/core/src/main/java/google/registry/persistence/converter/CommandNameSetConverter.java deleted file mode 100644 index babed838f..000000000 --- a/core/src/main/java/google/registry/persistence/converter/CommandNameSetConverter.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2023 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.persistence.converter; - -import google.registry.model.domain.fee.FeeQueryCommandExtensionItem; -import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; -import javax.persistence.Converter; - -@Converter(autoApply = true) -public class CommandNameSetConverter - extends StringSetConverterBase { - - @Override - String toString(CommandName element) { - return element.name(); - } - - @Override - CommandName fromString(String value) { - return FeeQueryCommandExtensionItem.CommandName.valueOf(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/CurrencyToBillingConverter.java b/core/src/main/java/google/registry/persistence/converter/CurrencyToBillingConverter.java deleted file mode 100644 index 620439b35..000000000 --- a/core/src/main/java/google/registry/persistence/converter/CurrencyToBillingConverter.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import java.util.Map; -import javax.persistence.Converter; -import org.joda.money.CurrencyUnit; - -/** JPA converter for storing/retrieving {@code Map} objects. */ -@Converter(autoApply = true) -public class CurrencyToBillingConverter - extends StringMapConverterBase> { - - @Override - protected String convertKeyToString(CurrencyUnit key) { - return key.getCode(); - } - - @Override - protected String convertValueToString(String value) { - return value; - } - - @Override - protected CurrencyUnit convertStringToKey(String string) { - return CurrencyUnit.of(string); - } - - @Override - protected String convertStringToValue(String string) { - return string; - } - - @Override - protected Map convertMapToDerivedType(Map map) { - return map; - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/CurrencyToStringMapUserType.java b/core/src/main/java/google/registry/persistence/converter/CurrencyToStringMapUserType.java new file mode 100644 index 000000000..17048727f --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/CurrencyToStringMapUserType.java @@ -0,0 +1,42 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.ImmutableMap.toImmutableMap; + +import java.util.Map; +import org.joda.money.CurrencyUnit; + +/** Hibernate custom type for {@link Map} of {@link CurrencyUnit} to {@link String}. */ +public class CurrencyToStringMapUserType extends MapUserType> { + + @SuppressWarnings("unchecked") + @Override + public Class> returnedClass() { + return (Class>) ((Object) Map.class); + } + + @Override + Map toStringMap(Map map) { + return map.entrySet().stream() + .collect(toImmutableMap(e -> e.getKey().getCode(), e -> e.getValue())); + } + + @Override + Map toEntity(Map map) { + return map.entrySet().stream() + .collect(toImmutableMap(e -> CurrencyUnit.of(e.getKey()), e -> e.getValue())); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java b/core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java index ea9283887..543808538 100644 --- a/core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java @@ -13,8 +13,8 @@ // limitations under the License. package google.registry.persistence.converter; +import jakarta.persistence.Converter; import javax.annotation.Nullable; -import javax.persistence.Converter; import org.joda.money.CurrencyUnit; /** JPA converter for {@link CurrencyUnit}s. */ diff --git a/core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java b/core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java index a8095f20f..db16fb0a6 100644 --- a/core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java @@ -16,25 +16,29 @@ package google.registry.persistence.converter; import static org.joda.time.DateTimeZone.UTC; -import java.sql.Timestamp; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import java.time.Instant; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; import javax.annotation.Nullable; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; import org.joda.time.DateTime; /** JPA converter to for storing/retrieving {@link org.joda.time.DateTime} objects. */ @Converter(autoApply = true) -public class DateTimeConverter implements AttributeConverter { +public class DateTimeConverter implements AttributeConverter { @Override @Nullable - public Timestamp convertToDatabaseColumn(@Nullable DateTime attribute) { - return attribute == null ? null : new Timestamp(attribute.getMillis()); + public ZonedDateTime convertToDatabaseColumn(@Nullable DateTime attribute) { + return attribute == null + ? null + : ZonedDateTime.ofInstant(Instant.ofEpochMilli(attribute.getMillis()), ZoneOffset.UTC); } @Override @Nullable - public DateTime convertToEntityAttribute(@Nullable Timestamp dbData) { - return (dbData == null) ? null : new DateTime(dbData.getTime(), UTC); + public DateTime convertToEntityAttribute(@Nullable ZonedDateTime dbData) { + return (dbData == null) ? null : new DateTime(dbData.toInstant().toEpochMilli(), UTC); } } diff --git a/core/src/main/java/google/registry/persistence/converter/DurationConverter.java b/core/src/main/java/google/registry/persistence/converter/DurationUserType.java similarity index 53% rename from core/src/main/java/google/registry/persistence/converter/DurationConverter.java rename to core/src/main/java/google/registry/persistence/converter/DurationUserType.java index d45f25e7a..bd333e939 100644 --- a/core/src/main/java/google/registry/persistence/converter/DurationConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/DurationUserType.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Nomulus Authors. All Rights Reserved. +// Copyright 2024 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. @@ -14,32 +14,98 @@ package google.registry.persistence.converter; +import static google.registry.persistence.NomulusPostgreSQLDialect.NATIVE_INTERVAL_TYPE; + +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Types; +import java.util.Objects; import javax.annotation.Nullable; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.usertype.UserType; import org.joda.time.Duration; import org.joda.time.Period; import org.postgresql.util.PGInterval; /** - * JPA converter to for storing/retrieving {@link org.joda.time.Duration} objects. + * Hibernate custom type for {@link Duration}. * - *

The Joda Time Duration is simply a number of milliseconds representing a length of time. This - * can be converted into a PGInterval, but only for the fields that have a standard number of - * milliseconds. Therefore, there is no way to populate the months or years field of a PGInterval - * and be confident that it is representing the exact number of milliseconds it was intended to - * represent. + *

Conversion of {@code Duration} is automatic. See {@link + * google.registry.persistence.NomulusPostgreSQLDialect} for more information. */ -@Converter(autoApply = true) -public class DurationConverter implements AttributeConverter { +public class DurationUserType implements UserType { @Override - @Nullable - public PGInterval convertToDatabaseColumn(@Nullable Duration duration) { - if (duration == null) { - return new PGInterval(); + public int getSqlType() { + return NATIVE_INTERVAL_TYPE; + } + + @Override + public Class returnedClass() { + return Duration.class; + } + + @Override + public boolean equals(Duration duration, Duration other) { + return Objects.equals(duration, other); + } + + @Override + public int hashCode(Duration duration) { + return Objects.hashCode(duration); + } + + @Override + public Duration nullSafeGet( + ResultSet resultSet, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor, + Object o) + throws SQLException { + PGInterval interval = resultSet.getObject(i, PGInterval.class); + if (resultSet.wasNull()) { + return null; } + return convertToDuration(interval); + } + + @Override + public void nullSafeSet( + PreparedStatement preparedStatement, + Duration duration, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor) + throws SQLException { + if (duration == null) { + preparedStatement.setNull(i, Types.OTHER); + } else { + preparedStatement.setObject(i, convertToPGInterval(duration), Types.OTHER); + } + } + + @Override + public Duration deepCopy(Duration duration) { + return duration; + } + + @Override + public boolean isMutable() { + return false; + } + + @Override + public Serializable disassemble(Duration duration) { + return duration; + } + + @Override + public Duration assemble(Serializable serializable, Object o) { + return (Duration) serializable; + } + + public static PGInterval convertToPGInterval(Duration duration) { // When the period is created from duration by calling duration.toPeriod(), only precise fields // in the period type will be used. Thus, only the hour, minute, second and millisecond fields // on the period will be used. The year, month, week and day fields will not be populated: @@ -59,12 +125,8 @@ public class DurationConverter implements AttributeConverter { +/** Hibernate custom type for {@link TimedTransitionProperty} of {@link FeatureStatus}. */ +public class FeatureStatusTransitionUserType extends TimedTransitionBaseUserType { @Override - protected String convertValueToString(FeatureStatus value) { - return value.toString(); + String valueToString(FeatureStatus value) { + return value.name(); } @Override - protected FeatureStatus convertStringToValue(String string) { + FeatureStatus stringToValue(String string) { return FeatureStatus.valueOf(string); } } diff --git a/core/src/main/java/google/registry/persistence/converter/IdnTableEnumSetConverter.java b/core/src/main/java/google/registry/persistence/converter/IdnTableEnumSetConverter.java deleted file mode 100644 index 9003310e4..000000000 --- a/core/src/main/java/google/registry/persistence/converter/IdnTableEnumSetConverter.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2023 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.persistence.converter; - -import google.registry.tldconfig.idn.IdnTableEnum; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@link IdnTableEnum}s. */ -@Converter(autoApply = true) -public class IdnTableEnumSetConverter extends StringSetConverterBase { - - @Override - String toString(IdnTableEnum element) { - return element.name(); - } - - @Override - IdnTableEnum fromString(String value) { - return IdnTableEnum.valueOf(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/InetAddressSetConverter.java b/core/src/main/java/google/registry/persistence/converter/InetAddressSetConverter.java deleted file mode 100644 index 307d843eb..000000000 --- a/core/src/main/java/google/registry/persistence/converter/InetAddressSetConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import com.google.common.net.InetAddresses; -import java.net.InetAddress; -import javax.persistence.Converter; - -@Converter(autoApply = true) -public class InetAddressSetConverter extends StringSetConverterBase { - - @Override - String toString(InetAddress element) { - return InetAddresses.toAddrString(element); - } - - @Override - InetAddress fromString(String value) { - return InetAddresses.forString(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/InetAddressSetUserType.java b/core/src/main/java/google/registry/persistence/converter/InetAddressSetUserType.java new file mode 100644 index 000000000..9b9719b65 --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/InetAddressSetUserType.java @@ -0,0 +1,49 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.ImmutableSet.toImmutableSet; + +import com.google.common.net.InetAddresses; +import java.net.InetAddress; +import java.util.Set; +import java.util.stream.Stream; +import javax.annotation.Nullable; + +/** Hibernate custom type for {@link Set} of {@link InetAddress} objects. */ +public class InetAddressSetUserType + extends StringCollectionUserType> { + + @Override + String[] toJdbcObject(Set collection) { + return collection.stream() + .map(addr -> InetAddresses.toAddrString(addr)) + .toList() + .toArray(new String[0]); + } + + @Nullable + @Override + Set toEntity(@Nullable String[] data) { + return data == null + ? null + : Stream.of(data).map(InetAddresses::forString).collect(toImmutableSet()); + } + + @Override + public Class> returnedClass() { + return (Class>) ((Object) Set.class); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/IntervalDescriptor.java b/core/src/main/java/google/registry/persistence/converter/IntervalDescriptor.java deleted file mode 100644 index f397d0956..000000000 --- a/core/src/main/java/google/registry/persistence/converter/IntervalDescriptor.java +++ /dev/null @@ -1,139 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import org.hibernate.type.descriptor.ValueBinder; -import org.hibernate.type.descriptor.ValueExtractor; -import org.hibernate.type.descriptor.WrapperOptions; -import org.hibernate.type.descriptor.java.AbstractTypeDescriptor; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.descriptor.spi.JdbcRecommendedSqlTypeMappingContext; -import org.hibernate.type.descriptor.sql.BasicBinder; -import org.hibernate.type.descriptor.sql.BasicExtractor; -import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; -import org.postgresql.util.PGInterval; - -/** - * The {@link JavaTypeDescriptor} and {@link SqlTypeDescriptor} for {@link PGInterval}. - * - * @see JPA - * 2.1 AttributeConverters - */ -public class IntervalDescriptor extends AbstractTypeDescriptor - implements SqlTypeDescriptor { - public static final int COLUMN_TYPE = Types.JAVA_OBJECT; - public static final String COLUMN_NAME = "interval"; - private static final IntervalDescriptor INSTANCE = new IntervalDescriptor(); - - private IntervalDescriptor() { - super(PGInterval.class); - } - - public static IntervalDescriptor getInstance() { - return INSTANCE; - } - - @Override - public PGInterval fromString(String string) { - throw new UnsupportedOperationException( - "Constructing IntervalDescriptor from string is not allowed"); - } - - @Override - public X unwrap(PGInterval value, Class type, WrapperOptions options) { - if (value == null) { - return null; - } - if (PGInterval.class.isAssignableFrom(type)) { - return (X) value; - } - throw unknownUnwrap(type); - } - - @Override - public PGInterval wrap(X value, WrapperOptions options) { - if (value == null) { - return null; - } - if (value instanceof PGInterval) { - try { - return new PGInterval(value.toString()); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - throw unknownWrap(value.getClass()); - } - - @Override - public int getSqlType() { - return COLUMN_TYPE; - } - - @Override - public SqlTypeDescriptor getJdbcRecommendedSqlType(JdbcRecommendedSqlTypeMappingContext context) { - return this; - } - - @Override - public boolean canBeRemapped() { - return false; - } - - @Override - public ValueBinder getBinder(JavaTypeDescriptor javaTypeDescriptor) { - return new BasicBinder<>(javaTypeDescriptor, this) { - @Override - protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) - throws SQLException { - st.setObject(index, new PGInterval(value.toString())); - } - - @Override - protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) - throws SQLException { - st.setObject(name, new PGInterval(value.toString())); - } - }; - } - - @Override - public ValueExtractor getExtractor(JavaTypeDescriptor javaTypeDescriptor) { - return new BasicExtractor<>(javaTypeDescriptor, this) { - @Override - protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException { - return javaTypeDescriptor.wrap(rs.getObject(name), options); - } - - @Override - protected X doExtract(CallableStatement statement, int index, WrapperOptions options) - throws SQLException { - return javaTypeDescriptor.wrap(statement.getObject(index), options); - } - - @Override - protected X doExtract(CallableStatement statement, String name, WrapperOptions options) - throws SQLException { - return javaTypeDescriptor.wrap(statement.getObject(name), options); - } - }; - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/JodaMoneyType.java b/core/src/main/java/google/registry/persistence/converter/JodaMoneyType.java index 03dfbf385..6246d6cda 100644 --- a/core/src/main/java/google/registry/persistence/converter/JodaMoneyType.java +++ b/core/src/main/java/google/registry/persistence/converter/JodaMoneyType.java @@ -17,15 +17,10 @@ package google.registry.persistence.converter; import com.google.common.collect.ImmutableList; import java.io.Serializable; import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.Objects; -import javax.annotation.Nullable; import org.hibernate.HibernateException; -import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.type.StandardBasicTypes; -import org.hibernate.type.Type; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.metamodel.spi.ValueAccess; import org.hibernate.usertype.CompositeUserType; import org.joda.money.CurrencyUnit; import org.joda.money.Money; @@ -43,120 +38,59 @@ import org.joda.money.Money; * each loaded BigDecimal, then calls the appropriate factory method for Money, which will adjust * the scale appropriately. * - *

Although {@link CompositeUserType} is likely to suffer breaking change in Hibernate 6, it is - * the only option. The suggested alternatives such as Hibernate component or Java Embeddable do not - * work in this case. Hibernate component (our previous solution that is replaced by this class) - * does not allow manipulation of the loaded amount objects. Java Embeddable is not applicable since - * we do not own the Joda money classes. + *

Conversion of {@code Money} is automatic. See {@link + * google.registry.persistence.NomulusPostgreSQLDialect} for more information. * *

Usage: * * 

{@code
- * '@'Type(type = JodaMoneyType.TYPE_NAME)
- * '@'Columns(
- *   columns = {
- *     '@'Column(name = "cost_amount"),
- *     '@'Column(name = "cost_currency")
- *   }
- * )
+ * @AttributeOverride(
+ *     name = "amount",
+ *     // Override default (numeric(38,2)) to match real schema definition (numeric(19,2)).
+ *     column = @Column(name = "cost_currency", precision = 19, scale = 2))
+ * @AttributeOverride(name = "currency", column = @Column(name = "cost_currency"))
  * Money cost;
  * }
*/ -public class JodaMoneyType implements CompositeUserType { +public class JodaMoneyType implements CompositeUserType { - public static final JodaMoneyType INSTANCE = new JodaMoneyType(); - - /** The name of this type registered with JPA. See the example in class doc. */ - public static final String TYPE_NAME = "JodaMoney"; + /** Maps {@link Money} fields to database columns. */ + public static final class MoneyMapper { + BigDecimal amount; + String currency; + } // JPA property names that can be used in JPQL queries. private static final ImmutableList JPA_PROPERTY_NAMES = ImmutableList.of("amount", "currency"); - private static final ImmutableList PROPERTY_TYPES = - ImmutableList.of(StandardBasicTypes.BIG_DECIMAL, StandardBasicTypes.STRING); private static final int AMOUNT_ID = JPA_PROPERTY_NAMES.indexOf("amount"); private static final int CURRENCY_ID = JPA_PROPERTY_NAMES.indexOf("currency"); @Override - public String[] getPropertyNames() { - return JPA_PROPERTY_NAMES.toArray(new String[0]); - } - - @Override - public Type[] getPropertyTypes() { - return PROPERTY_TYPES.toArray(new Type[0]); - } - - @Override - public Object getPropertyValue(Object component, int property) throws HibernateException { + public Object getPropertyValue(Money money, int property) throws HibernateException { if (property >= JPA_PROPERTY_NAMES.size()) { throw new HibernateException("Property index too large: " + property); } - Money money = (Money) component; return property == AMOUNT_ID ? money.getAmount() : money.getCurrencyUnit().getCode(); } - @Override - public void setPropertyValue(Object component, int property, Object value) - throws HibernateException { - throw new HibernateException("Money is immutable"); - } - @Override public Class returnedClass() { return Money.class; } @Override - public boolean equals(Object x, Object y) throws HibernateException { + public boolean equals(Money x, Money y) { return Objects.equals(x, y); } @Override - public int hashCode(Object x) throws HibernateException { + public int hashCode(Money x) throws HibernateException { return Objects.hashCode(x); } - @Nullable @Override - public Object nullSafeGet( - ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) - throws HibernateException, SQLException { - BigDecimal amount = StandardBasicTypes.BIG_DECIMAL.nullSafeGet(rs, names[AMOUNT_ID], session); - String currencyUnitString = - StandardBasicTypes.STRING.nullSafeGet(rs, names[CURRENCY_ID], session); - // It is allowable for a Money object to be null, but only if both the currency unit and the - // amount are null - if (amount == null && currencyUnitString == null) { - return null; - } else if (amount != null && currencyUnitString != null) { - // CurrencyUnit.of() throws an IllegalCurrencyException for unknown currency, which means the - // currency is valid if it returns a value - return Money.of(CurrencyUnit.of(currencyUnitString), amount.stripTrailingZeros()); - } else { - throw new HibernateException( - String.format( - "Mismatching null state between currency '%s' and amount '%s'", - currencyUnitString, amount)); - } - } - - @Override - public void nullSafeSet( - PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) - throws HibernateException, SQLException { - BigDecimal amount = value == null ? null : ((Money) value).getAmount(); - String currencyUnit = value == null ? null : ((Money) value).getCurrencyUnit().getCode(); - - if ((amount == null && currencyUnit != null) || (amount != null && currencyUnit == null)) { - throw new HibernateException("Mismatching null state between currency and amount"); - } - StandardBasicTypes.BIG_DECIMAL.nullSafeSet(st, amount, index, session); - StandardBasicTypes.STRING.nullSafeSet(st, currencyUnit, index + 1, session); - } - - @Override - public Object deepCopy(Object value) throws HibernateException { + public Money deepCopy(Money value) throws HibernateException { return value; } @@ -166,22 +100,37 @@ public class JodaMoneyType implements CompositeUserType { } @Override - public Serializable disassemble(Object value, SharedSessionContractImplementor session) - throws HibernateException { - return ((Money) value); + public Class embeddable() { + return MoneyMapper.class; } @Override - public Object assemble( - Serializable cached, SharedSessionContractImplementor session, Object owner) - throws HibernateException { - return cached; + public Money instantiate(ValueAccess values, SessionFactoryImplementor sessionFactory) { + final String currency = values.getValue(CURRENCY_ID, String.class); + final BigDecimal amount = values.getValue(AMOUNT_ID, BigDecimal.class); + if (amount == null && currency == null) { + return null; + } else if (amount != null && currency != null) { + return Money.of(CurrencyUnit.of(currency), amount.stripTrailingZeros()); + } else { + throw new HibernateException( + String.format( + "Mismatching null state between currency '%s' and amount '%s'", currency, amount)); + } } @Override - public Object replace( - Object original, Object target, SharedSessionContractImplementor session, Object owner) - throws HibernateException { + public Serializable disassemble(Money value) throws HibernateException { + return value; + } + + @Override + public Money assemble(Serializable cached, Object owner) throws HibernateException { + return (Money) cached; + } + + @Override + public Money replace(Money original, Money target, Object owner) throws HibernateException { return original; } } diff --git a/core/src/main/java/google/registry/persistence/converter/LocalDateConverter.java b/core/src/main/java/google/registry/persistence/converter/LocalDateConverter.java index 2ed7e6a40..69e2f9532 100644 --- a/core/src/main/java/google/registry/persistence/converter/LocalDateConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/LocalDateConverter.java @@ -15,9 +15,9 @@ package google.registry.persistence.converter; import google.registry.util.DateTimeUtils; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import java.sql.Date; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; import org.joda.time.LocalDate; /** JPA converter for {@link LocalDate}, to/from {@link Date}. */ diff --git a/core/src/main/java/google/registry/persistence/converter/MapUserType.java b/core/src/main/java/google/registry/persistence/converter/MapUserType.java new file mode 100644 index 000000000..8898f012f --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/MapUserType.java @@ -0,0 +1,104 @@ +// Copyright 2024 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.persistence.converter; + +import static google.registry.persistence.NomulusPostgreSQLDialect.NATIVE_MAP_TYPE; + +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.Map; +import java.util.Objects; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.usertype.UserType; + +/** + * Base Hibernate custom type for a logical map backed by a string map column (e.g., hstore in + * Postgresql). + * + * @param Type parameter for the logical map. It might not implement the {@link Map} interface. + */ +@SuppressWarnings({"raw", "unchecked"}) +abstract class MapUserType implements UserType { + + abstract Map toStringMap(M map); + + abstract M toEntity(Map map); + + @Override + public int getSqlType() { + return NATIVE_MAP_TYPE; + } + + @Override + public boolean equals(M map, M other) { + return Objects.equals(map, other); + } + + @Override + public int hashCode(M map) { + return Objects.hashCode(map); + } + + @Override + public M nullSafeGet( + ResultSet resultSet, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor, + Object o) + throws SQLException { + Object object = resultSet.getObject(i); + if (resultSet.wasNull()) { + return null; + } + return toEntity((Map) object); + } + + @Override + public void nullSafeSet( + PreparedStatement preparedStatement, + M map, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor) + throws SQLException { + if (map == null) { + preparedStatement.setNull(i, Types.OTHER); + } else { + preparedStatement.setObject(i, toStringMap(map), Types.OTHER); + } + } + + @Override + public M deepCopy(M map) { + return map; + } + + @Override + public boolean isMutable() { + return false; + } + + @Override + public Serializable disassemble(M stringStringMap) { + return (Serializable) stringStringMap; + } + + @Override + public M assemble(Serializable serializable, Object o) { + return (M) serializable; + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListConverter.java b/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListConverter.java deleted file mode 100644 index 8d5b044ba..000000000 --- a/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListConverter.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import google.registry.model.contact.Disclose.PostalInfoChoice; -import google.registry.model.contact.PostalInfo; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@code List}. */ -@Converter(autoApply = true) -public class PostalInfoChoiceListConverter extends StringListConverterBase { - - @Override - String toString(PostalInfoChoice element) { - return element.getType().name(); - } - - @Override - PostalInfoChoice fromString(String value) { - return PostalInfoChoice.create(PostalInfo.Type.valueOf(value)); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java b/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java new file mode 100644 index 000000000..c57b9ebf3 --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/PostalInfoChoiceListUserType.java @@ -0,0 +1,50 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.ImmutableList.toImmutableList; + +import google.registry.model.contact.Disclose.PostalInfoChoice; +import google.registry.model.contact.PostalInfo; +import java.util.List; +import java.util.stream.Stream; + +/** Hibernate custom type for {@link List} of {@link PostalInfoChoice}. */ +public class PostalInfoChoiceListUserType + extends StringCollectionUserType> { + + @Override + String[] toJdbcObject(List collection) { + return collection.stream() + .map(PostalInfoChoice::getType) + .map(Enum::name) + .toList() + .toArray(new String[0]); + } + + @Override + List toEntity(String[] data) { + return Stream.of(data) + .map(PostalInfo.Type::valueOf) + .map(PostalInfoChoice::create) + .collect(toImmutableList()); + } + + @SuppressWarnings("unchecked") + @Override + public Class> returnedClass() { + return (Class>) ((Object) List.class); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java b/core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java deleted file mode 100644 index 09a3e4038..000000000 --- a/core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import google.registry.model.registrar.RegistrarPocBase.Type; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@code Set}. */ -@Converter(autoApply = true) -public class RegistrarPocSetConverter extends StringSetConverterBase { - @Override - String toString(Type element) { - return element.name(); - } - - @Override - Type fromString(String value) { - return Type.valueOf(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/RegistrarToRoleConverter.java b/core/src/main/java/google/registry/persistence/converter/RegistrarToRoleConverter.java deleted file mode 100644 index 0ac303875..000000000 --- a/core/src/main/java/google/registry/persistence/converter/RegistrarToRoleConverter.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2022 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.persistence.converter; - -import google.registry.model.console.RegistrarRole; -import java.util.Map; -import javax.persistence.Converter; - -/** JPA converter for storing / retrieving {@code Map} objects. */ -@Converter(autoApply = true) -public class RegistrarToRoleConverter - extends StringMapConverterBase> { - - @Override - protected String convertKeyToString(String key) { - return key; - } - - @Override - protected String convertValueToString(RegistrarRole value) { - return value.toString(); - } - - @Override - protected String convertStringToKey(String string) { - return string; - } - - @Override - protected RegistrarRole convertStringToValue(String string) { - return RegistrarRole.valueOf(string); - } - - @Override - protected Map convertMapToDerivedType(Map map) { - return map; - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/RegistrarToRoleMapUserType.java b/core/src/main/java/google/registry/persistence/converter/RegistrarToRoleMapUserType.java new file mode 100644 index 000000000..9f9d245ea --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/RegistrarToRoleMapUserType.java @@ -0,0 +1,41 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.Maps.transformValues; + +import com.google.common.collect.ImmutableMap; +import google.registry.model.console.RegistrarRole; +import java.util.Map; + +/** Hibernate custom type for {@link Map} of {@link String} to {@link RegistrarRole}. */ +public class RegistrarToRoleMapUserType extends MapUserType> { + + @SuppressWarnings("unchecked") + @Override + public Class> returnedClass() { + return (Class>) ((Object) Map.class); + } + + @Override + Map toStringMap(Map map) { + return ImmutableMap.copyOf(transformValues(map, Enum::name)); + } + + @Override + Map toEntity(Map map) { + return ImmutableMap.copyOf(transformValues(map, RegistrarRole::valueOf)); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/Spec11ThreatMatchThreatTypeSetConverter.java b/core/src/main/java/google/registry/persistence/converter/Spec11ThreatMatchThreatTypeSetConverter.java deleted file mode 100644 index 41d804c32..000000000 --- a/core/src/main/java/google/registry/persistence/converter/Spec11ThreatMatchThreatTypeSetConverter.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import google.registry.model.reporting.Spec11ThreatMatch.ThreatType; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@code Set}. */ -@Converter(autoApply = true) -public class Spec11ThreatMatchThreatTypeSetConverter extends StringSetConverterBase { - - @Override - String toString(ThreatType element) { - return element.name(); - } - - @Override - ThreatType fromString(String value) { - return ThreatType.valueOf(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java b/core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java deleted file mode 100644 index 7ced2e34b..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import google.registry.model.eppcommon.StatusValue; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@code Set}. */ -@Converter(autoApply = true) -public class StatusValueSetConverter extends StringSetConverterBase { - - @Override - String toString(StatusValue element) { - return element.name(); - } - - @Override - StatusValue fromString(String value) { - return StatusValue.valueOf(value); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java b/core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java deleted file mode 100644 index d21a69bd1..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java +++ /dev/null @@ -1,191 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import static google.registry.persistence.converter.StringCollectionDescriptor.StringCollection; - -import com.google.common.collect.ImmutableList; -import java.sql.Array; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Collection; -import org.hibernate.type.descriptor.ValueBinder; -import org.hibernate.type.descriptor.ValueExtractor; -import org.hibernate.type.descriptor.WrapperOptions; -import org.hibernate.type.descriptor.java.AbstractTypeDescriptor; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.descriptor.spi.JdbcRecommendedSqlTypeMappingContext; -import org.hibernate.type.descriptor.sql.BasicBinder; -import org.hibernate.type.descriptor.sql.BasicExtractor; -import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; - -/** - * The {@link JavaTypeDescriptor} and {@link SqlTypeDescriptor} for {@link StringCollection}. - * - *

A {@link StringCollection} object is a simple wrapper for a {@code Collection} which - * can be stored as a string array in the database. The {@link JavaTypeDescriptor} and {@link - * SqlTypeDescriptor} is used by JPA/Hibernate to map between the collection and {@link Array} which - * is the actual type that JDBC uses to read from and write to the database. - * - * @see JPA - * 2.1 AttributeConverters - */ -public class StringCollectionDescriptor extends AbstractTypeDescriptor - implements SqlTypeDescriptor { - public static final int COLUMN_TYPE = Types.ARRAY; - public static final String COLUMN_NAME = "text"; - public static final String COLUMN_DDL_NAME = COLUMN_NAME + "[]"; - private static final StringCollectionDescriptor INSTANCE = new StringCollectionDescriptor(); - - protected StringCollectionDescriptor() { - super(StringCollection.class); - } - - public static StringCollectionDescriptor getInstance() { - return INSTANCE; - } - - @Override - public StringCollection fromString(String string) { - throw new UnsupportedOperationException( - "Constructing StringCollectionDescriptor from string is not allowed"); - } - - @Override - public X unwrap(StringCollection value, Class type, WrapperOptions options) { - if (value == null) { - return null; - } - if (Collection.class.isAssignableFrom(type)) { - return (X) value.getCollection(); - } - throw unknownUnwrap(type); - } - - @Override - public StringCollection wrap(X value, WrapperOptions options) { - if (value == null) { - return null; - } - if (value instanceof Array) { - try { - String[] arr = (String[]) ((Array) value).getArray(); - ImmutableList.Builder builder = new ImmutableList.Builder<>(); - for (String str : arr) { - builder.add(str); - } - return StringCollection.create(builder.build()); - } catch (SQLException e) { - throw new RuntimeException(e); - } - } - throw unknownWrap(value.getClass()); - } - - @Override - public SqlTypeDescriptor getJdbcRecommendedSqlType(JdbcRecommendedSqlTypeMappingContext context) { - return this; - } - - @Override - public int getSqlType() { - return COLUMN_TYPE; - } - - @Override - public boolean canBeRemapped() { - return false; - } - - @Override - public ValueBinder getBinder(JavaTypeDescriptor javaTypeDescriptor) { - return new BasicBinder<>(javaTypeDescriptor, this) { - @Override - protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) - throws SQLException { - if (value == null) { - st.setArray(index, null); - return; - } - if (value instanceof StringCollection stringCollection) { - if (stringCollection.getCollection() == null) { - st.setArray(index, null); - } else { - st.setArray( - index, - st.getConnection() - .createArrayOf(COLUMN_NAME, stringCollection.getCollection().toArray())); - } - } else { - throw new UnsupportedOperationException( - String.format( - "Binding type %s is not supported by StringCollectionDescriptor", - value.getClass().getName())); - } - } - - @Override - protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) - throws SQLException { - // CallableStatement.setArray() doesn't have an overload version for setting array by its - // column name - throw new UnsupportedOperationException( - "Binding array by its column name is not supported"); - } - }; - } - - @Override - public ValueExtractor getExtractor(JavaTypeDescriptor javaTypeDescriptor) { - return new BasicExtractor<>(javaTypeDescriptor, this) { - @Override - protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException { - return javaTypeDescriptor.wrap(rs.getArray(name), options); - } - - @Override - protected X doExtract(CallableStatement statement, int index, WrapperOptions options) - throws SQLException { - return javaTypeDescriptor.wrap(statement.getArray(index), options); - } - - @Override - protected X doExtract(CallableStatement statement, String name, WrapperOptions options) - throws SQLException { - return javaTypeDescriptor.wrap(statement.getArray(name), options); - } - }; - } - - public static class StringCollection { - private Collection collection; - - private StringCollection(Collection collection) { - this.collection = collection; - } - - public static StringCollection create(Collection collection) { - return new StringCollection(collection); - } - - public Collection getCollection() { - return collection; - } - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StringCollectionUserType.java b/core/src/main/java/google/registry/persistence/converter/StringCollectionUserType.java new file mode 100644 index 000000000..5c04ff62b --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/StringCollectionUserType.java @@ -0,0 +1,128 @@ +// Copyright 2024 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.persistence.converter; + +import static google.registry.persistence.NomulusPostgreSQLDialect.NATIVE_ARRAY_OF_POJO_TYPE; + +import java.io.Serializable; +import java.sql.Array; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.usertype.UserType; + +/** + * Base Hibernate custom type for {@link Collection} of entities backed by a postgresql + * one-dimension text array. + * + *

Note that Hibernate 6 and later have builtin support for collections of primitive, Enum and + * String types. Use this class on collection of user-defined entities. + * + * @param Type parameter for collection values. + * @param Type parameter for collection. + */ +public abstract class StringCollectionUserType> implements UserType { + + private static final String DB_ARRAY_ELEMENT_TYPE = "text"; + + abstract String[] toJdbcObject(C collection); + + abstract C toEntity(String[] data); + + @Override + public int getSqlType() { + return NATIVE_ARRAY_OF_POJO_TYPE; + } + + @Override + public boolean equals(C one, C other) { + if (one == other) { + return true; + } + if (one == null || other == null) { + return false; + } + if (one instanceof Set o1 && other instanceof Set o2) { + return Objects.equals(o1, o2); + } + if (one instanceof List o1 && other instanceof List o2) { + return Objects.equals(o1, o2); + } + throw new IllegalStateException("Unexpected types: " + one.getClass() + " " + other.getClass()); + } + + @Override + public int hashCode(C collection) { + return Objects.hashCode(collection); + } + + @Override + public C nullSafeGet( + ResultSet resultSet, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor, + Object o) + throws SQLException { + Array rawArray = resultSet.getArray(i); + if (resultSet.wasNull()) { + return null; + } else { + return toEntity((String[]) rawArray.getArray()); + } + } + + @Override + public void nullSafeSet( + PreparedStatement preparedStatement, + C collection, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor) + throws SQLException { + if (collection == null) { + preparedStatement.setArray(i, null); + } else { + preparedStatement.setArray( + i, + preparedStatement + .getConnection() + .createArrayOf(DB_ARRAY_ELEMENT_TYPE, toJdbcObject(collection))); + } + } + + @Override + public C deepCopy(C collection) { + return collection; + } + + @Override + public boolean isMutable() { + return false; + } + + @Override + public Serializable disassemble(C collection) { + return (Serializable) collection; + } + + @Override + public C assemble(Serializable serializable, Object o) { + return (C) serializable; + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/StringListConverter.java b/core/src/main/java/google/registry/persistence/converter/StringListConverter.java deleted file mode 100644 index ced0f4ce7..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringListConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@code List}. */ -@Converter(autoApply = true) -public class StringListConverter extends StringListConverterBase { - - @Override - String toString(String element) { - return element; - } - - @Override - String fromString(String value) { - return value; - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StringListConverterBase.java b/core/src/main/java/google/registry/persistence/converter/StringListConverterBase.java deleted file mode 100644 index 8936e6cb6..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringListConverterBase.java +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import static com.google.common.collect.ImmutableList.toImmutableList; - -import google.registry.persistence.converter.StringCollectionDescriptor.StringCollection; -import java.util.List; -import javax.persistence.AttributeConverter; - -/** - * Base JPA converter for {@link List} objects that are stored as an array of strings in the - * database. - */ -public abstract class StringListConverterBase - implements AttributeConverter, StringCollection> { - - abstract String toString(T element); - - abstract T fromString(String value); - - @Override - public StringCollection convertToDatabaseColumn(List attribute) { - return attribute == null - ? null - : StringCollection.create( - attribute.stream().map(this::toString).collect(toImmutableList())); - } - - @Override - public List convertToEntityAttribute(StringCollection dbData) { - return dbData == null || dbData.getCollection() == null - ? null - : dbData.getCollection().stream().map(this::fromString).collect(toImmutableList()); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StringMapConverterBase.java b/core/src/main/java/google/registry/persistence/converter/StringMapConverterBase.java deleted file mode 100644 index 311f5ce71..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringMapConverterBase.java +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import static google.registry.util.CollectionUtils.entriesToImmutableMap; - -import com.google.common.collect.Maps; -import google.registry.persistence.converter.StringMapDescriptor.StringMap; -import java.util.Map; -import javax.persistence.AttributeConverter; - -/** - * Base JPA converter for {@link Map} objects that are stored in a column with data type of hstore - * in the database. - */ -public abstract class StringMapConverterBase> - implements AttributeConverter { - - protected abstract String convertKeyToString(K key); - - protected abstract String convertValueToString(V value); - - protected abstract K convertStringToKey(String string); - - protected abstract V convertStringToValue(String string); - - protected abstract M convertMapToDerivedType(Map map); - - private Map.Entry convertToDatabaseMapEntry(Map.Entry entry) { - return Maps.immutableEntry( - convertKeyToString(entry.getKey()), convertValueToString(entry.getValue())); - } - - private Map.Entry convertToEntityMapEntry(Map.Entry entry) { - return Maps.immutableEntry( - convertStringToKey(entry.getKey()), convertStringToValue(entry.getValue())); - } - - @Override - public StringMap convertToDatabaseColumn(M attribute) { - return attribute == null - ? null - : StringMap.create( - attribute.entrySet().stream() - .map(this::convertToDatabaseMapEntry) - .collect(entriesToImmutableMap())); - } - - @Override - public M convertToEntityAttribute(StringMap dbData) { - return dbData == null - ? null - : convertMapToDerivedType( - dbData.getMap().entrySet().stream() - .map(this::convertToEntityMapEntry) - .collect(entriesToImmutableMap())); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StringMapDescriptor.java b/core/src/main/java/google/registry/persistence/converter/StringMapDescriptor.java deleted file mode 100644 index 5cacb0410..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringMapDescriptor.java +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import static google.registry.persistence.converter.StringMapDescriptor.StringMap; - -import com.google.common.collect.ImmutableMap; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Map; -import org.hibernate.type.descriptor.ValueBinder; -import org.hibernate.type.descriptor.ValueExtractor; -import org.hibernate.type.descriptor.WrapperOptions; -import org.hibernate.type.descriptor.java.AbstractTypeDescriptor; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.descriptor.spi.JdbcRecommendedSqlTypeMappingContext; -import org.hibernate.type.descriptor.sql.BasicBinder; -import org.hibernate.type.descriptor.sql.BasicExtractor; -import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; - -/** - * The {@link JavaTypeDescriptor} and {@link SqlTypeDescriptor} for {@link StringMap}. - * - *

A {@link StringMap} object is a simple wrapper for a {@code Map} which can be - * stored in a column with data type of hstore in the database. The {@link JavaTypeDescriptor} and - * {@link SqlTypeDescriptor} is used by JPA/Hibernate to map between the map and hstore which is the - * actual type that JDBC uses to read from and write to the database. - * - * @see JPA - * 2.1 AttributeConverters - * @see hstore - */ -public class StringMapDescriptor extends AbstractTypeDescriptor - implements SqlTypeDescriptor { - public static final int COLUMN_TYPE = Types.OTHER; - public static final String COLUMN_NAME = "hstore"; - private static final StringMapDescriptor INSTANCE = new StringMapDescriptor(); - - protected StringMapDescriptor() { - super(StringMap.class); - } - - public static StringMapDescriptor getInstance() { - return INSTANCE; - } - - @Override - public StringMap fromString(String string) { - throw new UnsupportedOperationException( - "Constructing StringMapDescriptor from string is not allowed"); - } - - @Override - public X unwrap(StringMap value, Class type, WrapperOptions options) { - if (value == null) { - return null; - } - if (Map.class.isAssignableFrom(type)) { - return (X) value.getMap(); - } - throw unknownUnwrap(type); - } - - @Override - public StringMap wrap(X value, WrapperOptions options) { - if (value == null) { - return null; - } - if (value instanceof Map) { - return StringMap.create((Map) value); - } - throw unknownWrap(value.getClass()); - } - - @Override - public SqlTypeDescriptor getJdbcRecommendedSqlType(JdbcRecommendedSqlTypeMappingContext context) { - return this; - } - - @Override - public int getSqlType() { - return COLUMN_TYPE; - } - - @Override - public boolean canBeRemapped() { - return false; - } - - @Override - public ValueBinder getBinder(JavaTypeDescriptor javaTypeDescriptor) { - return new BasicBinder<>(javaTypeDescriptor, this) { - @Override - protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) - throws SQLException { - st.setObject(index, getStringMap(value)); - } - - @Override - protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) - throws SQLException { - st.setObject(name, getStringMap(value)); - } - - private Map getStringMap(X value) { - if (value == null) { - return null; - } - if (value instanceof StringMap) { - return ((StringMap) value).getMap(); - } else { - throw new UnsupportedOperationException( - String.format( - "Binding type %s is not supported by StringMapDescriptor", - value.getClass().getName())); - } - } - }; - } - - @Override - public ValueExtractor getExtractor(JavaTypeDescriptor javaTypeDescriptor) { - return new BasicExtractor<>(javaTypeDescriptor, this) { - @Override - protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException { - return javaTypeDescriptor.wrap(rs.getObject(name), options); - } - - @Override - protected X doExtract(CallableStatement statement, int index, WrapperOptions options) - throws SQLException { - return javaTypeDescriptor.wrap(statement.getObject(index), options); - } - - @Override - protected X doExtract(CallableStatement statement, String name, WrapperOptions options) - throws SQLException { - return javaTypeDescriptor.wrap(statement.getObject(name), options); - } - }; - } - - /** A simple wrapper class for {@code Map}. */ - public static class StringMap { - private Map map; - - private StringMap(Map map) { - this.map = map; - } - - /** Constructs an instance of {@link StringMap} from the given map. */ - public static StringMap create(Map map) { - return new StringMap(ImmutableMap.copyOf(map)); - } - - /** Returns the underlying {@code Map} object. */ - public Map getMap() { - return map; - } - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java b/core/src/main/java/google/registry/persistence/converter/StringMapUserType.java similarity index 50% rename from core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java rename to core/src/main/java/google/registry/persistence/converter/StringMapUserType.java index e47b44f9e..6fc7a95a3 100644 --- a/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/StringMapUserType.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Nomulus Authors. All Rights Reserved. +// Copyright 2024 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. @@ -14,23 +14,25 @@ package google.registry.persistence.converter; -import google.registry.util.CidrAddressBlock; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import com.google.common.collect.ImmutableMap; +import java.util.Map; -/** - * JPA {@link AttributeConverter} for storing/retrieving {@code List} objects. - */ -@Converter(autoApply = true) -public class CidrAddressBlockListConverter extends StringListConverterBase { +/** Hibernate custom type for {@link Map} of String to String values. */ +public class StringMapUserType extends MapUserType> { + @SuppressWarnings("unchecked") @Override - String toString(CidrAddressBlock element) { - return element.toString(); + public Class> returnedClass() { + return (Class>) ((Object) Map.class); } @Override - CidrAddressBlock fromString(String value) { - return CidrAddressBlock.create(value); + Map toStringMap(Map map) { + return ImmutableMap.copyOf(map); + } + + @Override + Map toEntity(Map map) { + return ImmutableMap.copyOf(map); } } diff --git a/core/src/main/java/google/registry/persistence/converter/StringSetConverter.java b/core/src/main/java/google/registry/persistence/converter/StringSetConverter.java deleted file mode 100644 index 9f608500c..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringSetConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** JPA {@link AttributeConverter} for storing/retrieving {@code Set}. */ -@Converter(autoApply = true) -public class StringSetConverter extends StringSetConverterBase { - - @Override - String toString(String element) { - return element; - } - - @Override - String fromString(String value) { - return value; - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/StringSetConverterBase.java b/core/src/main/java/google/registry/persistence/converter/StringSetConverterBase.java deleted file mode 100644 index aa3279e9a..000000000 --- a/core/src/main/java/google/registry/persistence/converter/StringSetConverterBase.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import static com.google.common.collect.ImmutableSet.toImmutableSet; - -import google.registry.persistence.converter.StringCollectionDescriptor.StringCollection; -import java.util.Set; -import javax.persistence.AttributeConverter; - -/** - * Base JPA converter for {@link Set} objects that are stored as an array of strings in the - * database. - */ -public abstract class StringSetConverterBase - implements AttributeConverter, StringCollection> { - - abstract String toString(T element); - - abstract T fromString(String value); - - @Override - public StringCollection convertToDatabaseColumn(Set attribute) { - return attribute == null - ? null - : StringCollection.create(attribute.stream().map(this::toString).collect(toImmutableSet())); - } - - @Override - public Set convertToEntityAttribute(StringCollection dbData) { - return dbData == null || dbData.getCollection() == null - ? null - : dbData.getCollection().stream().map(this::fromString).collect(toImmutableSet()); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/TimedTransitionBaseUserType.java b/core/src/main/java/google/registry/persistence/converter/TimedTransitionBaseUserType.java new file mode 100644 index 000000000..7fcddbf93 --- /dev/null +++ b/core/src/main/java/google/registry/persistence/converter/TimedTransitionBaseUserType.java @@ -0,0 +1,62 @@ +// Copyright 2024 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.persistence.converter; + +import static com.google.common.collect.ImmutableMap.toImmutableMap; +import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap; + +import com.google.common.collect.ImmutableSortedMap; +import com.google.common.collect.Ordering; +import google.registry.model.common.TimedTransitionProperty; +import java.io.Serializable; +import java.util.Map; +import org.joda.time.DateTime; + +/** + * Base Hibernate custom type for {@link TimedTransitionProperty}. + * + * @param Type parameter for value. + */ +public abstract class TimedTransitionBaseUserType + extends MapUserType> { + + abstract String valueToString(V value); + + abstract V stringToValue(String string); + + @SuppressWarnings("unchecked") + @Override + public Class> returnedClass() { + return (Class>) ((Object) TimedTransitionProperty.class); + } + + @Override + Map toStringMap(TimedTransitionProperty map) { + return map.toValueMap().entrySet().stream() + .collect(toImmutableMap(e -> e.getKey().toString(), e -> valueToString(e.getValue()))); + } + + @Override + TimedTransitionProperty toEntity(Map map) { + ImmutableSortedMap valueMap = + map.entrySet().stream() + .collect( + toImmutableSortedMap( + Ordering.natural(), + e -> DateTime.parse(e.getKey()), + e -> stringToValue(e.getValue()))); + return TimedTransitionProperty.fromValueMap(valueMap); + } +} diff --git a/core/src/main/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBase.java b/core/src/main/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBase.java deleted file mode 100644 index c9e8a2af0..000000000 --- a/core/src/main/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBase.java +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import com.google.common.collect.ImmutableSortedMap; -import google.registry.model.common.TimedTransitionProperty; -import java.io.Serializable; -import java.util.Map; -import org.joda.time.DateTime; - -/** - * Base JPA converter for {@link TimedTransitionProperty} objects that are stored in a column with - * data type of hstore in the database. - */ -public abstract class TimedTransitionPropertyConverterBase - extends StringMapConverterBase> { - - @Override - protected String convertKeyToString(DateTime key) { - return key.toString(); - } - - @Override - protected DateTime convertStringToKey(String string) { - return DateTime.parse(string); - } - - @Override - protected TimedTransitionProperty convertMapToDerivedType(Map map) { - return TimedTransitionProperty.fromValueMap(ImmutableSortedMap.copyOf(map)); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java b/core/src/main/java/google/registry/persistence/converter/TldStateTransitionUserType.java similarity index 63% rename from core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java rename to core/src/main/java/google/registry/persistence/converter/TldStateTransitionUserType.java index db001b8d5..7986054f4 100644 --- a/core/src/main/java/google/registry/persistence/converter/TldStateTransitionConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/TldStateTransitionUserType.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Nomulus Authors. All Rights Reserved. +// Copyright 2024 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. @@ -14,19 +14,19 @@ package google.registry.persistence.converter; +import google.registry.model.common.TimedTransitionProperty; import google.registry.model.tld.Tld.TldState; -import javax.persistence.Converter; -/** JPA converter for storing/retrieving {@code TimedTransitionProperty} objects. */ -@Converter(autoApply = true) -public class TldStateTransitionConverter extends TimedTransitionPropertyConverterBase { +/** Hibernate custom type for {@link TimedTransitionProperty} of {@link TldState}. */ +public class TldStateTransitionUserType extends TimedTransitionBaseUserType { + @Override - protected String convertValueToString(TldState value) { + String valueToString(TldState value) { return value.name(); } @Override - protected TldState convertStringToValue(String string) { + TldState stringToValue(String string) { return TldState.valueOf(string); } } diff --git a/core/src/main/java/google/registry/persistence/converter/ToStringConverterBase.java b/core/src/main/java/google/registry/persistence/converter/ToStringConverterBase.java index 84af2d872..3b09489d0 100644 --- a/core/src/main/java/google/registry/persistence/converter/ToStringConverterBase.java +++ b/core/src/main/java/google/registry/persistence/converter/ToStringConverterBase.java @@ -13,8 +13,8 @@ // limitations under the License. package google.registry.persistence.converter; +import jakarta.persistence.AttributeConverter; import javax.annotation.Nullable; -import javax.persistence.AttributeConverter; /** Abstract JPA converter for objects that are stored by their toString() value. */ abstract class ToStringConverterBase implements AttributeConverter { diff --git a/core/src/main/java/google/registry/persistence/converter/TransferServerApproveEntitySetConverter.java b/core/src/main/java/google/registry/persistence/converter/TransferServerApproveEntitySetConverter.java deleted file mode 100644 index b42ec0bc5..000000000 --- a/core/src/main/java/google/registry/persistence/converter/TransferServerApproveEntitySetConverter.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import google.registry.model.transfer.TransferData.TransferServerApproveEntity; -import google.registry.persistence.VKey; -import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - -/** {@link AttributeConverter} for {@link Set}. */ -@Converter(autoApply = true) -public class TransferServerApproveEntitySetConverter - extends StringSetConverterBase> { - - @Override - String toString(VKey element) { - return String.valueOf(element.getKey()); - } - - @Override - VKey fromString(String value) { - return VKey.create(TransferServerApproveEntity.class, Long.parseLong(value)); - } -} diff --git a/core/src/main/java/google/registry/persistence/converter/VKeyConverter.java b/core/src/main/java/google/registry/persistence/converter/VKeyConverter.java index 9a123b426..35bcb6986 100644 --- a/core/src/main/java/google/registry/persistence/converter/VKeyConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/VKeyConverter.java @@ -15,9 +15,9 @@ package google.registry.persistence.converter; import google.registry.persistence.VKey; +import jakarta.persistence.AttributeConverter; import java.io.Serializable; import javax.annotation.Nullable; -import javax.persistence.AttributeConverter; /** * Converts {@link VKey} to/from a type that can be directly stored in the database. diff --git a/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java b/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java index 84d90f782..764fab4aa 100644 --- a/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java +++ b/core/src/main/java/google/registry/persistence/transaction/CriteriaQueryBuilder.java @@ -17,13 +17,13 @@ package google.registry.persistence.transaction; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import com.google.common.collect.ImmutableList; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.Collection; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; /** * An extension of {@link CriteriaQuery} that uses a Builder-style pattern when adding "WHERE" diff --git a/core/src/main/java/google/registry/persistence/transaction/DatabaseException.java b/core/src/main/java/google/registry/persistence/transaction/DatabaseException.java index ce3a26bb7..1609e49e6 100644 --- a/core/src/main/java/google/registry/persistence/transaction/DatabaseException.java +++ b/core/src/main/java/google/registry/persistence/transaction/DatabaseException.java @@ -17,9 +17,9 @@ package google.registry.persistence.transaction; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Optional; -import javax.persistence.PersistenceException; /** * Wraps an exception thrown by the JPA framework and captures the SQL error details (state and diff --git a/core/src/main/java/google/registry/persistence/transaction/IdService.java b/core/src/main/java/google/registry/persistence/transaction/IdService.java index 8741a9fe8..77797789c 100644 --- a/core/src/main/java/google/registry/persistence/transaction/IdService.java +++ b/core/src/main/java/google/registry/persistence/transaction/IdService.java @@ -16,7 +16,6 @@ package google.registry.persistence.transaction; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import java.math.BigInteger; import java.util.concurrent.atomic.AtomicLong; /** @@ -35,10 +34,9 @@ final class IdService { static long allocateId() { return tm().transact( () -> - (BigInteger) + (Long) tm().getEntityManager() .createNativeQuery("SELECT nextval('project_wide_unique_id_seq')") - .getSingleResult()) - .longValue(); + .getSingleResult()); } } diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java index 6cac899ae..860b2c214 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManager.java @@ -16,10 +16,10 @@ package google.registry.persistence.transaction; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.persistence.VKey; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; /** Sub-interface of {@link TransactionManager} which defines JPA related methods. */ public interface JpaTransactionManager extends TransactionManager { diff --git a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java index 19fedd0e3..8409b00aa 100644 --- a/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java +++ b/core/src/main/java/google/registry/persistence/transaction/JpaTransactionManagerImpl.java @@ -41,6 +41,20 @@ import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; import google.registry.util.Retrier; import google.registry.util.SystemSleeper; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.metamodel.EntityType; import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Field; @@ -60,18 +74,7 @@ import java.util.function.Supplier; import java.util.stream.Stream; import java.util.stream.StreamSupport; import javax.annotation.Nullable; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.PersistenceException; -import javax.persistence.Query; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.metamodel.EntityType; +import org.hibernate.Session; import org.hibernate.cfg.Environment; import org.joda.time.DateTime; @@ -214,6 +217,10 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager { } TransactionInfo txnInfo = transactionInfo.get(); txnInfo.entityManager = emf.createEntityManager(); + if (readOnly) { + // Disable Hibernate's dirty object check on flushing, it has become more aggressive in v6. + txnInfo.entityManager.unwrap(Session.class).setDefaultReadOnly(true); + } EntityTransaction txn = txnInfo.entityManager.getTransaction(); try { txn.begin(); @@ -736,6 +743,44 @@ public class JpaTransactionManagerImpl implements JpaTransactionManager { this.delegate = delegate; } + @Override + public Integer getTimeout() { + return delegate.getTimeout(); + } + + @Override + public CacheRetrieveMode getCacheRetrieveMode() { + return delegate.getCacheRetrieveMode(); + } + + @Override + public CacheStoreMode getCacheStoreMode() { + return delegate.getCacheStoreMode(); + } + + @Override + public TypedQuery setTimeout(Integer timeout) { + delegate.setTimeout(timeout); + return this; + } + + @Override + public TypedQuery setCacheStoreMode(CacheStoreMode mode) { + delegate.setCacheStoreMode(mode); + return this; + } + + @Override + public TypedQuery setCacheRetrieveMode(CacheRetrieveMode mode) { + delegate.setCacheRetrieveMode(mode); + return this; + } + + @Override + public T getSingleResultOrNull() { + return delegate.getSingleResultOrNull(); + } + @Override public List getResultList() { return delegate diff --git a/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java b/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java index 0a0779e82..1da44fe3d 100644 --- a/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java +++ b/core/src/main/java/google/registry/persistence/transaction/QueryComposer.java @@ -18,13 +18,13 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.google.common.collect.ImmutableList; import google.registry.persistence.transaction.CriteriaQueryBuilder.WhereOperator; +import jakarta.persistence.criteria.CriteriaBuilder; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Function; import java.util.stream.Stream; import javax.annotation.Nullable; -import javax.persistence.criteria.CriteriaBuilder; /** * Creates queries that can be used JPA. @@ -98,8 +98,8 @@ public abstract class QueryComposer { /** * Returns the one and only result of a query. * - *

Throws a {@link javax.persistence.NonUniqueResultException} if there is more than one - * result, throws {@link javax.persistence.NoResultException} if no results are found. + *

Throws a {@link jakarta.persistence.NonUniqueResultException} if there is more than one + * result, throws {@link jakarta.persistence.NoResultException} if no results are found. */ public abstract T getSingleResult(); diff --git a/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java b/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java index 5145506e6..861609c76 100644 --- a/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java @@ -49,13 +49,13 @@ import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.NonFinalForTesting; +import jakarta.persistence.criteria.CriteriaBuilder; import java.net.InetAddress; import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.stream.Stream; import javax.inject.Inject; -import javax.persistence.criteria.CriteriaBuilder; import org.hibernate.Hibernate; /** @@ -441,7 +441,7 @@ public class RdapDomainSearchAction extends RdapSearchActionBase { replicaTm() .transact( () -> { - javax.persistence.Query query = + jakarta.persistence.Query query = replicaTm() .getEntityManager() .createNativeQuery(queryBuilder.toString()) diff --git a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java index 41ab4a908..60d0a04cd 100644 --- a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java +++ b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java @@ -69,6 +69,7 @@ import google.registry.rdap.RdapObjectClasses.Vcard; import google.registry.rdap.RdapObjectClasses.VcardArray; import google.registry.request.FullServletPath; import google.registry.util.Clock; +import jakarta.persistence.Entity; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; @@ -81,7 +82,6 @@ import java.util.Set; import java.util.stream.Stream; import javax.annotation.Nullable; import javax.inject.Inject; -import javax.persistence.Entity; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java b/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java index 180ea651c..2a5977cc6 100644 --- a/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java +++ b/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java @@ -264,7 +264,7 @@ public class RdapNameserverSearchAction extends RdapSearchActionBase { replicaTm() .transact( () -> { - javax.persistence.Query query = + jakarta.persistence.Query query = replicaTm() .getEntityManager() .createNativeQuery(queryBuilder.toString(), Host.class) diff --git a/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java index 7e3f64d06..a6138e8ee 100644 --- a/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java +++ b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java @@ -32,6 +32,7 @@ import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.ParameterMap; import google.registry.request.RequestUrl; +import jakarta.persistence.criteria.CriteriaBuilder; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLEncoder; @@ -42,7 +43,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import javax.inject.Inject; -import javax.persistence.criteria.CriteriaBuilder; /** * Base RDAP (new WHOIS) action for domain, nameserver and entity search requests. diff --git a/core/src/main/java/google/registry/rde/RdeMarshaller.java b/core/src/main/java/google/registry/rde/RdeMarshaller.java index 5af07d807..d94e25be7 100644 --- a/core/src/main/java/google/registry/rde/RdeMarshaller.java +++ b/core/src/main/java/google/registry/rde/RdeMarshaller.java @@ -37,13 +37,13 @@ import google.registry.xjc.rdepolicy.XjcRdePolicyElement; import google.registry.xml.ValidationMode; import google.registry.xml.XmlException; import google.registry.xml.XmlFragmentMarshaller; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.MarshalException; import java.io.ByteArrayOutputStream; import java.io.Serial; import java.io.Serializable; import java.util.Collection; import javax.annotation.concurrent.NotThreadSafe; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.MarshalException; import org.joda.time.DateTime; /** XML document fragment marshaller for RDE. */ diff --git a/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java index cd0f3b3af..52300bb6c 100644 --- a/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java +++ b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java @@ -39,13 +39,13 @@ import google.registry.tools.params.NameserversParameter; import google.registry.tools.soy.DomainRenewSoyInfo; import google.registry.tools.soy.UniformRapidSuspensionSoyInfo; import google.registry.util.Clock; +import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; import javax.inject.Inject; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java index a0306649b..b016c3d99 100644 --- a/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java @@ -34,6 +34,7 @@ import google.registry.xjc.rdedomain.XjcRdeDomain; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xml.XmlException; +import jakarta.xml.bind.JAXBElement; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; @@ -46,7 +47,6 @@ import java.util.SortedMap; import java.util.TreeMap; import javax.annotation.Nullable; import javax.inject.Inject; -import javax.xml.bind.JAXBElement; /** Command to view and schema validate an XML RDE escrow deposit. */ @Parameters(separators = " =", commandDescription = "View/validate an XML escrow deposit.") diff --git a/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java index a40acf000..12f5c311f 100644 --- a/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java +++ b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java @@ -159,7 +159,7 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA private ImmutableList getStanzasForTld(String tld, DateTime exportTime) { ImmutableList.Builder result = new ImmutableList.Builder<>(); - ScrollableResults scrollableResults = + ScrollableResults scrollableResults = tm().query("FROM Domain WHERE tld = :tld AND deletionTime > :exportTime") .setParameter("tld", tld) .setParameter("exportTime", exportTime) @@ -167,7 +167,7 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA .setCacheMode(CacheMode.IGNORE) .scroll(ScrollMode.FORWARD_ONLY); for (int i = 1; scrollableResults.next(); i = (i + 1) % BATCH_SIZE) { - Domain domain = (Domain) scrollableResults.get(0); + Domain domain = scrollableResults.get(); populateStanzasForDomain(domain, exportTime, result); if (i == 0) { tm().getEntityManager().flush(); diff --git a/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java index 5bc2f5936..9d64d7caa 100644 --- a/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java +++ b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java @@ -32,11 +32,11 @@ import google.registry.request.Action; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.persistence.TypedQuery; import java.util.Optional; import java.util.Random; import javax.annotation.Nullable; import javax.inject.Inject; -import javax.persistence.TypedQuery; import org.apache.arrow.util.VisibleForTesting; import org.apache.http.HttpStatus; import org.joda.time.Duration; @@ -118,7 +118,8 @@ public class RefreshDnsForAllDomainsAction implements Runnable { private Duration calculateSmear() { Long activeDomains = tm().query( - "SELECT COUNT(*) FROM Domain WHERE tld IN (:tlds) AND deletionTime = :endOfTime", + "SELECT COUNT(*) FROM Domain WHERE tld IN (:tlds) AND deletionTime =" + + " :endOfTime", Long.class) .setParameter("tlds", tlds) .setParameter("endOfTime", END_OF_TIME) diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java index 1afb2035b..9717663c4 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java @@ -30,10 +30,10 @@ import google.registry.request.Action; import google.registry.request.Action.GkeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; +import jakarta.persistence.TypedQuery; import java.util.List; import java.util.Optional; import javax.inject.Inject; -import javax.persistence.TypedQuery; import org.joda.time.DateTime; /** Returns a (paginated) list of domains for a particular registrar. */ diff --git a/core/src/main/java/google/registry/xjc/XjcObject.java b/core/src/main/java/google/registry/xjc/XjcObject.java index e8878ec64..78fb9abfd 100644 --- a/core/src/main/java/google/registry/xjc/XjcObject.java +++ b/core/src/main/java/google/registry/xjc/XjcObject.java @@ -15,12 +15,12 @@ package google.registry.xjc; import google.registry.xml.XmlException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.io.OutputStream; import java.io.StringWriter; import java.nio.charset.Charset; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.namespace.QName; /** The superclass for XML classes generated by JAXB that provides marshalling and validation. */ @@ -30,7 +30,7 @@ public abstract class XjcObject { /** * Validates and streams {@code this} as formatted XML bytes with XML declaration. * - *

This object must be annotated with {@link javax.xml.bind.annotation.XmlRootElement}, + *

This object must be annotated with {@link jakarta.xml.bind.annotation.XmlRootElement}, * otherwise you should call {@link #toString()}. This method will verify that your object * strictly conforms to the schema defined in {@link XjcXmlTransformer}. Because the output is * streamed, {@link XmlException} will most likely be thrown after output has been written. diff --git a/core/src/main/java/google/registry/xjc/bindings.xjb b/core/src/main/java/google/registry/xjc/bindings.xjb index c46406180..89d8b96a5 100644 --- a/core/src/main/java/google/registry/xjc/bindings.xjb +++ b/core/src/main/java/google/registry/xjc/bindings.xjb @@ -1,12 +1,12 @@ - + version="3.0"> diff --git a/core/src/main/java/google/registry/xjc/package-info.java.in b/core/src/main/java/google/registry/xjc/package-info.java.in index fa19ab0ad..87136cc7d 100644 --- a/core/src/main/java/google/registry/xjc/package-info.java.in +++ b/core/src/main/java/google/registry/xjc/package-info.java.in @@ -2,92 +2,92 @@ elementFormDefault = XmlNsForm.QUALIFIED, namespace = "@NAMESPACE@", xmlns = { - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "epp", namespaceURI = "urn:ietf:params:xml:ns:epp-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "eppcom", namespaceURI = "urn:ietf:params:xml:ns:eppcom-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "contact", namespaceURI = "urn:ietf:params:xml:ns:contact-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "domain", namespaceURI = "urn:ietf:params:xml:ns:domain-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "dsig", namespaceURI = "http://www.w3.org/2000/09/xmldsig#"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "fee06", namespaceURI = "urn:ietf:params:xml:ns:fee-0.6"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "fee11", namespaceURI = "urn:ietf:params:xml:ns:fee-0.11"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "fee12", namespaceURI = "urn:ietf:params:xml:ns:fee-0.12"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "host", namespaceURI = "urn:ietf:params:xml:ns:host-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "iirdea", namespaceURI = "urn:ietf:params:xml:ns:iirdea-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "launch", namespaceURI = "urn:ietf:params:xml:ns:launch-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "mark", namespaceURI = "urn:ietf:params:xml:ns:mark-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rde", namespaceURI = "urn:ietf:params:xml:ns:rde-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeContact", namespaceURI = "urn:ietf:params:xml:ns:rdeContact-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeDomain", namespaceURI = "urn:ietf:params:xml:ns:rdeDomain-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeEppParams", namespaceURI = "urn:ietf:params:xml:ns:rdeEppParams-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeHeader", namespaceURI = "urn:ietf:params:xml:ns:rdeHeader-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeHost", namespaceURI = "urn:ietf:params:xml:ns:rdeHost-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeIDN", namespaceURI = "urn:ietf:params:xml:ns:rdeIDN-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeNNDN", namespaceURI = "urn:ietf:params:xml:ns:rdeNNDN-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeNotification", namespaceURI = "urn:ietf:params:xml:ns:rdeNotification-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdePolicy", namespaceURI = "urn:ietf:params:xml:ns:rdePolicy-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeRegistrar", namespaceURI = "urn:ietf:params:xml:ns:rdeRegistrar-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rdeReport", namespaceURI = "urn:ietf:params:xml:ns:rdeReport-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "rgp", namespaceURI = "urn:ietf:params:xml:ns:rgp-1.0"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "secDNS", namespaceURI = "urn:ietf:params:xml:ns:secDNS-1.1"), - @javax.xml.bind.annotation.XmlNs( + @jakarta.xml.bind.annotation.XmlNs( prefix = "smd", namespaceURI = "urn:ietf:params:xml:ns:signedMark-1.0"), }) @XmlAccessorType(XmlAccessType.FIELD) package google.registry.xjc.@PACKAGE@; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/core/src/main/java/google/registry/xml/DateAdapter.java b/core/src/main/java/google/registry/xml/DateAdapter.java index 4fd098e37..e9d0f39dc 100644 --- a/core/src/main/java/google/registry/xml/DateAdapter.java +++ b/core/src/main/java/google/registry/xml/DateAdapter.java @@ -17,9 +17,9 @@ package google.registry.xml; import static com.google.common.base.Strings.isNullOrEmpty; import static org.joda.time.DateTimeZone.UTC; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import javax.xml.bind.annotation.adapters.XmlAdapter; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; diff --git a/core/src/main/java/google/registry/xml/PeriodAdapter.java b/core/src/main/java/google/registry/xml/PeriodAdapter.java index 45f8ae62d..a9bdf7cda 100644 --- a/core/src/main/java/google/registry/xml/PeriodAdapter.java +++ b/core/src/main/java/google/registry/xml/PeriodAdapter.java @@ -16,8 +16,8 @@ package google.registry.xml; import static com.google.common.base.Strings.isNullOrEmpty; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.adapters.XmlAdapter; import org.joda.time.Period; /** Adapter to use Joda {@link Period} when marshalling XML. */ diff --git a/core/src/main/java/google/registry/xml/TrimWhitespaceAdapter.java b/core/src/main/java/google/registry/xml/TrimWhitespaceAdapter.java index 06b5c0116..3d3de2fa8 100644 --- a/core/src/main/java/google/registry/xml/TrimWhitespaceAdapter.java +++ b/core/src/main/java/google/registry/xml/TrimWhitespaceAdapter.java @@ -15,8 +15,8 @@ package google.registry.xml; import com.google.common.base.CharMatcher; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.adapters.XmlAdapter; /** * {@link XmlAdapter} which trims all whitespace surrounding a String. diff --git a/core/src/main/java/google/registry/xml/UtcDateTimeAdapter.java b/core/src/main/java/google/registry/xml/UtcDateTimeAdapter.java index f162fc8d5..0c1bd4123 100644 --- a/core/src/main/java/google/registry/xml/UtcDateTimeAdapter.java +++ b/core/src/main/java/google/registry/xml/UtcDateTimeAdapter.java @@ -17,9 +17,9 @@ package google.registry.xml; import static com.google.common.base.Strings.isNullOrEmpty; import static org.joda.time.DateTimeZone.UTC; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import javax.xml.bind.annotation.adapters.XmlAdapter; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; diff --git a/core/src/main/java/google/registry/xml/XmlException.java b/core/src/main/java/google/registry/xml/XmlException.java index fe8682864..504cc2b9e 100644 --- a/core/src/main/java/google/registry/xml/XmlException.java +++ b/core/src/main/java/google/registry/xml/XmlException.java @@ -17,7 +17,7 @@ package google.registry.xml; /** * An exception thrown by {@link XmlTransformer} when marshalling or unmarshalling fails. * - *

Upstream errors such as {@link javax.xml.bind.JAXBException} will be wrapped by this class. + *

Upstream errors such as {@link jakarta.xml.bind.JAXBException} will be wrapped by this class. */ public class XmlException extends Exception { diff --git a/core/src/main/java/google/registry/xml/XmlFragmentMarshaller.java b/core/src/main/java/google/registry/xml/XmlFragmentMarshaller.java index 2e8087f7f..bab568488 100644 --- a/core/src/main/java/google/registry/xml/XmlFragmentMarshaller.java +++ b/core/src/main/java/google/registry/xml/XmlFragmentMarshaller.java @@ -21,13 +21,13 @@ import static google.registry.xml.ValidationMode.STRICT; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.re2j.Pattern; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.MarshalException; +import jakarta.xml.bind.Marshaller; import java.io.ByteArrayOutputStream; import javax.annotation.concurrent.NotThreadSafe; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.MarshalException; -import javax.xml.bind.Marshaller; import javax.xml.validation.Schema; /** JAXB marshaller for building pieces of XML documents in a single thread. */ diff --git a/core/src/main/java/google/registry/xml/XmlTransformer.java b/core/src/main/java/google/registry/xml/XmlTransformer.java index ca0933c6d..7a04f109f 100644 --- a/core/src/main/java/google/registry/xml/XmlTransformer.java +++ b/core/src/main/java/google/registry/xml/XmlTransformer.java @@ -24,6 +24,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Closer; import com.google.common.io.Resources; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.helpers.DefaultValidationEventHandler; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -36,12 +42,6 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.helpers.DefaultValidationEventHandler; import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; @@ -175,9 +175,9 @@ public class XmlTransformer { /** * Streams {@code root} without XML declaration, optionally validating against the schema. * - *

The root object must be annotated with {@link javax.xml.bind.annotation.XmlRootElement}. If - * the validation parameter is set to {@link ValidationMode#STRICT} this method will verify that - * your object strictly conforms to {@link #schema}. Because the output is streamed, {@link + *

The root object must be annotated with {@link jakarta.xml.bind.annotation.XmlRootElement}. + * If the validation parameter is set to {@link ValidationMode#STRICT} this method will verify + * that your object strictly conforms to {@link #schema}. Because the output is streamed, {@link * XmlException} will most likely be thrown after output has been written. * * @param root the object to write @@ -200,10 +200,10 @@ public class XmlTransformer { /** * Validates and streams {@code root} as formatted XML bytes with XML declaration. * - *

The root object must be annotated with {@link javax.xml.bind.annotation.XmlRootElement}. If - * the validation parameter is set to {@link ValidationMode#STRICT} this method will verify that - * your object strictly conforms to {@link #schema}. Because the output is streamed, - * {@link XmlException} will most likely be thrown after output has been written. + *

The root object must be annotated with {@link jakarta.xml.bind.annotation.XmlRootElement}. + * If the validation parameter is set to {@link ValidationMode#STRICT} this method will verify + * that your object strictly conforms to {@link #schema}. Because the output is streamed, {@link + * XmlException} will most likely be thrown after output has been written. * * @param root the object to write * @param out byte-oriented output for writing XML. This method won't close it. @@ -227,7 +227,7 @@ public class XmlTransformer { /** * Validates and streams {@code root} as characters, always using strict validation. * - *

The root object must be annotated with {@link javax.xml.bind.annotation.XmlRootElement}. + *

The root object must be annotated with {@link jakarta.xml.bind.annotation.XmlRootElement}. * This method will verify that your object strictly conforms to {@link #schema}. Because the * output is streamed, {@link XmlException} will most likely be thrown after output has * been written. diff --git a/core/src/main/resources/META-INF/persistence.xml b/core/src/main/resources/META-INF/persistence.xml index 248055610..77d690e0a 100644 --- a/core/src/main/resources/META-INF/persistence.xml +++ b/core/src/main/resources/META-INF/persistence.xml @@ -87,30 +87,10 @@ google.registry.model.domain.RegistryLock - google.registry.persistence.converter.AllocationTokenListConverter - google.registry.persistence.converter.AllocationTokenStatusTransitionConverter - google.registry.persistence.converter.BillingCostTransitionConverter - google.registry.persistence.converter.BillingEventFlagSetConverter google.registry.persistence.converter.BloomFilterConverter - google.registry.persistence.converter.CidrAddressBlockListConverter - google.registry.persistence.converter.CommandNameSetConverter - google.registry.persistence.converter.CurrencyToBillingConverter google.registry.persistence.converter.CurrencyUnitConverter google.registry.persistence.converter.DateTimeConverter - google.registry.persistence.converter.DurationConverter - google.registry.persistence.converter.FeatureFlagStatusConverter - google.registry.persistence.converter.IdnTableEnumSetConverter - google.registry.persistence.converter.InetAddressSetConverter google.registry.persistence.converter.LocalDateConverter - google.registry.persistence.converter.PostalInfoChoiceListConverter - google.registry.persistence.converter.RegistrarPocSetConverter - google.registry.persistence.converter.RegistrarToRoleConverter - google.registry.persistence.converter.Spec11ThreatMatchThreatTypeSetConverter - google.registry.persistence.converter.StatusValueSetConverter - google.registry.persistence.converter.StringListConverter - google.registry.persistence.converter.StringSetConverter - google.registry.persistence.converter.TldStateTransitionConverter - google.registry.persistence.converter.TransferServerApproveEntitySetConverter google.registry.model.billing.VKeyConverter_BillingCancellation diff --git a/core/src/main/resources/google/registry/beam/billing/sql/cloud_sql_billing_events.sql b/core/src/main/resources/google/registry/beam/billing/sql/cloud_sql_billing_events.sql index 4825527c8..1da67c367 100644 --- a/core/src/main/resources/google/registry/beam/billing/sql/cloud_sql_billing_events.sql +++ b/core/src/main/resources/google/registry/beam/billing/sql/cloud_sql_billing_events.sql @@ -34,6 +34,8 @@ LEFT JOIN BillingCancellation cr ON b.cancellationMatchingBillingEvent = cr.bill WHERE r.billingAccountMap IS NOT NULL AND r.type = 'REAL' AND t.invoicingEnabled IS TRUE -AND b.billingTime BETWEEN CAST('%FIRST_TIMESTAMP_OF_MONTH%' AS timestamp) AND CAST('%LAST_TIMESTAMP_OF_MONTH%' AS timestamp) +AND CAST(b.billingTime AS timestamp) + BETWEEN CAST('%FIRST_TIMESTAMP_OF_MONTH%' AS timestamp) + AND CAST('%LAST_TIMESTAMP_OF_MONTH%' AS timestamp) AND c.id IS NULL AND cr.id IS NULL diff --git a/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java b/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java index f3ec47135..30b75e4e0 100644 --- a/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java +++ b/core/src/test/java/google/registry/beam/billing/InvoicingPipelineTest.java @@ -30,6 +30,7 @@ import static org.joda.money.CurrencyUnit.CAD; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; +import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -56,9 +57,11 @@ import java.io.Serial; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; +import java.util.Comparator; import java.util.Map.Entry; import java.util.Optional; import java.util.logging.Logger; +import java.util.stream.Collectors; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.PAssert; import org.apache.beam.sdk.transforms.Create; @@ -361,7 +364,9 @@ class InvoicingPipelineTest { WHERE r.billingAccountMap IS NOT NULL AND r.type = 'REAL' AND t.invoicingEnabled IS TRUE - AND b.billingTime BETWEEN CAST('2017-10-01' AS timestamp) AND CAST('2017-11-01' AS timestamp) + AND CAST(b.billingTime AS timestamp) + BETWEEN CAST('2017-10-01T00:00:00Z' AS timestamp) + AND CAST('2017-11-01T00:00:00Z' AS timestamp) AND c.id IS NULL AND cr.id IS NULL """); @@ -603,6 +608,8 @@ class InvoicingPipelineTest { PCollection, PCollection> { + private static final Splitter FLAG_SPLITTER = Splitter.on(' ').omitEmptyStrings(); + @Serial private static final long serialVersionUID = 2695033474967615250L; @Override @@ -628,8 +635,16 @@ class InvoicingPipelineTest { billingEvent.years(), billingEvent.currency(), billingEvent.amount(), - billingEvent.flags()))) + normalizeBillingEventFlags(billingEvent.flags())))) .setCoder(BillingEventCoder.ofNullable()); } + + // Returns flags in sorted order for easy comparison. + private static String normalizeBillingEventFlags(String flags) { + return FLAG_SPLITTER + .splitToStream(flags) + .sorted(Comparator.naturalOrder().reversed()) + .collect(Collectors.joining(" ")); + } } } diff --git a/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java b/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java index e47700104..164ec6638 100644 --- a/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java +++ b/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java @@ -106,7 +106,7 @@ public class RegistryJpaReadTest { RegistryJpaIO.read( "select d, r.emailAddress from Domain d join Registrar r on" + " d.currentSponsorRegistrarId = r.registrarId where r.type = :type" - + " and d.deletionTime > now()", + + " and d.deletionTime > CAST(now() AS timestamp)", ImmutableMap.of("type", Registrar.Type.REAL), false, (Object[] row) -> { @@ -150,7 +150,7 @@ public class RegistryJpaReadTest { RegistryJpaIO.read( "select d from Domain d join Registrar r on" + " d.currentSponsorRegistrarId = r.registrarId where r.type = :type" - + " and d.deletionTime > now()", + + " and d.deletionTime > CAST(now() AS timestamp)", ImmutableMap.of("type", Registrar.Type.REAL), Domain.class, Domain::getRepoId) diff --git a/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java index cdc0f16bb..087f7f0bd 100644 --- a/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java +++ b/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java @@ -77,6 +77,9 @@ public class DnsUpdateWriterTest { public final JpaIntegrationTestExtension jpa = new JpaTestExtensions.Builder().buildIntegrationTestExtension(); + // Base16 encoded sha1 digest. Must have 40 chars (20 bytes after decoding) + private static final String BASE16_SHA1_DIGEST = "0123".repeat(10); + @Mock private DnsMessageTransport mockResolver; @Captor private ArgumentCaptor updateCaptor; @@ -187,7 +190,7 @@ public class DnsUpdateWriterTest { .asBuilder() .setNameservers(ImmutableSet.of(persistActiveHost("ns1.example.tld").createVKey())) .setDsData( - ImmutableSet.of(DomainDsData.create(1, 3, 1, base16().decode("0123456789ABCDEF")))) + ImmutableSet.of(DomainDsData.create(1, 3, 1, base16().decode(BASE16_SHA1_DIGEST)))) .build(); persistResource(domain); @@ -205,7 +208,7 @@ public class DnsUpdateWriterTest { "example.tld.", Type.DS, Duration.ZERO.getStandardSeconds(), - "1 3 1 0123456789ABCDEF"); + "1 3 1 " + BASE16_SHA1_DIGEST); assertThatTotalUpdateSetsIs(update, 3); // The delete, the NS, and DS sets } @@ -222,7 +225,7 @@ public class DnsUpdateWriterTest { .asBuilder() .setNameservers(ImmutableSet.of(persistActiveHost("ns1.example.tld").createVKey())) .setDsData( - ImmutableSet.of(DomainDsData.create(1, 3, 1, base16().decode("0123456789ABCDEF")))) + ImmutableSet.of(DomainDsData.create(1, 3, 1, base16().decode(BASE16_SHA1_DIGEST)))) .build(); persistResource(domain); @@ -244,7 +247,7 @@ public class DnsUpdateWriterTest { "example.tld.", Type.DS, Duration.millis(400).getStandardSeconds(), - "1 3 1 0123456789ABCDEF"); + "1 3 1 " + BASE16_SHA1_DIGEST); assertThatTotalUpdateSetsIs(update, 3); // The delete, the NS, and DS sets } diff --git a/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java b/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java index 991b54358..5029d1d7e 100644 --- a/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java +++ b/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java @@ -22,8 +22,8 @@ import static org.joda.time.DateTimeZone.UTC; import google.registry.model.common.CrossTldSingleton; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; 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/model/ImmutableObjectTest.java b/core/src/test/java/google/registry/model/ImmutableObjectTest.java index 21ccb957c..683c2806d 100644 --- a/core/src/test/java/google/registry/model/ImmutableObjectTest.java +++ b/core/src/test/java/google/registry/model/ImmutableObjectTest.java @@ -29,6 +29,8 @@ import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.util.CidrAddressBlock; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.lang.reflect.Field; import java.util.ArrayDeque; import java.util.Arrays; @@ -37,8 +39,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; 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/model/UpdateAutoTimestampTest.java b/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java index 2b089c5c4..a61eb2398 100644 --- a/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java +++ b/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java @@ -24,8 +24,8 @@ import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.testing.FakeClock; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; 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/model/eppcommon/AddressTest.java b/core/src/test/java/google/registry/model/eppcommon/AddressTest.java index 8c64130ec..48b670c7a 100644 --- a/core/src/test/java/google/registry/model/eppcommon/AddressTest.java +++ b/core/src/test/java/google/registry/model/eppcommon/AddressTest.java @@ -25,19 +25,19 @@ import google.registry.model.ImmutableObject; import google.registry.model.eppcommon.AddressTest.TestEntity.TestAddress; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.io.StringReader; import java.io.StringWriter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java b/core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java index 34288da05..60f1bc3cf 100644 --- a/core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java +++ b/core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java @@ -23,8 +23,8 @@ import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationWithCoverageExtension; import google.registry.testing.FakeClock; import google.registry.testing.TestCacheExtension; +import jakarta.persistence.PersistenceException; import java.time.Duration; -import javax.persistence.PersistenceException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java b/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java index 9d8b7d42b..fde30de8a 100644 --- a/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java +++ b/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java @@ -24,20 +24,20 @@ import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; import java.lang.reflect.Method; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/HibernateSchemaExporterTest.java b/core/src/test/java/google/registry/persistence/HibernateSchemaExporterTest.java index 1b50861b1..4f2748a1a 100644 --- a/core/src/test/java/google/registry/persistence/HibernateSchemaExporterTest.java +++ b/core/src/test/java/google/registry/persistence/HibernateSchemaExporterTest.java @@ -17,13 +17,13 @@ package google.registry.persistence; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import javax.persistence.Entity; -import javax.persistence.Id; import org.joda.money.CurrencyUnit; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -62,7 +62,7 @@ class HibernateSchemaExporterTest { """ create table "TestEntity" ( - name text not null, + name text not null, cu text, primary key (name) ); diff --git a/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java b/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java index 550648628..4eb3f78b0 100644 --- a/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java +++ b/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java @@ -24,11 +24,11 @@ import google.registry.keyring.secretmanager.SecretManagerKeyringModule; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.privileges.secretmanager.SecretManagerModule; import google.registry.util.UtilsModule; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import java.util.Optional; import javax.inject.Provider; import javax.inject.Singleton; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; import org.hibernate.cfg.Environment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/google/registry/persistence/PersistenceXmlTest.java b/core/src/test/java/google/registry/persistence/PersistenceXmlTest.java index fce5f7b3e..c0fcef876 100644 --- a/core/src/test/java/google/registry/persistence/PersistenceXmlTest.java +++ b/core/src/test/java/google/registry/persistence/PersistenceXmlTest.java @@ -20,9 +20,9 @@ import static com.google.common.truth.Truth.assertWithMessage; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Entity; import java.util.Collections; -import javax.persistence.AttributeConverter; -import javax.persistence.Entity; import org.junit.jupiter.api.Test; /** Unit tests to verify persistence.xml is valid. */ diff --git a/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverterTest.java b/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java similarity index 88% rename from core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java index 44960124f..ebcad79f5 100644 --- a/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java @@ -28,14 +28,15 @@ import google.registry.model.common.TimedTransitionProperty; import google.registry.model.domain.token.AllocationToken.TokenStatus; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import org.hibernate.annotations.Type; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link AllocationTokenStatusTransitionConverter}. */ -public class AllocationTokenStatusTransitionConverterTest { +/** Unit tests for {@link AllocationTokenStatusTransitionUserType}. */ +public class AllocationTokenStatusTransitionUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpa = @@ -64,7 +65,8 @@ public class AllocationTokenStatusTransitionConverterTest { () -> tm().getEntityManager() .find(AllocationTokenStatusTransitionConverterTestEntity.class, "id")); - assertThat(persisted.timedTransitionProperty).containsExactlyEntriesIn(timedTransitionProperty); + assertThat(persisted.timedTransitionProperty.toValueMap()) + .containsExactlyEntriesIn(timedTransitionProperty.toValueMap()); } @Entity @@ -72,6 +74,7 @@ public class AllocationTokenStatusTransitionConverterTest { @Id String name = "id"; + @Type(AllocationTokenStatusTransitionUserType.class) TimedTransitionProperty timedTransitionProperty; private AllocationTokenStatusTransitionConverterTestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/AllocationTokenListConverterTest.java b/core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java similarity index 91% rename from core/src/test/java/google/registry/persistence/converter/AllocationTokenListConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java index 301e3f3f4..903ba0e23 100644 --- a/core/src/test/java/google/registry/persistence/converter/AllocationTokenListConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java @@ -26,14 +26,15 @@ import google.registry.model.domain.token.AllocationToken; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import org.hibernate.annotations.Type; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link google.registry.persistence.converter.AllocationTokenListConverter}. */ -public class AllocationTokenListConverterTest { +/** Unit tests for {@link AllocationTokenVkeyListUserType}. */ +public class AllocationTokenVkeyListUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = @@ -60,6 +61,7 @@ public class AllocationTokenListConverterTest { static class TestAllocationTokenVKeyList extends ImmutableObject { @Id String id = "id"; + @Type(AllocationTokenVkeyListUserType.class) List> tokenList; TestAllocationTokenVKeyList() {} diff --git a/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java b/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java similarity index 86% rename from core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java index e5b462481..05391e69b 100644 --- a/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java @@ -25,15 +25,16 @@ import google.registry.model.ImmutableObject; import google.registry.model.common.TimedTransitionProperty; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import org.hibernate.annotations.Type; import org.joda.money.Money; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link BillingCostTransitionConverter}. */ -public class BillingCostTransitionConverterTest { +/** Unit tests for {@link BillingCostTransitionUserType}. */ +public class BillingCostTransitionUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpa = @@ -54,7 +55,8 @@ public class BillingCostTransitionConverterTest { insertInDb(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); - assertThat(persisted.timedTransitionProperty).containsExactlyEntriesIn(timedTransitionProperty); + assertThat(persisted.timedTransitionProperty.toValueMap()) + .containsExactlyEntriesIn(timedTransitionProperty.toValueMap()); } @Entity(name = "TestEntity") @@ -62,6 +64,7 @@ public class BillingCostTransitionConverterTest { @Id String name = "id"; + @Type(BillingCostTransitionUserType.class) TimedTransitionProperty timedTransitionProperty; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java index 61fcc462d..bbaf9d735 100644 --- a/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java @@ -24,8 +24,8 @@ import com.google.common.hash.BloomFilter; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/converter/CidrAddressBlockListConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java similarity index 91% rename from core/src/test/java/google/registry/persistence/converter/CidrAddressBlockListConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java index 9a4e675f4..6fe1c70a6 100644 --- a/core/src/test/java/google/registry/persistence/converter/CidrAddressBlockListConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java @@ -23,14 +23,15 @@ import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.util.CidrAddressBlock; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import org.hibernate.annotations.Type; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link CidrAddressBlockListConverter}. */ -public class CidrAddressBlockListConverterTest { +/** Unit tests for {@link CidrBlockListUserType}. */ +public class CidrBlockListUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = @@ -57,6 +58,7 @@ public class CidrAddressBlockListConverterTest { @Id String name = "id"; + @Type(CidrBlockListUserType.class) List addresses; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/CurrencyToBillingConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java similarity index 90% rename from core/src/test/java/google/registry/persistence/converter/CurrencyToBillingConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java index d7461707c..74aea4f39 100644 --- a/core/src/test/java/google/registry/persistence/converter/CurrencyToBillingConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java @@ -22,15 +22,16 @@ import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import org.hibernate.annotations.Type; import org.joda.money.CurrencyUnit; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link CurrencyToBillingConverter}. */ -public class CurrencyToBillingConverterTest { +/** Unit tests for {@link CurrencyToStringMapUserType}. */ +public class CurrencyToStringMapUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = @@ -54,6 +55,7 @@ public class CurrencyToBillingConverterTest { @Id String name = "id"; + @Type(CurrencyToStringMapUserType.class) Map currencyToBilling; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java index ae2d8e6fe..7809dbb3f 100644 --- a/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java @@ -22,9 +22,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import org.joda.money.CurrencyUnit; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java b/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java index bb6761ef9..826235286 100644 --- a/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java @@ -17,13 +17,15 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.insertInDb; +import static java.time.ZoneOffset.UTC; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import java.sql.Timestamp; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import java.time.Instant; +import java.time.ZonedDateTime; import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; import org.junit.jupiter.api.Test; @@ -46,7 +48,7 @@ public class DateTimeConverterTest { @Test void convertToDatabaseColumn_convertsCorrectly() { DateTime dateTime = DateTime.parse("2019-09-01T01:01:01"); - assertThat(converter.convertToDatabaseColumn(dateTime).getTime()) + assertThat(converter.convertToDatabaseColumn(dateTime).toInstant().toEpochMilli()) .isEqualTo(dateTime.getMillis()); } @@ -59,7 +61,10 @@ public class DateTimeConverterTest { void convertToEntityAttribute_convertsCorrectly() { DateTime dateTime = DateTime.parse("2019-09-01T01:01:01Z"); long millis = dateTime.getMillis(); - assertThat(converter.convertToEntityAttribute(new Timestamp(millis))).isEqualTo(dateTime); + assertThat( + converter.convertToEntityAttribute( + ZonedDateTime.ofInstant(Instant.ofEpochMilli(millis), UTC))) + .isEqualTo(dateTime); } static DateTime parseDateTime(String value) { diff --git a/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java b/core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java similarity index 79% rename from core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java index d26907543..f49cd6f56 100644 --- a/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java @@ -21,15 +21,14 @@ import static google.registry.testing.DatabaseHelper.insertInDb; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.joda.time.Duration; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.postgresql.util.PGInterval; -/** Unit tests for {@link DurationConverter}. */ -public class DurationConverterTest { +/** Unit tests for {@link DurationUserType}. */ +public class DurationUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = @@ -37,12 +36,23 @@ public class DurationConverterTest { .withEntityClass(DurationTestEntity.class) .buildUnitTestExtension(); - private final DurationConverter converter = new DurationConverter(); - @Test void testNulls() { - assertThat(converter.convertToDatabaseColumn(null)).isEqualTo(new PGInterval()); - assertThat(converter.convertToEntityAttribute(new PGInterval())).isNull(); + DurationTestEntity entity = new DurationTestEntity(null); + insertInDb(entity); + DurationTestEntity persisted = + tm().transact(() -> tm().getEntityManager().find(DurationTestEntity.class, "id")); + assertThat(persisted.duration).isNull(); + assertThat( + tm().transact( + () -> { + return (Boolean) + tm().getEntityManager() + .createNativeQuery( + "SELECT (duration is NULL) FROM \"TestEntity\" WHERE name = 'id'") + .getSingleResult(); + })) + .isTrue(); } @Test diff --git a/core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java similarity index 92% rename from core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java index fb5456271..7179f6fb6 100644 --- a/core/src/test/java/google/registry/persistence/converter/InetAddressSetConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java @@ -24,16 +24,17 @@ import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.net.InetAddress; import java.util.Set; import javax.annotation.Nullable; -import javax.persistence.Entity; -import javax.persistence.Id; +import org.hibernate.annotations.Type; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link google.registry.persistence.converter.InetAddressSetConverter}. */ -public class InetAddressSetConverterTest { +/** Unit tests for {@link InetAddressSetUserType}. */ +public class InetAddressSetUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpa = @@ -74,6 +75,7 @@ public class InetAddressSetConverterTest { @Id String name = "id"; + @Type(InetAddressSetUserType.class) Set addresses; private InetAddressSetTestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java b/core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java similarity index 90% rename from core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java index 01ed8b79f..394b94790 100644 --- a/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java @@ -22,22 +22,21 @@ import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.sql.SQLException; import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.PersistenceException; -import org.hibernate.annotations.Columns; -import org.hibernate.annotations.Type; import org.joda.money.CurrencyUnit; import org.joda.money.IllegalCurrencyException; import org.joda.money.Money; @@ -45,7 +44,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; /** Unit tests for embeddable {@link JodaMoneyType}. */ -public class JodaMoneyConverterTest { +public class JodaMoneyTypeTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = @@ -141,7 +140,7 @@ public class JodaMoneyConverterTest { () -> tm().getEntityManager() .createNativeQuery( - "SELECT map_amount, map_currency FROM \"MoneyMap\"" + "SELECT amount, currency FROM \"MoneyMap\"" + " WHERE entity_name = 'id' AND map_key = 'dos'") .getResultList()); ComplexTestEntity persisted = @@ -219,9 +218,7 @@ public class JodaMoneyConverterTest { .getResultList())); assertThat(thrown) .hasMessageThat() - .isEqualTo( - "org.hibernate.HibernateException: Mismatching null state between currency 'USD' and" - + " amount 'null'"); + .isEqualTo("Mismatching null state between currency 'USD' and amount 'null'"); } @Test @@ -264,8 +261,6 @@ public class JodaMoneyConverterTest { @Id String name = "id"; - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "amount"), @Column(name = "currency")}) Money money; public TestEntity() {} @@ -285,16 +280,14 @@ public class JodaMoneyConverterTest { @ElementCollection(fetch = FetchType.EAGER) @CollectionTable(name = "MoneyMap", joinColumns = @JoinColumn(name = "entity_name")) @MapKeyColumn(name = "map_key") - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "map_amount"), @Column(name = "map_currency")}) Map moneyMap; - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "my_amount"), @Column(name = "my_currency")}) + @AttributeOverride(name = "amount", column = @Column(name = "my_amount")) + @AttributeOverride(name = "currency", column = @Column(name = "my_currency")) Money myMoney; - @Type(type = JodaMoneyType.TYPE_NAME) - @Columns(columns = {@Column(name = "your_amount"), @Column(name = "your_currency")}) + @AttributeOverride(name = "amount", column = @Column(name = "your_amount")) + @AttributeOverride(name = "currency", column = @Column(name = "your_currency")) Money yourMoney; public ComplexTestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java b/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java index 7d051de49..aa32151fe 100644 --- a/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java @@ -22,8 +22,8 @@ import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.joda.time.LocalDate; import org.joda.time.format.ISODateTimeFormat; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleConverterTest.java b/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java similarity index 89% rename from core/src/test/java/google/registry/persistence/converter/RegistrarToRoleConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java index 68168f995..927fff923 100644 --- a/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java @@ -23,14 +23,15 @@ import google.registry.model.console.RegistrarRole; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.testing.DatabaseHelper; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import org.hibernate.annotations.Type; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Tests for {@link RegistrarToRoleConverter}. */ -public class RegistrarToRoleConverterTest { +/** Tests for {@link RegistrarToRoleMapUserType}. */ +public class RegistrarToRoleMapUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpa = @@ -57,6 +58,7 @@ public class RegistrarToRoleConverterTest { @Id String name = "id"; + @Type(RegistrarToRoleMapUserType.class) Map map; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java deleted file mode 100644 index 96b72770f..000000000 --- a/core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2020 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.persistence.converter; - -import static com.google.common.truth.Truth.assertThat; -import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; - -import com.google.common.collect.ImmutableSet; -import google.registry.model.ImmutableObject; -import google.registry.model.eppcommon.StatusValue; -import google.registry.persistence.transaction.JpaTestExtensions; -import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; - -/** Unit tests for {@link StatusValueSetConverter}. */ -public class StatusValueSetConverterTest { - - @RegisterExtension - public final JpaUnitTestExtension jpaExtension = - new JpaTestExtensions.Builder().withEntityClass(TestEntity.class).buildUnitTestExtension(); - - @Test - void testRoundTrip() { - Set enums = ImmutableSet.of(StatusValue.INACTIVE, StatusValue.PENDING_DELETE); - TestEntity obj = new TestEntity("foo", enums); - - insertInDb(obj); - TestEntity persisted = - tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "foo")); - assertThat(persisted.data).isEqualTo(enums); - } - - @Entity(name = "TestEntity") - static class TestEntity extends ImmutableObject { - @Id String name; - - Set data; - - TestEntity() {} - - TestEntity(String name, Set data) { - this.name = name; - this.data = data; - } - } -} diff --git a/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java new file mode 100644 index 000000000..3e977918e --- /dev/null +++ b/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java @@ -0,0 +1,157 @@ +// Copyright 2020 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.persistence.converter; + +import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.truth.Truth.assertThat; +import static google.registry.persistence.transaction.TransactionManagerFactory.tm; +import static google.registry.testing.DatabaseHelper.insertInDb; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import com.google.common.collect.ImmutableList; +import google.registry.model.ImmutableObject; +import google.registry.persistence.transaction.JpaTestExtensions; +import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import java.util.List; +import java.util.stream.Stream; +import org.hibernate.annotations.Type; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +/** Unit tests for {@link StringCollectionUserType}. */ +public class StringCollectionUserTypeTest { + + @RegisterExtension + public final JpaUnitTestExtension jpaExtension = + new JpaTestExtensions.Builder().withEntityClass(TestEntity.class).buildUnitTestExtension(); + + @Test + void roundTripConversion_returnsSameStringList() { + List value = + ImmutableList.of(new ListElement("app"), new ListElement("dev"), new ListElement("com")); + TestEntity testEntity = new TestEntity(value); + insertInDb(testEntity); + TestEntity persisted = + tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); + assertThat(persisted.value).containsExactlyElementsIn(value); + } + + @Test + void testMerge_succeeds() { + List value = + ImmutableList.of(new ListElement("app"), new ListElement("dev"), new ListElement("com")); + TestEntity testEntity = new TestEntity(value); + insertInDb(testEntity); + TestEntity persisted = + tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); + persisted.value = ImmutableList.of(new ListElement("app"), new ListElement("org")); + tm().transact(() -> tm().getEntityManager().merge(persisted)); + TestEntity updated = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); + assertThat(updated.value).containsExactly(new ListElement("app"), new ListElement("org")); + } + + @Test + void testNullValue_writesAndReadsNullSuccessfully() { + TestEntity testEntity = new TestEntity(null); + insertInDb(testEntity); + TestEntity persisted = + tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); + assertThat(persisted.value).isNull(); + } + + @Test + void testEmptyCollection_writesAndReadsEmptyCollectionSuccessfully() { + TestEntity testEntity = new TestEntity(ImmutableList.of()); + insertInDb(testEntity); + TestEntity persisted = + tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); + assertThat(persisted.value).isEmpty(); + } + + @Test + void testNativeQuery_succeeds() throws Exception { + executeNativeQuery("INSERT INTO \"TestEntity\" (name, value) VALUES ('id', '{app, dev}')"); + + assertThat( + getSingleResultFromNativeQuery("SELECT value[1] FROM \"TestEntity\" WHERE name = 'id'")) + .isEqualTo("app"); + assertThat( + getSingleResultFromNativeQuery("SELECT value[2] FROM \"TestEntity\" WHERE name = 'id'")) + .isEqualTo("dev"); + + executeNativeQuery("UPDATE \"TestEntity\" SET value = '{com, gov}' WHERE name = 'id'"); + + assertThat( + getSingleResultFromNativeQuery("SELECT value[1] FROM \"TestEntity\" WHERE name = 'id'")) + .isEqualTo("com"); + assertThat( + getSingleResultFromNativeQuery("SELECT value[2] FROM \"TestEntity\" WHERE name = 'id'")) + .isEqualTo("gov"); + + executeNativeQuery("DELETE FROM \"TestEntity\" WHERE name = 'id'"); + assertThrows( + NoResultException.class, + () -> + getSingleResultFromNativeQuery( + "SELECT value[1] FROM \"TestEntity\" WHERE name = 'id'")); + } + + private static Object getSingleResultFromNativeQuery(String sql) { + return tm().transact(() -> tm().getEntityManager().createNativeQuery(sql).getSingleResult()); + } + + private static Object executeNativeQuery(String sql) { + return tm().transact(() -> tm().getEntityManager().createNativeQuery(sql).executeUpdate()); + } + + private static record ListElement(String value) {} + + private static class TestListUserType + extends StringCollectionUserType> { + + @Override + String[] toJdbcObject(List collection) { + return collection.stream().map(ListElement::value).toList().toArray(new String[0]); + } + + @Override + List toEntity(String[] data) { + return Stream.of(data).map(ListElement::new).collect(toImmutableList()); + } + + @Override + public Class> returnedClass() { + return (Class>) ((Object) List.class); + } + } + + @Entity(name = "TestEntity") // Override entity name to avoid the nested class reference. + private static class TestEntity extends ImmutableObject { + + @Id String name = "id"; + + @Type(TestListUserType.class) + List value; + + private TestEntity() {} + + private TestEntity(List value) { + this.value = value; + } + } +} diff --git a/core/src/test/java/google/registry/persistence/converter/StringListConverterTest.java b/core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java similarity index 95% rename from core/src/test/java/google/registry/persistence/converter/StringListConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java index 55d7d6e5f..334f0c31d 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringListConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java @@ -23,15 +23,15 @@ import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link StringListConverter}. */ -public class StringListConverterTest { +/** Unit tests for {@code List} conversion using Hibernate 6 builtin support. */ +public class StringListConversionTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = diff --git a/core/src/test/java/google/registry/persistence/converter/StringMapConverterBaseTest.java b/core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java similarity index 70% rename from core/src/test/java/google/registry/persistence/converter/StringMapConverterBaseTest.java rename to core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java index d19be63ff..94844b2b0 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringMapConverterBaseTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java @@ -23,28 +23,26 @@ import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; import java.util.Map; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; +import org.hibernate.annotations.Type; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link StringMapConverterBase}. */ -public class StringMapConverterBaseTest { +/** Unit tests for {@link StringMapUserType}. */ +public class StringMapUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = - new JpaTestExtensions.Builder() - .withEntityClass(TestStringMapConverter.class, TestEntity.class) - .buildUnitTestExtension(); + new JpaTestExtensions.Builder().withEntityClass(TestEntity.class).buildUnitTestExtension(); - private static final ImmutableMap MAP = + private static final ImmutableMap MAP = ImmutableMap.of( - new Key("key1"), new Value("value1"), - new Key("key2"), new Value("value2"), - new Key("key3"), new Value("value3")); + "key1", "value1", + "key2", "value2", + "key3", "value3"); @Test void roundTripConversion_returnsSameMap() { @@ -62,10 +60,10 @@ public class StringMapConverterBaseTest { TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.map).containsExactlyEntriesIn(MAP); - persisted.map = ImmutableMap.of(new Key("key4"), new Value("value4")); + persisted.map = ImmutableMap.of("key4", "value4"); tm().transact(() -> tm().getEntityManager().merge(persisted)); TestEntity updated = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); - assertThat(updated.map).containsExactly(new Key("key4"), new Value("value4")); + assertThat(updated.map).containsExactly("key4", "value4"); } @Test @@ -123,62 +121,17 @@ public class StringMapConverterBaseTest { return tm().transact(() -> tm().getEntityManager().createNativeQuery(sql).executeUpdate()); } - private static class Key extends ImmutableObject { - private final String key; - - private Key(String key) { - this.key = key; - } - } - - private static class Value extends ImmutableObject { - private final String value; - - private Value(String value) { - this.value = value; - } - } - - @Converter(autoApply = true) - private static class TestStringMapConverter - extends StringMapConverterBase> { - - @Override - protected String convertKeyToString(Key key) { - return key.key; - } - - @Override - protected String convertValueToString(Value value) { - return value.value; - } - - @Override - protected Key convertStringToKey(String string) { - return new Key(string); - } - - @Override - protected Value convertStringToValue(String string) { - return new Value(string); - } - - @Override - protected Map convertMapToDerivedType(Map map) { - return map; - } - } - @Entity(name = "TestEntity") // Override entity name to avoid the nested class reference. private static class TestEntity extends ImmutableObject { @Id String name = "id"; - Map map; + @Type(StringMapUserType.class) + Map map; private TestEntity() {} - private TestEntity(Map map) { + private TestEntity(Map map) { this.map = map; } } diff --git a/core/src/test/java/google/registry/persistence/converter/StringSetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java similarity index 93% rename from core/src/test/java/google/registry/persistence/converter/StringSetConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java index 9d7e49266..c720723f8 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringSetConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java @@ -22,14 +22,14 @@ import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link StringSetConverter}. */ -public class StringSetConverterTest { +/** Unit tests for {@code Set} modeling using Hibernate 6 builtin support. */ +public class StringSetConversionTest { @RegisterExtension public final JpaUnitTestExtension jpaExtension = diff --git a/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java b/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java index 1ecfeb36b..23b786ce8 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java @@ -22,10 +22,10 @@ import google.registry.model.ImmutableObject; import google.registry.model.registrar.RegistrarBase.State; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBaseTest.java b/core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java similarity index 84% rename from core/src/test/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBaseTest.java rename to core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java index 49f9c3c86..ee2dca1c2 100644 --- a/core/src/test/java/google/registry/persistence/converter/TimedTransitionPropertyConverterBaseTest.java +++ b/core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java @@ -25,22 +25,20 @@ import google.registry.model.ImmutableObject; import google.registry.model.common.TimedTransitionProperty; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import org.hibernate.annotations.Type; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link TimedTransitionPropertyConverterBase}. */ -class TimedTransitionPropertyConverterBaseTest { +/** Unit tests for {@link TimedTransitionBaseUserType}. */ +class TimedTransitionBaseUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpa = - new JpaTestExtensions.Builder() - .withEntityClass(TestTimedTransitionPropertyConverter.class, TestEntity.class) - .buildUnitTestExtension(); + new JpaTestExtensions.Builder().withEntityClass(TestEntity.class).buildUnitTestExtension(); private static final DateTime DATE_1 = DateTime.parse("2001-01-01T00:00:00.000Z"); private static final DateTime DATE_2 = DateTime.parse("2002-01-01T00:00:00.000Z"); @@ -60,7 +58,8 @@ class TimedTransitionPropertyConverterBaseTest { insertInDb(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); - assertThat(persisted.property).containsExactlyEntriesIn(TIMED_TRANSITION_PROPERTY); + assertThat(persisted.property.toValueMap()) + .containsExactlyEntriesIn(TIMED_TRANSITION_PROPERTY.toValueMap()); } @Test @@ -69,12 +68,13 @@ class TimedTransitionPropertyConverterBaseTest { insertInDb(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); - assertThat(persisted.property).containsExactlyEntriesIn(TIMED_TRANSITION_PROPERTY); + assertThat(persisted.property.toValueMap()) + .containsExactlyEntriesIn(TIMED_TRANSITION_PROPERTY.toValueMap()); ImmutableSortedMap newValues = ImmutableSortedMap.of(START_OF_TIME, "val4"); persisted.property = TimedTransitionProperty.fromValueMap(newValues); tm().transact(() -> tm().getEntityManager().merge(persisted)); TestEntity updated = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); - assertThat(updated.property).isEqualTo(newValues); + assertThat(updated.property.toValueMap()).isEqualTo(newValues); } @Test @@ -126,17 +126,15 @@ class TimedTransitionPropertyConverterBaseTest { tm().transact(() -> tm().getEntityManager().createNativeQuery(sql).executeUpdate()); } - @Converter(autoApply = true) - private static class TestTimedTransitionPropertyConverter - extends TimedTransitionPropertyConverterBase { + private static class StringTransitionUserType extends TimedTransitionBaseUserType { @Override - protected String convertValueToString(String value) { + String valueToString(String value) { return value; } @Override - protected String convertStringToValue(String string) { + String stringToValue(String string) { return string; } } @@ -146,6 +144,7 @@ class TimedTransitionPropertyConverterBaseTest { @Id String name = "id"; + @Type(StringTransitionUserType.class) TimedTransitionProperty property; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java b/core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java similarity index 87% rename from core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java index 27bb5ba9a..eba557ce2 100644 --- a/core/src/test/java/google/registry/persistence/converter/TldStateTransitionConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java @@ -25,14 +25,15 @@ import google.registry.model.common.TimedTransitionProperty; import google.registry.model.tld.Tld.TldState; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import org.hibernate.annotations.Type; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -/** Unit tests for {@link TldStateTransitionConverter}. */ -class TldStateTransitionConverterTest { +/** Unit tests for {@link TldStateTransitionUserType}. */ +class TldStateTransitionUserTypeTest { @RegisterExtension public final JpaUnitTestExtension jpa = @@ -57,7 +58,8 @@ class TldStateTransitionConverterTest { insertInDb(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); - assertThat(persisted.timedTransitionProperty).containsExactlyEntriesIn(timedTransitionProperty); + assertThat(persisted.timedTransitionProperty.toValueMap()) + .containsExactlyEntriesIn(timedTransitionProperty.toValueMap()); } @Entity(name = "TestEntity") @@ -65,6 +67,7 @@ class TldStateTransitionConverterTest { @Id String name = "id"; + @Type(TldStateTransitionUserType.class) TimedTransitionProperty timedTransitionProperty; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java b/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java index 291fd9715..bdd34ad6c 100644 --- a/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java @@ -23,8 +23,8 @@ import google.registry.persistence.VKey; import google.registry.persistence.WithVKey; import google.registry.persistence.transaction.JpaTestExtensions; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java b/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java index 85685105e..0a318a66b 100644 --- a/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java @@ -22,10 +22,10 @@ import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.testing.FakeClock; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.criteria.CriteriaQuery; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.criteria.CriteriaQuery; 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/persistence/transaction/HibernateLoggingSuppressionTest.java b/core/src/test/java/google/registry/persistence/transaction/HibernateLoggingSuppressionTest.java index 1c90d633a..ca21d8aae 100644 --- a/core/src/test/java/google/registry/persistence/transaction/HibernateLoggingSuppressionTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/HibernateLoggingSuppressionTest.java @@ -22,13 +22,13 @@ import static java.util.logging.Logger.getLogger; import com.google.common.testing.TestLogHandler; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; -import javax.persistence.Entity; -import javax.persistence.Id; 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/persistence/transaction/JpaEntityCoverageExtension.java b/core/src/test/java/google/registry/persistence/transaction/JpaEntityCoverageExtension.java index 2105ff282..ff649f5df 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaEntityCoverageExtension.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaEntityCoverageExtension.java @@ -23,12 +23,12 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import google.registry.persistence.PersistenceXmlUtility; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.SQLException; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java index 929e9b7e9..fab3006e9 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java @@ -42,6 +42,8 @@ import google.registry.persistence.PersistenceXmlUtility; import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.util.Clock; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -58,8 +60,6 @@ import java.util.Optional; import java.util.Properties; import java.util.TimeZone; import java.util.stream.Stream; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; import org.hibernate.cfg.Environment; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.hibernate.jpa.boot.spi.Bootstrap; diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java index 1d47321f8..4db3fb6cc 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java @@ -22,10 +22,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java index 17ea806fa..07c23c8f7 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java @@ -44,16 +44,15 @@ import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.testing.DatabaseHelper; import google.registry.testing.FakeClock; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.RollbackException; import java.io.Serializable; -import java.math.BigInteger; import java.util.NoSuchElementException; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.function.Executable; @@ -834,8 +833,8 @@ class JpaTransactionManagerImplTest { private static int countTable(String tableName) { return tm().transact( () -> { - BigInteger colCount = - (BigInteger) + Long colCount = + (Long) tm().getEntityManager() .createNativeQuery(String.format("SELECT COUNT(*) FROM %s", tableName)) .getSingleResult(); diff --git a/core/src/test/java/google/registry/persistence/transaction/QueryComposerTest.java b/core/src/test/java/google/registry/persistence/transaction/QueryComposerTest.java index b014ce561..a0508741e 100644 --- a/core/src/test/java/google/registry/persistence/transaction/QueryComposerTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/QueryComposerTest.java @@ -24,12 +24,12 @@ import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.testing.DatabaseHelper; import google.registry.testing.FakeClock; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; 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/persistence/transaction/TransactionManagerTest.java b/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java index 7ea6bbd61..d75499df0 100644 --- a/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java @@ -26,14 +26,14 @@ import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; import google.registry.persistence.transaction.JpaTestExtensions.JpaUnitTestExtension; import google.registry.testing.FakeClock; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.util.List; import java.util.NoSuchElementException; import java.util.Set; import java.util.stream.Stream; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; 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/testing/DatabaseHelper.java b/core/src/test/java/google/registry/testing/DatabaseHelper.java index 8a33e22e1..6432c3630 100644 --- a/core/src/test/java/google/registry/testing/DatabaseHelper.java +++ b/core/src/test/java/google/registry/testing/DatabaseHelper.java @@ -1205,7 +1205,7 @@ public final class DatabaseHelper { () -> { ImmutableList> entityClasses = tm().getEntityManager().getMetamodel().getEntities().stream() - .map(javax.persistence.metamodel.Type::getJavaType) + .map(jakarta.persistence.metamodel.Type::getJavaType) .collect(toImmutableList()); ImmutableList.Builder result = new ImmutableList.Builder<>(); for (Class entityClass : entityClasses) { diff --git a/core/src/test/java/google/registry/testing/SqlHelper.java b/core/src/test/java/google/registry/testing/SqlHelper.java index 04d16ad27..aa5ddb682 100644 --- a/core/src/test/java/google/registry/testing/SqlHelper.java +++ b/core/src/test/java/google/registry/testing/SqlHelper.java @@ -24,9 +24,9 @@ import com.google.common.collect.ImmutableList; import google.registry.model.domain.RegistryLock; import google.registry.model.registrar.Registrar; import google.registry.model.tld.RegistryLockDao; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Optional; -import javax.persistence.PersistenceException; import org.junit.jupiter.api.function.Executable; /** Static utils for setting up and retrieving test resources from the SQL database. */ diff --git a/core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java b/core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java index 869708a21..0c546baeb 100644 --- a/core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java +++ b/core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java @@ -30,7 +30,7 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.host.Host; import google.registry.persistence.VKey; import google.registry.testing.DatabaseHelper; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; +import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/db/buildscript-gradle.lockfile b/db/buildscript-gradle.lockfile index 34140183c..786bb4b1b 100644 --- a/db/buildscript-gradle.lockfile +++ b/db/buildscript-gradle.lockfile @@ -9,6 +9,6 @@ com.fasterxml.jackson:jackson-bom:2.15.2=classpath com.google.code.gson:gson:2.10.1=classpath gradle.plugin.org.flywaydb:gradle-plugin-publishing:10.13.0=classpath org.flywaydb.flyway:org.flywaydb.flyway.gradle.plugin:10.13.0=classpath -org.flywaydb:flyway-core:10.15.2=classpath -org.flywaydb:flyway-database-postgresql:10.15.2=classpath +org.flywaydb:flyway-core:10.17.0=classpath +org.flywaydb:flyway-database-postgresql:10.17.0=classpath empty= diff --git a/db/gradle.lockfile b/db/gradle.lockfile index 485ad26f8..9aa6f4521 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -9,9 +9,9 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.15.2=compileClasspath com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -61,7 +61,7 @@ com.google.j2objc:j2objc-annotations:2.8=deploy_jar,runtimeClasspath,testRuntime com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath com.google.oauth-client:google-oauth-client:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor -com.google.truth:truth:1.4.3=testCompileClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:9.3=checkstyle commons-beanutils:commons-beanutils:1.9.4=checkstyle commons-codec:commons-codec:1.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -89,8 +89,8 @@ org.checkerframework:checker-compat-qual:2.5.3=testCompileClasspath,testRuntimeC org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor org.checkerframework:checker-qual:3.42.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-core:10.17.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt @@ -99,11 +99,11 @@ org.jacoco:org.jacoco.report:0.8.11=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -120,9 +120,9 @@ 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 org.slf4j:slf4j-api:2.0.13=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=testCompileClasspath,testRuntimeClasspath empty=implementationApi,schema diff --git a/db/src/main/resources/sql/schema/db-schema.sql.generated b/db/src/main/resources/sql/schema/db-schema.sql.generated index e9014cfb6..2e516d4aa 100644 --- a/db/src/main/resources/sql/schema/db-schema.sql.generated +++ b/db/src/main/resources/sql/schema/db-schema.sql.generated @@ -13,148 +13,148 @@ -- limitations under the License. create table "AllocationToken" ( - token text not null, - update_timestamp timestamptz, + token text not null, + update_timestamp timestamp(6) with time zone, allowed_registrar_ids text[], allowed_epp_actions text[], allowed_tlds text[], - creation_time timestamptz not null, - discount_fraction float8 not null, + creation_time timestamp(6) with time zone not null, + discount_fraction float(53) not null, discount_premiums boolean not null, - discount_years int4 not null, + discount_years integer not null, domain_name text, redemption_domain_repo_id text, - redemption_domain_history_id int8, - registration_behavior text not null, - renewal_price_amount numeric(19, 2), + redemption_domain_history_id bigint, + registration_behavior text not null check (registration_behavior in ('DEFAULT','BYPASS_TLD_STATE','ANCHOR_TENANT','NONPREMIUM_CREATE')), + renewal_price_amount numeric(19,2), renewal_price_currency text, - renewal_price_behavior text not null, + renewal_price_behavior text not null check (renewal_price_behavior in ('DEFAULT','NONPREMIUM','SPECIFIED')), token_status_transitions hstore, - token_type text, - primary key (token) + token_type text check (token_type in ('BULK_PRICING','DEFAULT_PROMO','PACKAGE','SINGLE_USE','UNLIMITED_USE','REGISTER_BSA')), + constraint allocation_token_token_idx primary key (token) ); create table "BillingCancellation" ( - billing_cancellation_id int8 not null, + billing_cancellation_id bigint not null, registrar_id text not null, - domain_history_revision_id int8 not null, + domain_history_revision_id bigint not null, domain_repo_id text not null, - event_time timestamptz not null, + event_time timestamp(6) with time zone not null, flags text[], - reason text not null, + reason text not null check (reason in ('CREATE','ERROR','FEE_EARLY_ACCESS','RENEW','RESTORE','SERVER_STATUS','TRANSFER')), domain_name text not null, - billing_event_id int8, - billing_recurrence_id int8, - billing_time timestamptz, + billing_event_id bigint, + billing_recurrence_id bigint, + billing_time timestamp(6) with time zone, primary key (billing_cancellation_id) ); create table "BillingEvent" ( - billing_event_id int8 not null, + billing_event_id bigint not null, registrar_id text not null, - domain_history_revision_id int8 not null, + domain_history_revision_id bigint not null, domain_repo_id text not null, - event_time timestamptz not null, + event_time timestamp(6) with time zone not null, flags text[], - reason text not null, + reason text not null check (reason in ('CREATE','ERROR','FEE_EARLY_ACCESS','RENEW','RESTORE','SERVER_STATUS','TRANSFER')), domain_name text not null, allocation_token text, - billing_time timestamptz, - cancellation_matching_billing_recurrence_id int8, - cost_amount numeric(19, 2), + billing_time timestamp(6) with time zone, + cancellation_matching_billing_recurrence_id bigint, + cost_amount numeric(19,2), cost_currency text, - period_years int4, - recurrence_history_revision_id int8, - synthetic_creation_time timestamptz, + period_years integer, + recurrence_history_revision_id bigint, + synthetic_creation_time timestamp(6) with time zone, primary key (billing_event_id) ); create table "BillingRecurrence" ( - billing_recurrence_id int8 not null, + billing_recurrence_id bigint not null, registrar_id text not null, - domain_history_revision_id int8 not null, + domain_history_revision_id bigint not null, domain_repo_id text not null, - event_time timestamptz not null, + event_time timestamp(6) with time zone not null, flags text[], - reason text not null, + reason text not null check (reason in ('CREATE','ERROR','FEE_EARLY_ACCESS','RENEW','RESTORE','SERVER_STATUS','TRANSFER')), domain_name text not null, - recurrence_end_time timestamptz, - recurrence_last_expansion timestamptz not null, + recurrence_end_time timestamp(6) with time zone, + recurrence_last_expansion timestamp(6) with time zone not null, recurrence_time_of_year text, - renewal_price_amount numeric(19, 2), + renewal_price_amount numeric(19,2), renewal_price_currency text, - renewal_price_behavior text not null, + renewal_price_behavior text not null check (renewal_price_behavior in ('DEFAULT','NONPREMIUM','SPECIFIED')), primary key (billing_recurrence_id) ); create table "BsaDomainRefresh" ( - job_id bigserial not null, - creation_time timestamptz not null, - stage text not null, - update_timestamp timestamptz, + job_id bigint generated by default as identity, + creation_time timestamp(6) with time zone not null, + stage text not null check (stage in ('CHECK_FOR_CHANGES','APPLY_CHANGES','UPLOAD_REMOVALS','UPLOAD_ADDITIONS','DONE')), + update_timestamp timestamp(6) with time zone, primary key (job_id) ); create table "BsaDownload" ( - job_id bigserial not null, + job_id bigint generated by default as identity, block_list_checksums text not null, - creation_time timestamptz not null, - stage text not null, - update_timestamp timestamptz, + creation_time timestamp(6) with time zone not null, + stage text not null check (stage in ('DOWNLOAD_BLOCK_LISTS','MAKE_ORDER_AND_LABEL_DIFF','APPLY_ORDER_AND_LABEL_DIFF','REPORT_START_OF_ORDER_PROCESSING','UPLOAD_UNBLOCKABLE_DOMAINS_FOR_NEW_ORDERS','REPORT_END_OF_ORDER_PROCESSING','DONE','NOP','CHECKSUMS_DO_NOT_MATCH')), + update_timestamp timestamp(6) with time zone, primary key (job_id) ); create table "BsaLabel" ( - label text not null, - creation_time timestamptz not null, + label text not null, + creation_time timestamp(6) with time zone not null, primary key (label) ); create table "BsaUnblockableDomain" ( - label text not null, + label text not null, tld text not null, - creation_time timestamptz not null, - reason text not null, + creation_time timestamp(6) with time zone not null, + reason text not null check (reason in ('REGISTERED','RESERVED')), primary key (label, tld) ); create table "ClaimsEntry" ( - revision_id int8 not null, + revision_id bigint not null, domain_label text not null, claim_key text not null, - primary key (revision_id, domain_label) + primary key (domain_label, revision_id) ); create table "ClaimsList" ( - revision_id bigserial not null, - creation_timestamp timestamptz not null, - tmdb_generation_time timestamptz not null, + revision_id bigint generated by default as identity, + creation_timestamp timestamp(6) with time zone not null, + tmdb_generation_time timestamp(6) with time zone not null, primary key (revision_id) ); create table "ConsoleEppActionHistory" ( - history_revision_id int8 not null, + history_revision_id bigint not null, history_method text not null, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_request_body text, - history_type text not null, + history_type text not null check (history_type in ('EPP_ACTION','POC_CREATE','POC_UPDATE','POC_DELETE','REGISTRAR_UPDATE','USER_CREATE','USER_DELETE','USER_UPDATE')), history_url text not null, history_entry_class text not null, repo_id text not null, - revision_id int8 not null, + revision_id bigint, history_acting_user text not null, primary key (history_revision_id) ); create table "Contact" ( - repo_id text not null, - update_timestamp timestamptz, + repo_id text not null, + update_timestamp timestamp(6) with time zone, creation_registrar_id text, - creation_time timestamptz, + creation_time timestamp(6) with time zone, current_sponsor_registrar_id text, - deletion_time timestamptz, + deletion_time timestamp(6) with time zone, last_epp_update_registrar_id text, - last_epp_update_time timestamptz, + last_epp_update_time timestamp(6) with time zone, statuses text[], auth_info_repo_id text, auth_info_value text, @@ -178,8 +178,8 @@ addr_i18n_zip text, addr_i18n_name text, addr_i18n_org text, - addr_i18n_type text, - last_transfer_time timestamptz, + addr_i18n_type text check (addr_i18n_type in ('LOCALIZED','INTERNATIONALIZED')), + last_transfer_time timestamp(6) with time zone, addr_local_city text, addr_local_country_code text, addr_local_state text, @@ -189,36 +189,36 @@ addr_local_zip text, addr_local_name text, addr_local_org text, - addr_local_type text, + addr_local_type text check (addr_local_type in ('LOCALIZED','INTERNATIONALIZED')), search_name text, - transfer_history_entry_id int8, - transfer_poll_message_id_1 int8, - transfer_poll_message_id_2 int8, - transfer_poll_message_id_3 int8, + transfer_history_entry_id bigint, + transfer_poll_message_id_1 bigint, + transfer_poll_message_id_2 bigint, + transfer_poll_message_id_3 bigint, transfer_repo_id text, transfer_client_txn_id text, transfer_server_txn_id text, transfer_gaining_registrar_id text, transfer_losing_registrar_id text, - transfer_pending_expiration_time timestamptz, - transfer_request_time timestamptz, - transfer_status text, + transfer_pending_expiration_time timestamp(6) with time zone, + transfer_request_time timestamp(6) with time zone, + transfer_status text check (transfer_status in ('CLIENT_APPROVED','CLIENT_CANCELLED','CLIENT_REJECTED','PENDING','SERVER_APPROVED','SERVER_CANCELLED')), voice_phone_extension text, voice_phone_number text, primary key (repo_id) ); create table "ContactHistory" ( - contact_repo_id text not null, - history_revision_id int8 not null, + contact_repo_id text not null, + history_revision_id bigint not null, history_by_superuser boolean not null, history_registrar_id text, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_reason text, history_requested_by_registrar boolean, history_client_transaction_id text, history_server_transaction_id text, - history_type text not null, + history_type text not null check (history_type in ('CONTACT_CREATE','CONTACT_DELETE','CONTACT_DELETE_FAILURE','CONTACT_PENDING_DELETE','CONTACT_TRANSFER_APPROVE','CONTACT_TRANSFER_CANCEL','CONTACT_TRANSFER_REJECT','CONTACT_TRANSFER_REQUEST','CONTACT_UPDATE','DOMAIN_ALLOCATE','DOMAIN_AUTORENEW','DOMAIN_CREATE','DOMAIN_DELETE','DOMAIN_RENEW','DOMAIN_RESTORE','DOMAIN_TRANSFER_APPROVE','DOMAIN_TRANSFER_CANCEL','DOMAIN_TRANSFER_REJECT','DOMAIN_TRANSFER_REQUEST','DOMAIN_UPDATE','HOST_CREATE','HOST_DELETE','HOST_DELETE_FAILURE','HOST_PENDING_DELETE','HOST_UPDATE','RDE_IMPORT','SYNTHETIC')), history_xml_bytes bytea, auth_info_repo_id text, auth_info_value text, @@ -242,8 +242,8 @@ addr_i18n_zip text, addr_i18n_name text, addr_i18n_org text, - addr_i18n_type text, - last_transfer_time timestamptz, + addr_i18n_type text check (addr_i18n_type in ('LOCALIZED','INTERNATIONALIZED')), + last_transfer_time timestamp(6) with time zone, addr_local_city text, addr_local_country_code text, addr_local_state text, @@ -253,355 +253,357 @@ addr_local_zip text, addr_local_name text, addr_local_org text, - addr_local_type text, + addr_local_type text check (addr_local_type in ('LOCALIZED','INTERNATIONALIZED')), search_name text, - transfer_history_entry_id int8, - transfer_poll_message_id_1 int8, - transfer_poll_message_id_2 int8, - transfer_poll_message_id_3 int8, + transfer_history_entry_id bigint, + transfer_poll_message_id_1 bigint, + transfer_poll_message_id_2 bigint, + transfer_poll_message_id_3 bigint, transfer_repo_id text, transfer_client_txn_id text, transfer_server_txn_id text, transfer_gaining_registrar_id text, transfer_losing_registrar_id text, - transfer_pending_expiration_time timestamptz, - transfer_request_time timestamptz, - transfer_status text, + transfer_pending_expiration_time timestamp(6) with time zone, + transfer_request_time timestamp(6) with time zone, + transfer_status text check (transfer_status in ('CLIENT_APPROVED','CLIENT_CANCELLED','CLIENT_REJECTED','PENDING','SERVER_APPROVED','SERVER_CANCELLED')), voice_phone_extension text, voice_phone_number text, creation_registrar_id text, - creation_time timestamptz, + creation_time timestamp(6) with time zone, current_sponsor_registrar_id text, - deletion_time timestamptz, + deletion_time timestamp(6) with time zone, last_epp_update_registrar_id text, - last_epp_update_time timestamptz, + last_epp_update_time timestamp(6) with time zone, statuses text[], - update_timestamp timestamptz, + update_timestamp timestamp(6) with time zone, primary key (contact_repo_id, history_revision_id) ); create table "Cursor" ( - scope text not null, - type text not null, - last_update_time timestamptz not null, - cursor_time timestamptz not null, + scope text not null, + type text not null check (type in ('BRDA','RDE_REPORT','RDE_STAGING','RDE_UPLOAD','RDE_UPLOAD_SFTP','RECURRING_BILLING','SYNC_REGISTRAR_SHEET','ICANN_UPLOAD_TX','ICANN_UPLOAD_ACTIVITY')), + last_update_time timestamp(6) with time zone not null, + cursor_time timestamp(6) with time zone not null, primary key (scope, type) ); create table "DelegationSignerData" ( - algorithm int4 not null, + algorithm integer not null, digest bytea not null, - digest_type int4 not null, + digest_type integer not null, domain_repo_id text not null, - key_tag int4 not null, + key_tag integer not null, primary key (algorithm, digest, digest_type, domain_repo_id, key_tag) ); create table "DnsRefreshRequest" ( - id bigserial not null, - last_process_time timestamptz not null, + id bigint generated by default as identity, + last_process_time timestamp(6) with time zone not null, name text not null, - request_time timestamptz not null, + request_time timestamp(6) with time zone not null, tld text not null, - type text not null, + type text not null check (type in ('DOMAIN','HOST')), primary key (id) ); create table "Domain" ( - repo_id text not null, - update_timestamp timestamptz, + repo_id text not null, + update_timestamp timestamp(6) with time zone, creation_registrar_id text, - creation_time timestamptz, + creation_time timestamp(6) with time zone, current_sponsor_registrar_id text, - deletion_time timestamptz, + deletion_time timestamp(6) with time zone, last_epp_update_registrar_id text, - last_epp_update_time timestamptz, + last_epp_update_time timestamp(6) with time zone, statuses text[], admin_contact text, auth_info_repo_id text, auth_info_value text, - billing_recurrence_id int8, - autorenew_end_time timestamptz, - autorenew_poll_message_id int8, + billing_recurrence_id bigint, + autorenew_end_time timestamp(6) with time zone, + autorenew_poll_message_id bigint, billing_contact text, current_package_token text, - deletion_poll_message_id int8, + deletion_poll_message_id bigint, domain_name text, idn_table_name text, - last_transfer_time timestamptz, - launch_notice_accepted_time timestamptz, - launch_notice_expiration_time timestamptz, + last_transfer_time timestamp(6) with time zone, + launch_notice_accepted_time timestamp(6) with time zone, + launch_notice_expiration_time timestamp(6) with time zone, launch_notice_tcn_id text, launch_notice_validator_id text, - lordn_phase text, + lordn_phase text check (lordn_phase in ('SUNRISE','CLAIMS','NONE')), registrant_contact text, - registration_expiration_time timestamptz, + registration_expiration_time timestamp(6) with time zone, smd_id text, subordinate_hosts text[], tech_contact text, tld text, - transfer_billing_cancellation_id int8, - transfer_billing_recurrence_id int8, - transfer_autorenew_poll_message_id int8, - transfer_autorenew_poll_message_history_id int8, - transfer_billing_event_id int8, - transfer_renew_period_unit text, - transfer_renew_period_value int4, - transfer_registration_expiration_time timestamptz, - transfer_history_entry_id int8, - transfer_poll_message_id_1 int8, - transfer_poll_message_id_2 int8, - transfer_poll_message_id_3 int8, + transfer_billing_cancellation_id bigint, + transfer_billing_recurrence_id bigint, + transfer_autorenew_poll_message_id bigint, + transfer_autorenew_poll_message_history_id bigint, + transfer_billing_event_id bigint, + transfer_renew_period_unit text check (transfer_renew_period_unit in ('YEARS','MONTHS')), + transfer_renew_period_value integer, + transfer_registration_expiration_time timestamp(6) with time zone, + transfer_history_entry_id bigint, + transfer_poll_message_id_1 bigint, + transfer_poll_message_id_2 bigint, + transfer_poll_message_id_3 bigint, transfer_repo_id text, transfer_client_txn_id text, transfer_server_txn_id text, transfer_gaining_registrar_id text, transfer_losing_registrar_id text, - transfer_pending_expiration_time timestamptz, - transfer_request_time timestamptz, - transfer_status text, + transfer_pending_expiration_time timestamp(6) with time zone, + transfer_request_time timestamp(6) with time zone, + transfer_status text check (transfer_status in ('CLIENT_APPROVED','CLIENT_CANCELLED','CLIENT_REJECTED','PENDING','SERVER_APPROVED','SERVER_CANCELLED')), primary key (repo_id) ); create table "DomainDsDataHistory" ( - ds_data_history_revision_id int8 not null, - algorithm int4 not null, + ds_data_history_revision_id bigint not null, + algorithm integer not null, digest bytea not null, - digest_type int4 not null, - domain_history_revision_id int8 not null, + digest_type integer not null, + domain_history_revision_id bigint not null, domain_repo_id text, - key_tag int4 not null, + key_tag integer not null, primary key (ds_data_history_revision_id) ); create table "DomainHistory" ( - domain_repo_id text not null, - history_revision_id int8 not null, + domain_repo_id text not null, + history_revision_id bigint not null, history_by_superuser boolean not null, history_registrar_id text, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_reason text, history_requested_by_registrar boolean, history_client_transaction_id text, history_server_transaction_id text, - history_type text not null, + history_type text not null check (history_type in ('CONTACT_CREATE','CONTACT_DELETE','CONTACT_DELETE_FAILURE','CONTACT_PENDING_DELETE','CONTACT_TRANSFER_APPROVE','CONTACT_TRANSFER_CANCEL','CONTACT_TRANSFER_REJECT','CONTACT_TRANSFER_REQUEST','CONTACT_UPDATE','DOMAIN_ALLOCATE','DOMAIN_AUTORENEW','DOMAIN_CREATE','DOMAIN_DELETE','DOMAIN_RENEW','DOMAIN_RESTORE','DOMAIN_TRANSFER_APPROVE','DOMAIN_TRANSFER_CANCEL','DOMAIN_TRANSFER_REJECT','DOMAIN_TRANSFER_REQUEST','DOMAIN_UPDATE','HOST_CREATE','HOST_DELETE','HOST_DELETE_FAILURE','HOST_PENDING_DELETE','HOST_UPDATE','RDE_IMPORT','SYNTHETIC')), history_xml_bytes bytea, history_other_registrar_id text, - history_period_unit text, - history_period_value int4, + history_period_unit text check (history_period_unit in ('YEARS','MONTHS')), + history_period_value integer, admin_contact text, auth_info_repo_id text, auth_info_value text, - billing_recurrence_id int8, - autorenew_end_time timestamptz, - autorenew_poll_message_id int8, + billing_recurrence_id bigint, + autorenew_end_time timestamp(6) with time zone, + autorenew_poll_message_id bigint, billing_contact text, current_package_token text, - deletion_poll_message_id int8, + deletion_poll_message_id bigint, domain_name text, idn_table_name text, - last_transfer_time timestamptz, - launch_notice_accepted_time timestamptz, - launch_notice_expiration_time timestamptz, + last_transfer_time timestamp(6) with time zone, + launch_notice_accepted_time timestamp(6) with time zone, + launch_notice_expiration_time timestamp(6) with time zone, launch_notice_tcn_id text, launch_notice_validator_id text, - lordn_phase text, + lordn_phase text check (lordn_phase in ('SUNRISE','CLAIMS','NONE')), registrant_contact text, - registration_expiration_time timestamptz, + registration_expiration_time timestamp(6) with time zone, smd_id text, subordinate_hosts text[], tech_contact text, tld text, - transfer_billing_cancellation_id int8, - transfer_billing_recurrence_id int8, - transfer_autorenew_poll_message_id int8, - transfer_autorenew_poll_message_history_id int8, - transfer_billing_event_id int8, - transfer_renew_period_unit text, - transfer_renew_period_value int4, - transfer_registration_expiration_time timestamptz, - transfer_history_entry_id int8, - transfer_poll_message_id_1 int8, - transfer_poll_message_id_2 int8, - transfer_poll_message_id_3 int8, + transfer_billing_cancellation_id bigint, + transfer_billing_recurrence_id bigint, + transfer_autorenew_poll_message_id bigint, + transfer_autorenew_poll_message_history_id bigint, + transfer_billing_event_id bigint, + transfer_renew_period_unit text check (transfer_renew_period_unit in ('YEARS','MONTHS')), + transfer_renew_period_value integer, + transfer_registration_expiration_time timestamp(6) with time zone, + transfer_history_entry_id bigint, + transfer_poll_message_id_1 bigint, + transfer_poll_message_id_2 bigint, + transfer_poll_message_id_3 bigint, transfer_repo_id text, transfer_client_txn_id text, transfer_server_txn_id text, transfer_gaining_registrar_id text, transfer_losing_registrar_id text, - transfer_pending_expiration_time timestamptz, - transfer_request_time timestamptz, - transfer_status text, + transfer_pending_expiration_time timestamp(6) with time zone, + transfer_request_time timestamp(6) with time zone, + transfer_status text check (transfer_status in ('CLIENT_APPROVED','CLIENT_CANCELLED','CLIENT_REJECTED','PENDING','SERVER_APPROVED','SERVER_CANCELLED')), creation_registrar_id text, - creation_time timestamptz, + creation_time timestamp(6) with time zone, current_sponsor_registrar_id text, - deletion_time timestamptz, + deletion_time timestamp(6) with time zone, last_epp_update_registrar_id text, - last_epp_update_time timestamptz, + last_epp_update_time timestamp(6) with time zone, statuses text[], - update_timestamp timestamptz, + update_timestamp timestamp(6) with time zone, primary key (domain_repo_id, history_revision_id) ); create table "DomainHistoryHost" ( - domain_history_domain_repo_id text not null, - domain_history_history_revision_id int8 not null, - host_repo_id text + domain_history_domain_repo_id text not null, + domain_history_history_revision_id bigint not null, + host_repo_id text, + unique (domain_history_history_revision_id, domain_history_domain_repo_id, host_repo_id) ); create table "DomainHost" ( - domain_repo_id text not null, - host_repo_id text + domain_repo_id text not null, + host_repo_id text, + unique (domain_repo_id, host_repo_id) ); create table "DomainTransactionRecord" ( - id bigserial not null, + id bigint generated by default as identity, domain_repo_id text, - history_revision_id int8, - report_amount int4 not null, - report_field text not null, - reporting_time timestamptz not null, + history_revision_id bigint, + report_amount integer not null, + report_field text not null check (report_field in ('NET_ADDS_1_YR','NET_ADDS_2_YR','NET_ADDS_3_YR','NET_ADDS_4_YR','NET_ADDS_5_YR','NET_ADDS_6_YR','NET_ADDS_7_YR','NET_ADDS_8_YR','NET_ADDS_9_YR','NET_ADDS_10_YR','NET_RENEWS_1_YR','NET_RENEWS_2_YR','NET_RENEWS_3_YR','NET_RENEWS_4_YR','NET_RENEWS_5_YR','NET_RENEWS_6_YR','NET_RENEWS_7_YR','NET_RENEWS_8_YR','NET_RENEWS_9_YR','NET_RENEWS_10_YR','TRANSFER_SUCCESSFUL','TRANSFER_NACKED','DELETED_DOMAINS_GRACE','DELETED_DOMAINS_NOGRACE','RESTORED_DOMAINS')), + reporting_time timestamp(6) with time zone not null, tld text not null, primary key (id) ); create table "FeatureFlag" ( - feature_name text not null, + feature_name text not null check (feature_name in ('TEST_FEATURE','MINIMUM_DATASET_CONTACTS_OPTIONAL','MINIMUM_DATASET_CONTACTS_PROHIBITED','NEW_CONSOLE')), status hstore not null, primary key (feature_name) ); create table "GracePeriod" ( - grace_period_id int8 not null, - billing_event_id int8, - billing_recurrence_id int8, + grace_period_id bigint not null, + billing_event_id bigint, + billing_recurrence_id bigint, registrar_id text not null, domain_repo_id text not null, - expiration_time timestamptz not null, - type text not null, + expiration_time timestamp(6) with time zone not null, + type text not null check (type in ('ADD','AUTO_RENEW','REDEMPTION','RENEW','PENDING_DELETE','PENDING_RESTORE','TRANSFER')), primary key (grace_period_id) ); create table "GracePeriodHistory" ( - grace_period_history_revision_id int8 not null, - billing_event_id int8, - billing_recurrence_id int8, + grace_period_history_revision_id bigint not null, + billing_event_id bigint, + billing_recurrence_id bigint, registrar_id text not null, domain_repo_id text not null, - expiration_time timestamptz not null, - type text not null, - domain_history_revision_id int8, - grace_period_id int8 not null, + expiration_time timestamp(6) with time zone not null, + type text not null check (type in ('ADD','AUTO_RENEW','REDEMPTION','RENEW','PENDING_DELETE','PENDING_RESTORE','TRANSFER')), + domain_history_revision_id bigint, + grace_period_id bigint not null, primary key (grace_period_history_revision_id) ); create table "Host" ( - repo_id text not null, - update_timestamp timestamptz, + repo_id text not null, + update_timestamp timestamp(6) with time zone, creation_registrar_id text, - creation_time timestamptz, + creation_time timestamp(6) with time zone, current_sponsor_registrar_id text, - deletion_time timestamptz, + deletion_time timestamp(6) with time zone, last_epp_update_registrar_id text, - last_epp_update_time timestamptz, + last_epp_update_time timestamp(6) with time zone, statuses text[], host_name text, inet_addresses text[], - last_superordinate_change timestamptz, - last_transfer_time timestamptz, + last_superordinate_change timestamp(6) with time zone, + last_transfer_time timestamp(6) with time zone, superordinate_domain text, primary key (repo_id) ); create table "HostHistory" ( - host_repo_id text not null, - history_revision_id int8 not null, + host_repo_id text not null, + history_revision_id bigint not null, history_by_superuser boolean not null, history_registrar_id text, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_reason text, history_requested_by_registrar boolean, history_client_transaction_id text, history_server_transaction_id text, - history_type text not null, + history_type text not null check (history_type in ('CONTACT_CREATE','CONTACT_DELETE','CONTACT_DELETE_FAILURE','CONTACT_PENDING_DELETE','CONTACT_TRANSFER_APPROVE','CONTACT_TRANSFER_CANCEL','CONTACT_TRANSFER_REJECT','CONTACT_TRANSFER_REQUEST','CONTACT_UPDATE','DOMAIN_ALLOCATE','DOMAIN_AUTORENEW','DOMAIN_CREATE','DOMAIN_DELETE','DOMAIN_RENEW','DOMAIN_RESTORE','DOMAIN_TRANSFER_APPROVE','DOMAIN_TRANSFER_CANCEL','DOMAIN_TRANSFER_REJECT','DOMAIN_TRANSFER_REQUEST','DOMAIN_UPDATE','HOST_CREATE','HOST_DELETE','HOST_DELETE_FAILURE','HOST_PENDING_DELETE','HOST_UPDATE','RDE_IMPORT','SYNTHETIC')), history_xml_bytes bytea, host_name text, inet_addresses text[], - last_superordinate_change timestamptz, - last_transfer_time timestamptz, + last_superordinate_change timestamp(6) with time zone, + last_transfer_time timestamp(6) with time zone, superordinate_domain text, creation_registrar_id text, - creation_time timestamptz, + creation_time timestamp(6) with time zone, current_sponsor_registrar_id text, - deletion_time timestamptz, + deletion_time timestamp(6) with time zone, last_epp_update_registrar_id text, - last_epp_update_time timestamptz, + last_epp_update_time timestamp(6) with time zone, statuses text[], - update_timestamp timestamptz, + update_timestamp timestamp(6) with time zone, primary key (host_repo_id, history_revision_id) ); create table "Lock" ( - resource_name text not null, + resource_name text not null, scope text not null, - acquired_time timestamptz not null, - expiration_time timestamptz not null, + acquired_time timestamp(6) with time zone not null, + expiration_time timestamp(6) with time zone not null, primary key (resource_name, scope) ); create table "PackagePromotion" ( - package_promotion_id bigserial not null, - package_price_amount numeric(19, 2) not null, + package_promotion_id bigint generated by default as identity, + package_price_amount numeric(19,2) not null, package_price_currency text not null, - last_notification_sent timestamptz, - max_creates int4 not null, - max_domains int4 not null, - next_billing_date timestamptz not null, + last_notification_sent timestamp(6) with time zone, + max_creates integer not null, + max_domains integer not null, + next_billing_date timestamp(6) with time zone not null, token text not null, primary key (package_promotion_id) ); create table "PollMessage" ( - type text not null, - poll_message_id int8 not null, + type text not null, + poll_message_id bigint not null, registrar_id text not null, - contact_history_revision_id int8, + contact_history_revision_id bigint, contact_repo_id text, - domain_history_revision_id int8, + domain_history_revision_id bigint, domain_repo_id text, - event_time timestamptz not null, - host_history_revision_id int8, + event_time timestamp(6) with time zone not null, + host_history_revision_id bigint, host_repo_id text, message text, transfer_response_contact_id text, transfer_response_domain_name text, - transfer_response_domain_expiration_time timestamptz, + transfer_response_domain_expiration_time timestamp(6) with time zone, transfer_response_host_id text, pending_action_response_action_result boolean, pending_action_response_name_or_id text, - pending_action_response_processed_date timestamptz, + pending_action_response_processed_date timestamp(6) with time zone, pending_action_response_client_txn_id text, pending_action_response_server_txn_id text, transfer_response_gaining_registrar_id text, transfer_response_losing_registrar_id text, - transfer_response_pending_transfer_expiration_time timestamptz, - transfer_response_transfer_request_time timestamptz, - transfer_response_transfer_status text, - autorenew_end_time timestamptz, + transfer_response_pending_transfer_expiration_time timestamp(6) with time zone, + transfer_response_transfer_request_time timestamp(6) with time zone, + transfer_response_transfer_status text check (transfer_response_transfer_status in ('CLIENT_APPROVED','CLIENT_CANCELLED','CLIENT_REJECTED','PENDING','SERVER_APPROVED','SERVER_CANCELLED')), + autorenew_end_time timestamp(6) with time zone, autorenew_domain_name text, primary key (poll_message_id) ); create table "PremiumEntry" ( - revision_id int8 not null, + revision_id bigint not null, domain_label text not null, - price numeric(19, 2) not null, - primary key (revision_id, domain_label) + price numeric(19,2) not null, + primary key (domain_label, revision_id) ); create table "PremiumList" ( - revision_id bigserial not null, - creation_timestamp timestamptz, + revision_id bigint generated by default as identity, + creation_timestamp timestamp(6) with time zone, name text not null, bloom_filter bytea not null, currency text not null, @@ -609,30 +611,30 @@ ); create table "RdeRevision" ( - date date not null, - mode text not null, + date date not null, + mode text not null check (mode in ('FULL','THIN')), tld text not null, - update_timestamp timestamptz, - revision int4 not null, + update_timestamp timestamp(6) with time zone, + revision integer not null, primary key (date, mode, tld) ); create table "Registrar" ( - registrar_id text not null, - last_update_time timestamptz not null, + registrar_id text not null, + last_update_time timestamp(6) with time zone not null, allowed_tlds text[], billing_account_map hstore, block_premium_names boolean not null, client_certificate text, client_certificate_hash text, contacts_require_syncing boolean not null, - creation_time timestamptz not null, + creation_time timestamp(6) with time zone not null, drive_folder_id text, email_address text, failover_client_certificate text, failover_client_certificate_hash text, fax_number text, - iana_identifier int8, + iana_identifier bigint, icann_referral_email text, i18n_address_city text, i18n_address_country_code text, @@ -642,9 +644,9 @@ i18n_address_street_line3 text, i18n_address_zip text, ip_address_allow_list text[], - last_certificate_update_time timestamptz, - last_expiring_cert_notification_sent_date timestamptz, - last_expiring_failover_cert_notification_sent_date timestamptz, + last_certificate_update_time timestamp(6) with time zone, + last_expiring_cert_notification_sent_date timestamp(6) with time zone, + last_expiring_failover_cert_notification_sent_date timestamp(6) with time zone, localized_address_city text, localized_address_country_code text, localized_address_state text, @@ -660,15 +662,15 @@ registrar_name text not null, registry_lock_allowed boolean not null, password_salt text, - state text, - type text not null, + state text check (state in ('PENDING','ACTIVE','SUSPENDED','DISABLED')), + type text not null check (type in ('REAL','OTE','PDT','EXTERNAL_MONITORING','INTERNAL','MONITORING','TEST')), url text, whois_server text, primary key (registrar_id) ); create table "RegistrarPoc" ( - email_address text not null, + email_address text not null, registrar_id text not null, allowed_to_set_registry_lock_password boolean not null, fax_number text, @@ -685,11 +687,11 @@ ); create table "RegistrarPocUpdateHistory" ( - history_revision_id int8 not null, + history_revision_id bigint not null, history_method text not null, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_request_body text, - history_type text not null, + history_type text not null check (history_type in ('EPP_ACTION','POC_CREATE','POC_UPDATE','POC_DELETE','REGISTRAR_UPDATE','USER_CREATE','USER_DELETE','USER_UPDATE')), history_url text not null, email_address text not null, registrar_id text not null, @@ -709,11 +711,11 @@ ); create table "RegistrarUpdateHistory" ( - history_revision_id int8 not null, + history_revision_id bigint not null, history_method text not null, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_request_body text, - history_type text not null, + history_type text not null check (history_type in ('EPP_ACTION','POC_CREATE','POC_UPDATE','POC_DELETE','REGISTRAR_UPDATE','USER_CREATE','USER_DELETE','USER_UPDATE')), history_url text not null, allowed_tlds text[], billing_account_map hstore, @@ -721,13 +723,13 @@ client_certificate text, client_certificate_hash text, contacts_require_syncing boolean not null, - creation_time timestamptz not null, + creation_time timestamp(6) with time zone not null, drive_folder_id text, email_address text, failover_client_certificate text, failover_client_certificate_hash text, fax_number text, - iana_identifier int8, + iana_identifier bigint, icann_referral_email text, i18n_address_city text, i18n_address_country_code text, @@ -737,9 +739,9 @@ i18n_address_street_line3 text, i18n_address_zip text, ip_address_allow_list text[], - last_certificate_update_time timestamptz, - last_expiring_cert_notification_sent_date timestamptz, - last_expiring_failover_cert_notification_sent_date timestamptz, + last_certificate_update_time timestamp(6) with time zone, + last_expiring_cert_notification_sent_date timestamp(6) with time zone, + last_expiring_failover_cert_notification_sent_date timestamp(6) with time zone, localized_address_city text, localized_address_country_code text, localized_address_state text, @@ -755,70 +757,71 @@ registrar_name text not null, registry_lock_allowed boolean not null, password_salt text, - state text, - type text not null, + state text check (state in ('PENDING','ACTIVE','SUSPENDED','DISABLED')), + type text not null check (type in ('REAL','OTE','PDT','EXTERNAL_MONITORING','INTERNAL','MONITORING','TEST')), url text, whois_server text, - update_timestamp timestamptz, + update_timestamp timestamp(6) with time zone, registrar_id text not null, history_acting_user text not null, primary key (history_revision_id) ); create table "RegistryLock" ( - revision_id bigserial not null, - last_update_time timestamptz not null, + revision_id bigint generated by default as identity, + last_update_time timestamp(6) with time zone not null, domain_name text not null, is_superuser boolean not null, - lock_completion_time timestamptz, - lock_request_time timestamptz not null, + lock_completion_time timestamp(6) with time zone, + lock_request_time timestamp(6) with time zone not null, registrar_id text not null, registrar_poc_id text, relock_duration interval, repo_id text not null, - unlock_completion_time timestamptz, - unlock_request_time timestamptz, + unlock_completion_time timestamp(6) with time zone, + unlock_request_time timestamp(6) with time zone, verification_code text not null, - relock_revision_id int8, - primary key (revision_id) + relock_revision_id bigint unique, + primary key (revision_id), + constraint idx_registry_lock_repo_id_revision_id unique (repo_id, revision_id) ); create table "ReservedEntry" ( - revision_id int8 not null, + revision_id bigint not null, domain_label text not null, comment text, - reservation_type int4 not null, - primary key (revision_id, domain_label) + reservation_type integer not null check (reservation_type between 0 and 4), + primary key (domain_label, revision_id) ); create table "ReservedList" ( - revision_id bigserial not null, - creation_timestamp timestamptz, + revision_id bigint generated by default as identity, + creation_timestamp timestamp(6) with time zone, name text not null, primary key (revision_id) ); create table "ServerSecret" ( - id int8 not null, + id bigint not null, secret uuid, primary key (id) ); create table "SignedMarkRevocationEntry" ( - revision_id int8 not null, - revocation_time timestamptz not null, + revision_id bigint not null, + revocation_time timestamp(6) with time zone not null, smd_id text not null, primary key (revision_id, smd_id) ); create table "SignedMarkRevocationList" ( - revision_id bigserial not null, - creation_time timestamptz, + revision_id bigint generated by default as identity, + creation_time timestamp(6) with time zone, primary key (revision_id) ); create table "Spec11ThreatMatch" ( - id bigserial not null, + id bigint generated by default as identity, check_date date not null, domain_name text not null, domain_repo_id text not null, @@ -829,7 +832,7 @@ ); create table "Tld" ( - tld_name text not null, + tld_name text not null, add_grace_period_length interval not null, allowed_fully_qualified_host_names text[], allowed_registrant_contact_ids text[], @@ -837,10 +840,10 @@ auto_renew_grace_period_length interval not null, automatic_transfer_length interval not null, breakglass_mode boolean not null, - bsa_enroll_start_time timestamptz, - claims_period_end timestamptz not null, + bsa_enroll_start_time timestamp(6) with time zone, + claims_period_end timestamp(6) with time zone not null, create_billing_cost_transitions hstore not null, - creation_time timestamptz not null, + creation_time timestamp(6) with time zone not null, currency text not null, default_promo_tokens text[], dns_a_plus_aaaa_ttl interval, @@ -854,168 +857,345 @@ idn_tables text[], invoicing_enabled boolean not null, lordn_username text, - num_dns_publish_locks int4 not null, + num_dns_publish_locks integer not null, pending_delete_length interval not null, premium_list_name text, pricing_engine_class_name text, redemption_grace_period_length interval not null, - registry_lock_or_unlock_cost_amount numeric(19, 2), + registry_lock_or_unlock_cost_amount numeric(19,2), registry_lock_or_unlock_cost_currency text, renew_billing_cost_transitions hstore not null, renew_grace_period_length interval not null, reserved_list_names text[], - restore_billing_cost_amount numeric(19, 2), + restore_billing_cost_amount numeric(19,2), restore_billing_cost_currency text, roid_suffix text, - server_status_change_billing_cost_amount numeric(19, 2), + server_status_change_billing_cost_amount numeric(19,2), server_status_change_billing_cost_currency text, tld_state_transitions hstore not null, - tld_type text not null, + tld_type text not null check (tld_type in ('REAL','TEST')), tld_unicode text not null, transfer_grace_period_length interval not null, primary key (tld_name) ); create table "TmchCrl" ( - id int8 not null, + id bigint not null, certificate_revocations text not null, - update_timestamp timestamptz not null, + update_timestamp timestamp(6) with time zone not null, url text not null, primary key (id) ); create table "User" ( - email_address text not null, - update_timestamp timestamptz, + email_address text not null, + update_timestamp timestamp(6) with time zone, registry_lock_email_address text, registry_lock_password_hash text, registry_lock_password_salt text, - global_role text not null, + global_role text not null check (global_role in ('NONE','SUPPORT_AGENT','SUPPORT_LEAD','FTE')), is_admin boolean not null, registrar_roles hstore, primary key (email_address) ); create table "UserUpdateHistory" ( - history_revision_id int8 not null, + history_revision_id bigint not null, history_method text not null, - history_modification_time timestamptz not null, + history_modification_time timestamp(6) with time zone not null, history_request_body text, - history_type text not null, + history_type text not null check (history_type in ('EPP_ACTION','POC_CREATE','POC_UPDATE','POC_DELETE','REGISTRAR_UPDATE','USER_CREATE','USER_DELETE','USER_UPDATE')), history_url text not null, email_address text not null, registry_lock_email_address text, registry_lock_password_hash text, registry_lock_password_salt text, - global_role text not null, + global_role text not null check (global_role in ('NONE','SUPPORT_AGENT','SUPPORT_LEAD','FTE')), is_admin boolean not null, registrar_roles hstore, - update_timestamp timestamptz, + update_timestamp timestamp(6) with time zone, history_acting_user text not null, primary key (history_revision_id) ); -create index allocation_token_domain_name_idx on "AllocationToken" (domain_name); -create index IDX9g3s7mjv1yn4t06nqid39whss on "AllocationToken" (token_type); -create index IDXtmlqd31dpvvd2g1h9i7erw6aj on "AllocationToken" (redemption_domain_repo_id); -create index IDXih4b2tea127p5rb61gje6e1y2 on "BillingCancellation" (registrar_id); -create index IDX2exdfbx6oiiwnhr8j6gjpqt2j on "BillingCancellation" (event_time); -create index IDXl8vobbecsd32k4ksavdfx8st6 on "BillingCancellation" (domain_repo_id); -create index IDXqa3g92jc17e8dtiaviy4fet4x on "BillingCancellation" (billing_time); -create index IDX4ytbe5f3b39trsd4okx5ijhs4 on "BillingCancellation" (billing_event_id); -create index IDXku0fopwyvd57ebo8bf0jg9xo2 on "BillingCancellation" (billing_recurrence_id); -create index IDXqspv57gj2led8ly42fq01t7m7 on "BillingEvent" (registrar_id); -create index IDX5yfbr88439pxw0v3j86c74fp8 on "BillingEvent" (event_time); -create index IDX6py6ocrab0ivr76srcd2okpnq on "BillingEvent" (billing_time); -create index IDXplxf9v56p0wg8ws6qsvd082hk on "BillingEvent" (synthetic_creation_time); -create index IDXbgfmveqa7e5hn689koikwn70r on "BillingEvent" (domain_repo_id); -create index IDXcesda59ssop44kklytpb292hn on "BillingEvent" (allocation_token); -create index IDX6ebt3nwk5ocvnremnhnlkl6ff on "BillingEvent" (cancellation_matching_billing_recurrence_id); -create index IDXd3gxhkh0jk694pjvh9pyn7wjc on "BillingRecurrence" (registrar_id); -create index IDX6syykou4nkc7hqa5p8r92cpch on "BillingRecurrence" (event_time); -create index IDXoqttafcywwdn41um6kwlt0n8b on "BillingRecurrence" (domain_repo_id); -create index IDXp3usbtvk0v1m14i5tdp4xnxgc on "BillingRecurrence" (recurrence_end_time); -create index IDXp0pxi708hlu4n40qhbtihge8x on "BillingRecurrence" (recurrence_last_expansion); -create index IDXjny8wuot75b5e6p38r47wdawu on "BillingRecurrence" (recurrence_time_of_year); -create index IDXj874kw19bgdnkxo1rue45jwlw on "BsaDownload" (creation_time); -create index IDXcclyb3n5gbex8u8m9fjlujitw on "ConsoleEppActionHistory" (history_acting_user); -create index IDX6y67d6wsffmr6jcxax5ghwqhd on "ConsoleEppActionHistory" (repo_id); -create index IDXiahqo1d1fqdfknywmj2xbxl7t on "ConsoleEppActionHistory" (revision_id); -create index IDX3y752kr9uh4kh6uig54vemx0l on "Contact" (creation_time); -create index IDXtm415d6fe1rr35stm33s5mg18 on "Contact" (current_sponsor_registrar_id); -create index IDXn1f711wicdnooa2mqb7g1m55o on "Contact" (deletion_time); -create index IDXoqd7n4hbx86hvlgkilq75olas on "Contact" (contact_id); -create index IDX1p3esngcwwu6hstyua6itn6ff on "Contact" (search_name); -create index IDXo1xdtpij2yryh0skxe9v91sep on "ContactHistory" (creation_time); -create index IDXhp33wybmb6tbpr1bq7ttwk8je on "ContactHistory" (history_registrar_id); -create index IDX9q53px6r302ftgisqifmc6put on "ContactHistory" (history_type); -create index IDXsudwswtwqnfnx2o1hx4s0k0g5 on "ContactHistory" (history_modification_time); -create index IDXhlqqd5uy98cjyos72d81x9j95 on "DelegationSignerData" (domain_repo_id); -create index IDX8gtvnbk64yskcvrdp61f5ied3 on "DnsRefreshRequest" (request_time); -create index IDXfdk2xpil2x1gh0omt84k2y3o1 on "DnsRefreshRequest" (last_process_time); -create index IDXnb02m43jcx24r64n8rbg22u4q on "Domain" (admin_contact); -create index IDXlrq7v63pc21uoh3auq6eybyhl on "Domain" (autorenew_end_time); -create index IDXq9gy8x2xynt9tb16yajn1gcm8 on "Domain" (billing_contact); -create index IDX8nr0ke9mrrx4ewj6pd2ag4rmr on "Domain" (creation_time); -create index IDXhsjqiy2lyobfymplb28nm74lm on "Domain" (current_sponsor_registrar_id); -create index IDX5mnf0wn20tno4b9do88j61klr on "Domain" (deletion_time); -create index IDXc5aw4pk1vkd6ymhvkpanmoadv on "Domain" (domain_name); -create index IDXr22ciyccwi9rrqmt1ro0s59qf on "Domain" (tech_contact); -create index IDXrwl38wwkli1j7gkvtywi9jokq on "Domain" (tld); -create index IDXa7fu0bqynfb79rr80528b4jqt on "Domain" (registrant_contact); -create index IDXnjhib7v6fj7dhj5qydkefkl2u on "Domain" (lordn_phase); -create index IDXsfci08jgsymxy6ovh4k7r358c on "Domain" (billing_recurrence_id); -create index IDX3y3k7m2bkgahm9sixiohgyrga on "Domain" (transfer_billing_event_id); -create index IDXcju58vqascbpve1t7fem53ctl on "Domain" (transfer_billing_recurrence_id); -create index IDXhteajcrxmq4o8rsys8kevyiqr on "Domain" (transfer_billing_cancellation_id); -create index IDXrh4xmrot9bd63o382ow9ltfig on "DomainHistory" (creation_time); -create index IDXaro1omfuaxjwmotk3vo00trwm on "DomainHistory" (history_registrar_id); -create index IDXsu1nam10cjes9keobapn5jvxj on "DomainHistory" (history_type); -create index IDX6w3qbtgce93cal2orjg1tw7b7 on "DomainHistory" (history_modification_time); -create index IDX69qun5kxt3eux5igrxrqcycv0 on "DomainHistoryHost" (domain_history_domain_repo_id); - alter table if exists "DomainHistoryHost" - add constraint UKt2e7ae3t8gcsxd13wjx2ka7ij unique (domain_history_history_revision_id, domain_history_domain_repo_id, host_repo_id); -create index IDXjw3rwtfrexyq53x9vu7qghrdt on "DomainHost" (host_repo_id); + create index allocation_token_domain_name_idx + on "AllocationToken" (domain_name); - alter table if exists "DomainHost" - add constraint UKat9erbh52e4lg3jw6ai9wkjj9 unique (domain_repo_id, host_repo_id); -create index IDXj1mtx98ndgbtb1bkekahms18w on "GracePeriod" (domain_repo_id); -create index IDXbgssjudpm428mrv0xfpvgifps on "GracePeriod" (billing_event_id); -create index IDX5u5m6clpk3nktrvtyy5umacb6 on "GracePeriod" (billing_recurrence_id); -create index IDXd01j17vrpjxaerxdmn8bwxs7s on "GracePeriodHistory" (domain_repo_id); -create index IDXkpkh68n6dy5v51047yr6b0e9l on "Host" (host_name); -create index IDXy98mebut8ix1v07fjxxdkqcx on "Host" (creation_time); -create index IDXovmntef6l45tw2bsfl56tcugx on "Host" (deletion_time); -create index IDXl49vydnq0h5j1piefwjy4i8er on "Host" (current_sponsor_registrar_id); -create index IDXorp4yv9ult4ds6kgxo5fs5gnw on "Host" (superordinate_domain); -create index IDXfg2nnjlujxo6cb9fha971bq2n on "HostHistory" (creation_time); -create index IDX1iy7njgb7wjmj9piml4l2g0qi on "HostHistory" (history_registrar_id); -create index IDXkkwbwcwvrdkkqothkiye4jiff on "HostHistory" (host_name); -create index IDXknk8gmj7s47q56cwpa6rmpt5l on "HostHistory" (history_type); -create index IDX67qwkjtlq5q8dv6egtrtnhqi7 on "HostHistory" (history_modification_time); -create index IDXlg6a5tp70nch9cp0gc11brc5o on "PackagePromotion" (token); -create index IDXf2q9dqj899h1q8lah5y719nxd on "PollMessage" (domain_repo_id); -create index IDXe7wu46c7wpvfmfnj4565abibp on "PollMessage" (registrar_id); -create index IDXaydgox62uno9qx8cjlj5lauye on "PollMessage" (event_time); -create index premiumlist_name_idx on "PremiumList" (name); -create index registrar_name_idx on "Registrar" (registrar_name); -create index registrar_iana_identifier_idx on "Registrar" (iana_identifier); -create index IDXrn6posxkx58de1cp09g5257cw on "RegistrarPocUpdateHistory" (history_acting_user); -create index IDXr1cxua6it0rxgt9tpyugspxk on "RegistrarPocUpdateHistory" (email_address); -create index IDXfr24wvpg8qalwqy4pni7evrpj on "RegistrarPocUpdateHistory" (registrar_id); -create index IDXm6k18dusy2lfi5y81k8g256sa on "RegistrarUpdateHistory" (history_acting_user); -create index IDX3d1mucv7axrhud8w8jl4vsu62 on "RegistrarUpdateHistory" (registrar_id); -create index idx_registry_lock_verification_code on "RegistryLock" (verification_code); -create index idx_registry_lock_registrar_id on "RegistryLock" (registrar_id); + create index IDX9g3s7mjv1yn4t06nqid39whss + on "AllocationToken" (token_type); - alter table if exists "RegistryLock" - add constraint idx_registry_lock_repo_id_revision_id unique (repo_id, revision_id); -create index reservedlist_name_idx on "ReservedList" (name); -create index spec11threatmatch_registrar_id_idx on "Spec11ThreatMatch" (registrar_id); -create index spec11threatmatch_tld_idx on "Spec11ThreatMatch" (tld); -create index spec11threatmatch_check_date_idx on "Spec11ThreatMatch" (check_date); -create index IDXbjacjlm8ianc4kxxvamnu94k5 on "UserUpdateHistory" (history_acting_user); -create index IDX5yqacw829y5bm6f7eajsq1cts on "UserUpdateHistory" (email_address); + create index IDXtmlqd31dpvvd2g1h9i7erw6aj + on "AllocationToken" (redemption_domain_repo_id); + + create index IDXih4b2tea127p5rb61gje6e1y2 + on "BillingCancellation" (registrar_id); + + create index IDX2exdfbx6oiiwnhr8j6gjpqt2j + on "BillingCancellation" (event_time); + + create index IDXl8vobbecsd32k4ksavdfx8st6 + on "BillingCancellation" (domain_repo_id); + + create index IDXqa3g92jc17e8dtiaviy4fet4x + on "BillingCancellation" (billing_time); + + create index IDX4ytbe5f3b39trsd4okx5ijhs4 + on "BillingCancellation" (billing_event_id); + + create index IDXku0fopwyvd57ebo8bf0jg9xo2 + on "BillingCancellation" (billing_recurrence_id); + + create index IDXqspv57gj2led8ly42fq01t7m7 + on "BillingEvent" (registrar_id); + + create index IDX5yfbr88439pxw0v3j86c74fp8 + on "BillingEvent" (event_time); + + create index IDX6py6ocrab0ivr76srcd2okpnq + on "BillingEvent" (billing_time); + + create index IDXplxf9v56p0wg8ws6qsvd082hk + on "BillingEvent" (synthetic_creation_time); + + create index IDXbgfmveqa7e5hn689koikwn70r + on "BillingEvent" (domain_repo_id); + + create index IDXcesda59ssop44kklytpb292hn + on "BillingEvent" (allocation_token); + + create index IDX6ebt3nwk5ocvnremnhnlkl6ff + on "BillingEvent" (cancellation_matching_billing_recurrence_id); + + create index IDXd3gxhkh0jk694pjvh9pyn7wjc + on "BillingRecurrence" (registrar_id); + + create index IDX6syykou4nkc7hqa5p8r92cpch + on "BillingRecurrence" (event_time); + + create index IDXoqttafcywwdn41um6kwlt0n8b + on "BillingRecurrence" (domain_repo_id); + + create index IDXp3usbtvk0v1m14i5tdp4xnxgc + on "BillingRecurrence" (recurrence_end_time); + + create index IDXp0pxi708hlu4n40qhbtihge8x + on "BillingRecurrence" (recurrence_last_expansion); + + create index IDXjny8wuot75b5e6p38r47wdawu + on "BillingRecurrence" (recurrence_time_of_year); + + create index IDXj874kw19bgdnkxo1rue45jwlw + on "BsaDownload" (creation_time); + + create index IDXcclyb3n5gbex8u8m9fjlujitw + on "ConsoleEppActionHistory" (history_acting_user); + + create index IDX6y67d6wsffmr6jcxax5ghwqhd + on "ConsoleEppActionHistory" (repo_id); + + create index IDXiahqo1d1fqdfknywmj2xbxl7t + on "ConsoleEppActionHistory" (revision_id); + + create index IDX3y752kr9uh4kh6uig54vemx0l + on "Contact" (creation_time); + + create index IDXtm415d6fe1rr35stm33s5mg18 + on "Contact" (current_sponsor_registrar_id); + + create index IDXn1f711wicdnooa2mqb7g1m55o + on "Contact" (deletion_time); + + create index IDXoqd7n4hbx86hvlgkilq75olas + on "Contact" (contact_id); + + create index IDX1p3esngcwwu6hstyua6itn6ff + on "Contact" (search_name); + + create index IDXo1xdtpij2yryh0skxe9v91sep + on "ContactHistory" (creation_time); + + create index IDXhp33wybmb6tbpr1bq7ttwk8je + on "ContactHistory" (history_registrar_id); + + create index IDX9q53px6r302ftgisqifmc6put + on "ContactHistory" (history_type); + + create index IDXsudwswtwqnfnx2o1hx4s0k0g5 + on "ContactHistory" (history_modification_time); + + create index IDXhlqqd5uy98cjyos72d81x9j95 + on "DelegationSignerData" (domain_repo_id); + + create index IDX8gtvnbk64yskcvrdp61f5ied3 + on "DnsRefreshRequest" (request_time); + + create index IDXfdk2xpil2x1gh0omt84k2y3o1 + on "DnsRefreshRequest" (last_process_time); + + create index IDXnb02m43jcx24r64n8rbg22u4q + on "Domain" (admin_contact); + + create index IDXlrq7v63pc21uoh3auq6eybyhl + on "Domain" (autorenew_end_time); + + create index IDXq9gy8x2xynt9tb16yajn1gcm8 + on "Domain" (billing_contact); + + create index IDX8nr0ke9mrrx4ewj6pd2ag4rmr + on "Domain" (creation_time); + + create index IDXhsjqiy2lyobfymplb28nm74lm + on "Domain" (current_sponsor_registrar_id); + + create index IDX5mnf0wn20tno4b9do88j61klr + on "Domain" (deletion_time); + + create index IDXc5aw4pk1vkd6ymhvkpanmoadv + on "Domain" (domain_name); + + create index IDXr22ciyccwi9rrqmt1ro0s59qf + on "Domain" (tech_contact); + + create index IDXrwl38wwkli1j7gkvtywi9jokq + on "Domain" (tld); + + create index IDXa7fu0bqynfb79rr80528b4jqt + on "Domain" (registrant_contact); + + create index IDXnjhib7v6fj7dhj5qydkefkl2u + on "Domain" (lordn_phase); + + create index IDXsfci08jgsymxy6ovh4k7r358c + on "Domain" (billing_recurrence_id); + + create index IDX3y3k7m2bkgahm9sixiohgyrga + on "Domain" (transfer_billing_event_id); + + create index IDXcju58vqascbpve1t7fem53ctl + on "Domain" (transfer_billing_recurrence_id); + + create index IDXhteajcrxmq4o8rsys8kevyiqr + on "Domain" (transfer_billing_cancellation_id); + + create index IDXrh4xmrot9bd63o382ow9ltfig + on "DomainHistory" (creation_time); + + create index IDXaro1omfuaxjwmotk3vo00trwm + on "DomainHistory" (history_registrar_id); + + create index IDXsu1nam10cjes9keobapn5jvxj + on "DomainHistory" (history_type); + + create index IDX6w3qbtgce93cal2orjg1tw7b7 + on "DomainHistory" (history_modification_time); + + create index IDX69qun5kxt3eux5igrxrqcycv0 + on "DomainHistoryHost" (domain_history_domain_repo_id); + + create index IDXjw3rwtfrexyq53x9vu7qghrdt + on "DomainHost" (host_repo_id); + + create index IDXj1mtx98ndgbtb1bkekahms18w + on "GracePeriod" (domain_repo_id); + + create index IDXbgssjudpm428mrv0xfpvgifps + on "GracePeriod" (billing_event_id); + + create index IDX5u5m6clpk3nktrvtyy5umacb6 + on "GracePeriod" (billing_recurrence_id); + + create index IDXd01j17vrpjxaerxdmn8bwxs7s + on "GracePeriodHistory" (domain_repo_id); + + create index IDXkpkh68n6dy5v51047yr6b0e9l + on "Host" (host_name); + + create index IDXy98mebut8ix1v07fjxxdkqcx + on "Host" (creation_time); + + create index IDXovmntef6l45tw2bsfl56tcugx + on "Host" (deletion_time); + + create index IDXl49vydnq0h5j1piefwjy4i8er + on "Host" (current_sponsor_registrar_id); + + create index IDXorp4yv9ult4ds6kgxo5fs5gnw + on "Host" (superordinate_domain); + + create index IDXfg2nnjlujxo6cb9fha971bq2n + on "HostHistory" (creation_time); + + create index IDX1iy7njgb7wjmj9piml4l2g0qi + on "HostHistory" (history_registrar_id); + + create index IDXkkwbwcwvrdkkqothkiye4jiff + on "HostHistory" (host_name); + + create index IDXknk8gmj7s47q56cwpa6rmpt5l + on "HostHistory" (history_type); + + create index IDX67qwkjtlq5q8dv6egtrtnhqi7 + on "HostHistory" (history_modification_time); + + create index IDXlg6a5tp70nch9cp0gc11brc5o + on "PackagePromotion" (token); + + create index IDXf2q9dqj899h1q8lah5y719nxd + on "PollMessage" (domain_repo_id); + + create index IDXe7wu46c7wpvfmfnj4565abibp + on "PollMessage" (registrar_id); + + create index IDXaydgox62uno9qx8cjlj5lauye + on "PollMessage" (event_time); + + create index premiumlist_name_idx + on "PremiumList" (name); + + create index registrar_name_idx + on "Registrar" (registrar_name); + + create index registrar_iana_identifier_idx + on "Registrar" (iana_identifier); + + create index IDXrn6posxkx58de1cp09g5257cw + on "RegistrarPocUpdateHistory" (history_acting_user); + + create index IDXr1cxua6it0rxgt9tpyugspxk + on "RegistrarPocUpdateHistory" (email_address); + + create index IDXfr24wvpg8qalwqy4pni7evrpj + on "RegistrarPocUpdateHistory" (registrar_id); + + create index IDXm6k18dusy2lfi5y81k8g256sa + on "RegistrarUpdateHistory" (history_acting_user); + + create index IDX3d1mucv7axrhud8w8jl4vsu62 + on "RegistrarUpdateHistory" (registrar_id); + + create index idx_registry_lock_verification_code + on "RegistryLock" (verification_code); + + create index idx_registry_lock_registrar_id + on "RegistryLock" (registrar_id); + + create index reservedlist_name_idx + on "ReservedList" (name); + + create index spec11threatmatch_registrar_id_idx + on "Spec11ThreatMatch" (registrar_id); + + create index spec11threatmatch_tld_idx + on "Spec11ThreatMatch" (tld); + + create index spec11threatmatch_check_date_idx + on "Spec11ThreatMatch" (check_date); + + create index IDXbjacjlm8ianc4kxxvamnu94k5 + on "UserUpdateHistory" (history_acting_user); + + create index IDX5yqacw829y5bm6f7eajsq1cts + on "UserUpdateHistory" (email_address); alter table if exists "ConsoleEppActionHistory" add constraint FKb686b9os2nsjpv930npa4r3b4 diff --git a/dependencies.gradle b/dependencies.gradle index 1c3c99927..7c4156791 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -29,8 +29,6 @@ ext { // a dependency group can not work together. For example, the three // bouncycastle jars need to be hardcoded with the same version string // as of April, 2022. - // 6. Dependency constraints violation: e.g., Hibernate 6.0 requires - // Jakarta EE. // Note that since Gradle 7, for version labels to be strict, we need to // append '!!' to the end. Otherwise they may still be forced to upgrade. @@ -51,10 +49,11 @@ ext { // CAPPED VERSIONS START HERE. - // Hibernate 6.0+ requires Jakarta EE. - // TODO: Upgrade to 6.0+ after we migrate to Jakarta EE persistence. - 'org.hibernate:hibernate-core:[5.6.14.Final, 6.0)', - 'org.hibernate:hibernate-hikaricp:[5.6.14.Final, 6.0)', + // 6.6 is alpha. + 'org.hibernate.orm:hibernate-core:[6.0,6.6)!!', + 'org.hibernate.orm:hibernate-hikaricp:[6.0,6.6)!!', + // For SchemaExport + 'org.hibernate.orm:hibernate-ant:[6.0,6.6)!!', // Netty 4.2 is in alpha and causes runtime error. Also note that v5.0 // seems abandoned (last updated on Maven in 2015). @@ -68,10 +67,7 @@ ext { // OkHttp 5.0 is in alpha. 'com.squareup.okhttp3:okhttp:[4.10.0, 5.0.0)!!', - // jaxb-xjc 2.4 and above requires changing the namespace to Jakarta EE - // TODO: Remove the cap after we upgrade to Jakarta EE xml Binding - // (I think). - 'com.sun.xml.bind:jaxb-xjc:[2.3.3, 2.4)!!', + 'com.sun.xml.bind:jaxb-xjc:[4.0.5,)!!', // Dagger doesn't support the Jakarta namespace yet. Pre-2.0 Jakarta // Inject still use the old javax namespace. @@ -128,8 +124,10 @@ ext { 'com.google.cloud:google-cloud-tasks:[1.33.2,)', 'com.google.code.findbugs:jsr305:[3.0.2,)', 'com.google.code.gson:gson:[2.8.6,)', - 'com.google.dagger:dagger-compiler:[2.33,)', - 'com.google.dagger:dagger:[2.33,)', + // Version 2.51.1 is the last working version before dagger fully supports + // jakarta annotations. See comments on jakarta.inject below. + 'com.google.dagger:dagger-compiler:[2.33,2.51.2)!!', + 'com.google.dagger:dagger:[2.33,2.51.2)!!', 'com.google.errorprone:error_prone_annotations:[2.7.1,)', 'com.google.flogger:flogger-system-backend:[0.7.4,)', 'com.google.flogger:flogger:[0.7.4,)', @@ -154,20 +152,20 @@ ext { 'com.ibm.icu:icu4j:[68.2,)', 'com.jcraft:jsch:[0.1.55,)', 'com.squareup:javapoet:[1.13.0,)', - 'com.sun.activation:javax.activation:[1.2.0,)', - 'com.sun.xml.bind:jaxb-impl:[2.3.3,)', - 'com.sun.xml.bind:jaxb-osgi:[2.3.3,)', + 'com.sun.xml.bind:jaxb-impl:[4.0.5,)', + 'com.sun.xml.bind:jaxb-osgi:[4.0.5,)', 'com.zaxxer:HikariCP:[3.4.5,)', 'commons-codec:commons-codec:[1.15,)', - 'dnsjava:dnsjava:[3.3.1,)', + // TODO(b/358421673): v3.6 breaks schema-compatibility tests. + 'dnsjava:dnsjava:[3.3.1,3.6)!!', 'guru.nidi:graphviz-java-all-j2v8:[0.17.0,)', '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.mail:jakarta.mail-api:[2.1.3,)', + 'jakarta.persistence:jakarta.persistence-api:[3.2.0,)', 'jakarta.servlet:jakarta.servlet-api:[6.0,)', - 'javax.persistence:javax.persistence-api:[2.2,)', - 'javax.xml.bind:jaxb-api:[2.3.0,)', + 'jakarta.xml.bind:jakarta.xml.bind-api:[4.0.2,)', 'joda-time:joda-time:[2.9.2,)', 'junit:junit:[4.13,)', 'org.apache.avro:avro:[1.8.2,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index fb13a8a30..2986e4566 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=deploy_jar,runtimeClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath args4j:args4j:2.33=deploy_jar,runtimeClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.20.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -16,9 +15,9 @@ com.fasterxml.jackson:jackson-bom:2.17.2=deploy_jar,runtimeClasspath,testRuntime com.fasterxml:classmate:1.5.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -44,7 +43,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.66.0=deploy_ja com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -55,40 +54,40 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=deploy_jar,runtimeCla com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20240514-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.service:auto-service-annotations:1.1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -111,10 +110,10 @@ com.google.cloud:google-cloud-firestore:3.21.1=deploy_jar,runtimeClasspath,testR com.google.cloud:google-cloud-monitoring:3.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath @@ -123,7 +122,7 @@ com.google.common.html.types:types:1.0.6=deploy_jar,runtimeClasspath,testRuntime com.google.dagger:dagger:2.51.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.28.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.7.1=checkstyle com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -139,7 +138,7 @@ com.google.guava:failureaccess:1.0.2=deploy_jar,runtimeClasspath,testRuntimeClas com.google.guava:guava-parent:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=annotationProcessor,errorprone,testAnnotationProcessor -com.google.guava:guava:33.2.1-android=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -165,7 +164,7 @@ com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnno com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=deploy_jar,runtimeClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.ibm.icu:icu4j:73.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -190,11 +189,10 @@ com.squareup.wire:wire-swift-generator:4.5.0=deploy_jar,runtimeClasspath,testRun com.squareup:javapoet:1.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup:kotlinpoet-jvm:1.15.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.15.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:5.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=deploy_jar,runtimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-dbutils:commons-dbutils:1.8.1=deploy_jar,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -205,24 +203,24 @@ io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=deploy_jar,runt io.github.classgraph:classgraph:4.8.162=deploy_jar,runtimeClasspath,testRuntimeClasspath io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -257,45 +255,46 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=deploy_jar,runtimeClasspath,test io.opentelemetry:opentelemetry-sdk:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=deploy_jar,runtimeClasspath,testRuntimeClasspath joda-time:joda-time:2.10.14=deploy_jar,runtimeClasspath,testRuntimeClasspath junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=deploy_jar,runtimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.15=deploy_jar,runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:10.6=checkstyle -org.antlr:antlr4-runtime:4.7=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.antlr:antlr4-runtime:4.9.3=checkstyle org.apache.arrow:arrow-format:15.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -310,31 +309,31 @@ org.bouncycastle:bcutil-jdk18on:1.78.1=deploy_jar,runtimeClasspath,testRuntimeCl org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor -org.checkerframework:checker-qual:3.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=deploy_jar,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=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 +org.flywaydb:flyway-core:10.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath org.hamcrest:hamcrest:2.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt org.jacoco:org.jacoco.core:0.8.11=jacocoAnt org.jacoco:org.jacoco.report:0.8.11=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle -org.jboss.logging:jboss-logging:3.4.3.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -349,12 +348,11 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=deploy_jar,runtimeClasspath,testRun org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=deploy_jar,runtimeClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=deploy_jar,runtimeClasspath,testRuntimeClasspath org.json:json:20240303=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=deploy_jar,runtimeClasspath,testRuntimeClasspath org.ogce:xpp3:1.1.6=deploy_jar,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -371,21 +369,21 @@ org.rnorth.duct-tape:duct-tape:1.0.8=deploy_jar,runtimeClasspath,testRuntimeClas org.slf4j:slf4j-api:2.0.13=deploy_jar,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=deploy_jar,runtimeClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=deploy_jar,runtimeClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=deploy_jar,runtimeClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=deploy_jar,runtimeClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=deploy_jar,runtimeClasspath,testRuntimeClasspath empty=compileClasspath,providedCompile,providedRuntime,testCompileClasspath diff --git a/load-testing/gradle.lockfile b/load-testing/gradle.lockfile index e70da7187..6a189c97b 100644 --- a/load-testing/gradle.lockfile +++ b/load-testing/gradle.lockfile @@ -35,14 +35,14 @@ commons-collections:commons-collections:3.2.2=checkstyle info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor -io.netty:netty-buffer:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:10.6=checkstyle diff --git a/networking/gradle.lockfile b/networking/gradle.lockfile index 942c8b459..c27f73122 100644 --- a/networking/gradle.lockfile +++ b/networking/gradle.lockfile @@ -5,29 +5,29 @@ aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcess com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=testCompileClasspath,testRuntimeClasspath 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:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value:1.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-tasks:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor @@ -37,7 +37,8 @@ com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor, com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.26.1=compileClasspath -com.google.errorprone:error_prone_annotations:2.28.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.28.0=testCompileClasspath +com.google.errorprone:error_prone_annotations:2.29.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.7.1=checkstyle com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -53,8 +54,8 @@ com.google.guava:guava-parent:32.1.1-jre=errorprone com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.2.1-android=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-jre=compileClasspath +com.google.guava:guava:33.2.1-android=testCompileClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -67,43 +68,43 @@ com.google.protobuf:protobuf-java-util:3.25.3=deploy_jar,runtimeClasspath,testRu com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:75.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:9.3=checkstyle com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=deploy_jar,runtimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.65.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.65.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -111,10 +112,9 @@ io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.4.0-b180830.0359=deploy_jar,runtimeClasspath,testRuntimeClasspath joda-time:joda-time:2.12.7=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath @@ -135,8 +135,8 @@ org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=errorprone org.checkerframework:checker-qual:3.41.0=annotationProcessor,testAnnotationProcessor org.checkerframework:checker-qual:3.42.0=compileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=deploy_jar,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -153,16 +153,16 @@ org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProc org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.11.0-M2=testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.0-RC1=testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.6=jacocoAnt org.ow2.asm:asm-tree:9.6=jacocoAnt @@ -172,8 +172,8 @@ org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotatio 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,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=deploy_jar,runtimeClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath empty= diff --git a/prober/gradle.lockfile b/prober/gradle.lockfile index 23b41c503..bea79cd80 100644 --- a/prober/gradle.lockfile +++ b/prober/gradle.lockfile @@ -5,29 +5,29 @@ aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcess com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=testCompileClasspath,testRuntimeClasspath 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:2.6.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value:1.11.0=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-tasks:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor @@ -37,7 +37,8 @@ com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor, com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.27.0=compileClasspath -com.google.errorprone:error_prone_annotations:2.28.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.28.0=testCompileClasspath +com.google.errorprone:error_prone_annotations:2.29.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.7.1=checkstyle com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -53,8 +54,8 @@ com.google.guava:guava-parent:32.1.1-jre=errorprone com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.2.1-android=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-jre=compileClasspath +com.google.guava:guava:33.2.1-android=testCompileClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -70,43 +71,43 @@ com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnno com.google.protobuf:protobuf-java:3.25.3=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.re2j:re2j:1.1=compileClasspath,testCompileClasspath com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:75.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:9.3=checkstyle com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=deploy_jar,runtimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.65.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.65.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -114,10 +115,9 @@ io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.4.0-b180830.0359=deploy_jar,runtimeClasspath,testRuntimeClasspath joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath @@ -140,8 +140,8 @@ org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=errorprone org.checkerframework:checker-qual:3.41.0=annotationProcessor,testAnnotationProcessor org.checkerframework:checker-qual:3.42.0=compileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=deploy_jar,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -158,16 +158,16 @@ org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProc org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.11.0-M2=testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.0-RC1=testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath @@ -179,8 +179,8 @@ org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotatio 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,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=deploy_jar,runtimeClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/processor/build.gradle b/processor/build.gradle index d829cef57..99967454a 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -22,5 +22,5 @@ dependencies { implementation deps['com.google.code.findbugs:jsr305'] implementation deps['com.google.guava:guava'] implementation deps['com.squareup:javapoet'] - implementation deps['javax.persistence:javax.persistence-api'] + implementation deps['jakarta.persistence:jakarta.persistence-api'] } diff --git a/processor/gradle.lockfile b/processor/gradle.lockfile index fc07ef01c..943fcf41b 100644 --- a/processor/gradle.lockfile +++ b/processor/gradle.lockfile @@ -34,8 +34,8 @@ commons-collections:commons-collections:3.2.2=checkstyle info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor +jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor -javax.persistence:javax.persistence-api:2.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:10.6=checkstyle org.antlr:antlr4-runtime:4.9.3=checkstyle org.checkerframework:checker-qual:3.12.0=checkstyle diff --git a/processor/src/main/java/google/registry/processors/VKeyProcessor.java b/processor/src/main/java/google/registry/processors/VKeyProcessor.java index 574eb568a..a8b70fcf0 100644 --- a/processor/src/main/java/google/registry/processors/VKeyProcessor.java +++ b/processor/src/main/java/google/registry/processors/VKeyProcessor.java @@ -24,6 +24,8 @@ import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import java.io.IOException; import java.io.UncheckedIOException; import java.util.List; @@ -45,8 +47,6 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.util.ElementFilter; import javax.lang.model.util.Elements; import javax.lang.model.util.Types; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; /** Processor to generate {@link AttributeConverter} for {@code VKey} type. */ @SupportedAnnotationTypes("google.registry.persistence.WithVKey") diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index 543e5c737..e96644870 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -2,45 +2,59 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcessor -com.fasterxml.jackson.core:jackson-annotations:2.17.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.3=testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.17.2=testCompileClasspath +com.fasterxml.jackson.core:jackson-core:2.15.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.17.2=compileClasspath,testCompileClasspath +com.fasterxml.jackson:jackson-bom:2.15.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,testCompileClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=testCompileClasspath,testRuntimeClasspath 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:2.6.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-cloudkms:v1-rev20240613-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.29.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:gapic-google-cloud-storage-v2:2.41.0-alpha=compileClasspath,testCompileClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.29.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-cloud-storage-v2:2.41.0-alpha=compileClasspath,testCompileClasspath +com.google.api.grpc:proto-google-cloud-monitoring-v3:3.31.0=compileClasspath,testCompileClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.29.0-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-storage-v2:2.41.0-alpha=compileClasspath,testCompileClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.29.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.119.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.119.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,testCompileClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-cloudkms:v1-rev20240723-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20231012-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.apis:google-api-services-storage:v1-rev20240706-2.0.0=compileClasspath,testCompileClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value:1.11.0=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-core-grpc:2.40.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core-http:2.40.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-core:2.40.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-storage:2.40.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud.opentelemetry:exporter-metrics:0.31.0=compileClasspath,testCompileClasspath +com.google.cloud:google-cloud-core-grpc:2.26.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-grpc:2.41.0=compileClasspath,testCompileClasspath +com.google.cloud:google-cloud-core-http:2.26.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-core-http:2.41.0=compileClasspath,testCompileClasspath +com.google.cloud:google-cloud-core:2.41.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-monitoring:3.31.0=compileClasspath,testCompileClasspath +com.google.cloud:google-cloud-storage:2.29.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-storage:2.41.0=compileClasspath,testCompileClasspath +com.google.cloud:google-cloud-tasks:2.29.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.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor @@ -49,7 +63,7 @@ com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar, com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.7.1=checkstyle com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -65,13 +79,14 @@ com.google.guava:guava-parent:32.1.1-jre=errorprone com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.1.0-jre=compileClasspath -com.google.guava:guava:33.2.1-android=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-appengine:1.44.2=compileClasspath,testCompileClasspath com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client-jackson2:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-jackson2:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.http-client:google-http-client-jackson2:1.44.2=compileClasspath,testCompileClasspath com.google.http-client:google-http-client:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=checkstyle @@ -85,55 +100,76 @@ com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnno com.google.protobuf:protobuf-java:3.25.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.1=compileClasspath,testCompileClasspath com.google.re2j:re2j:1.7=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:75.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:9.3=checkstyle com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.17.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,testCompileClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-rls:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-api:1.60.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-auth:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-context:1.60.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-core:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-googleapis:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-inprocess:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-netty-shaded:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-opentelemetry:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-protobuf-lite:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-protobuf:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-rls:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,testCompileClasspath +io.grpc:grpc-util:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.65.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.65.Final=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.111.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.112.Final=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.opentelemetry.contrib:opentelemetry-gcp-resources:1.37.0-alpha=compileClasspath,testCompileClasspath +io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-api:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-context:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-sdk-common:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.40.0=compileClasspath,testCompileClasspath +io.opentelemetry:opentelemetry-sdk:1.40.0=compileClasspath,testCompileClasspath +io.perfmark:perfmark-api:0.26.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.4.0-b180830.0359=deploy_jar,runtimeClasspath,testRuntimeClasspath joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath @@ -155,7 +191,8 @@ org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testR org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=errorprone org.checkerframework:checker-qual:3.41.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.44.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,testCompileClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -174,16 +211,16 @@ org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProc org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.11.0-M2=testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.0-RC1=testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath @@ -194,9 +231,9 @@ org.ow2.asm:asm:9.7=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntime org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotationProcessor 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,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.9=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty= diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index 6fb09d899..ff3ba6b64 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.20.0=runtimeClasspath,testRuntimeClasspath @@ -13,11 +12,11 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,7 +41,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.66.0=compileCl com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,40 +52,40 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=compileClasspath,runt com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20240514-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,testCompileClasspath com.google.auto.value:auto-value-annotations:1.11.0=runtimeClasspath,testRuntimeClasspath @@ -107,24 +106,24 @@ com.google.cloud:google-cloud-firestore:3.21.1=compileClasspath,runtimeClasspath com.google.cloud:google-cloud-monitoring:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:google-extensions:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -147,7 +146,7 @@ com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,runtimeClasspath, com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=runtimeClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=runtimeClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:73.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -171,10 +170,9 @@ com.squareup.wire:wire-swift-generator:4.5.0=runtimeClasspath,testRuntimeClasspa com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -182,24 +180,27 @@ dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,tes io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-services:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.65.1=runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -235,42 +236,45 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath,runtimeClasspat io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.12=compileClasspath,testCompileClasspath +net.bytebuddy:byte-buddy:1.14.15=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr4-runtime:4.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.7=compileClasspath,testCompileClasspath org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -284,25 +288,25 @@ org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCom org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath org.checkerframework:checker-compat-qual:2.5.6=runtimeClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=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 +org.flywaydb:flyway-core:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.logging:jboss-logging:3.4.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath @@ -317,12 +321,11 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=compileClasspath,runtimeClasspath,t org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20240303=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=runtimeClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ogce:xpp3:1.1.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -335,21 +338,21 @@ org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompi org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,providedCompile,providedRuntime,testAnnotationProcessor diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile index 6fb09d899..ff3ba6b64 100644 --- a/services/bsa/gradle.lockfile +++ b/services/bsa/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.20.0=runtimeClasspath,testRuntimeClasspath @@ -13,11 +12,11 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,7 +41,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.66.0=compileCl com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,40 +52,40 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=compileClasspath,runt com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20240514-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,testCompileClasspath com.google.auto.value:auto-value-annotations:1.11.0=runtimeClasspath,testRuntimeClasspath @@ -107,24 +106,24 @@ com.google.cloud:google-cloud-firestore:3.21.1=compileClasspath,runtimeClasspath com.google.cloud:google-cloud-monitoring:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:google-extensions:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -147,7 +146,7 @@ com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,runtimeClasspath, com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=runtimeClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=runtimeClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:73.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -171,10 +170,9 @@ com.squareup.wire:wire-swift-generator:4.5.0=runtimeClasspath,testRuntimeClasspa com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -182,24 +180,27 @@ dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,tes io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-services:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.65.1=runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -235,42 +236,45 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath,runtimeClasspat io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.12=compileClasspath,testCompileClasspath +net.bytebuddy:byte-buddy:1.14.15=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr4-runtime:4.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.7=compileClasspath,testCompileClasspath org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -284,25 +288,25 @@ org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCom org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath org.checkerframework:checker-compat-qual:2.5.6=runtimeClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=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 +org.flywaydb:flyway-core:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.logging:jboss-logging:3.4.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath @@ -317,12 +321,11 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=compileClasspath,runtimeClasspath,t org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20240303=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=runtimeClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ogce:xpp3:1.1.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -335,21 +338,21 @@ org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompi org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,providedCompile,providedRuntime,testAnnotationProcessor diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index 6fb09d899..ff3ba6b64 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.20.0=runtimeClasspath,testRuntimeClasspath @@ -13,11 +12,11 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,7 +41,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.66.0=compileCl com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,40 +52,40 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=compileClasspath,runt com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20240514-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,testCompileClasspath com.google.auto.value:auto-value-annotations:1.11.0=runtimeClasspath,testRuntimeClasspath @@ -107,24 +106,24 @@ com.google.cloud:google-cloud-firestore:3.21.1=compileClasspath,runtimeClasspath com.google.cloud:google-cloud-monitoring:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:google-extensions:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -147,7 +146,7 @@ com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,runtimeClasspath, com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=runtimeClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=runtimeClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:73.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -171,10 +170,9 @@ com.squareup.wire:wire-swift-generator:4.5.0=runtimeClasspath,testRuntimeClasspa com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -182,24 +180,27 @@ dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,tes io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-services:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.65.1=runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -235,42 +236,45 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath,runtimeClasspat io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.12=compileClasspath,testCompileClasspath +net.bytebuddy:byte-buddy:1.14.15=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr4-runtime:4.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.7=compileClasspath,testCompileClasspath org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -284,25 +288,25 @@ org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCom org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath org.checkerframework:checker-compat-qual:2.5.6=runtimeClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=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 +org.flywaydb:flyway-core:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.logging:jboss-logging:3.4.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath @@ -317,12 +321,11 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=compileClasspath,runtimeClasspath,t org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20240303=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=runtimeClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ogce:xpp3:1.1.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -335,21 +338,21 @@ org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompi org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,providedCompile,providedRuntime,testAnnotationProcessor diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index 6fb09d899..ff3ba6b64 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.20.0=runtimeClasspath,testRuntimeClasspath @@ -13,11 +12,11 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,7 +41,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.66.0=compileCl com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,40 +52,40 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=compileClasspath,runt com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20240514-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,testCompileClasspath com.google.auto.value:auto-value-annotations:1.11.0=runtimeClasspath,testRuntimeClasspath @@ -107,24 +106,24 @@ com.google.cloud:google-cloud-firestore:3.21.1=compileClasspath,runtimeClasspath com.google.cloud:google-cloud-monitoring:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:google-extensions:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -147,7 +146,7 @@ com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,runtimeClasspath, com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=runtimeClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=runtimeClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:73.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -171,10 +170,9 @@ com.squareup.wire:wire-swift-generator:4.5.0=runtimeClasspath,testRuntimeClasspa com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -182,24 +180,27 @@ dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,tes io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-services:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.65.1=runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -235,42 +236,45 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath,runtimeClasspat io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.12=compileClasspath,testCompileClasspath +net.bytebuddy:byte-buddy:1.14.15=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr4-runtime:4.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.7=compileClasspath,testCompileClasspath org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -284,25 +288,25 @@ org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCom org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath org.checkerframework:checker-compat-qual:2.5.6=runtimeClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=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 +org.flywaydb:flyway-core:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.logging:jboss-logging:3.4.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath @@ -317,12 +321,11 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=compileClasspath,runtimeClasspath,t org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20240303=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=runtimeClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ogce:xpp3:1.1.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -335,21 +338,21 @@ org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompi org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,providedCompile,providedRuntime,testAnnotationProcessor diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index 6fb09d899..ff3ba6b64 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -1,7 +1,6 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -antlr:antlr:2.7.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath args4j:args4j:2.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.charleskorn.kaml:kaml:0.20.0=runtimeClasspath,testRuntimeClasspath @@ -13,11 +12,11 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=compileClasspath com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-constants:0.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -42,7 +41,7 @@ com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:6.66.0=compileCl com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:grpc-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:grpc-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:3.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.177.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,40 +52,40 @@ com.google.api.grpc:proto-google-cloud-firestore-v1:3.21.1=compileClasspath,runt com.google.api.grpc:proto-google-cloud-monitoring-v3:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.111.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-spanner-v1:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-admin-directory:directory_v1-rev20240618-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-bigquery:v2-rev20240623-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-admin-directory:directory_v1-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-bigquery:v2-rev20240727-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dataflow:v1b3-rev20240624-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-dns:v1-rev20240531-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-drive:v3-rev20240628-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dataflow:v1b3-rev20240709-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-drive:v3-rev20240730-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-groupssettings:v1-rev20220614-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-healthcare:v1-rev20240130-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iam:v2-rev20240530-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-iamcredentials:v1-rev20211203-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-monitoring:v3-rev20240616-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-monitoring:v3-rev20240728-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.apis:google-api-services-sheets:v4-rev20240514-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.apis:google-api-services-sheets:v4-rev20240716-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-sqladmin:v1beta4-rev20240622-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath,testCompileClasspath com.google.auto.value:auto-value-annotations:1.11.0=runtimeClasspath,testRuntimeClasspath @@ -107,24 +106,24 @@ com.google.cloud:google-cloud-firestore:3.21.1=compileClasspath,runtimeClasspath com.google.cloud:google-cloud-monitoring:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsub:1.129.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-pubsublite:1.13.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-secretmanager:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-secretmanager:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-spanner:6.66.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.cloud:google-cloud-storage:2.32.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.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.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:0.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger-system-backend:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:flogger:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flogger:google-extensions:0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.2.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.gwt:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -147,7 +146,7 @@ com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,runtimeClasspath, com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.template:soy:2021-02-01=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=runtimeClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=runtimeClasspath,testRuntimeClasspath com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:73.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jcraft:jsch:0.1.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -171,10 +170,9 @@ com.squareup.wire:wire-swift-generator:4.5.0=runtimeClasspath,testRuntimeClasspa com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet-jvm:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.15.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-dbutils:commons-dbutils:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -182,24 +180,27 @@ dnsjava:dnsjava:3.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,tes io.apicurio:apicurio-registry-protobuf-schema-utilities:3.0.0.M2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.classgraph:classgraph:4.8.162=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-census:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-netty:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-rls:1.62.2=runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-services:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-util:1.65.1=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.62.2=compileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.65.1=runtimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -235,42 +236,45 @@ io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath,runtimeClasspat io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.outfoxx:swiftpoet:1.3.1=runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.jdo:jdo2-api:2.3-20090302111651=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.persistence:javax.persistence-api:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.0.0.GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.12=compileClasspath,testCompileClasspath +net.bytebuddy:byte-buddy:1.14.15=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.antlr:antlr4-runtime:4.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.13.0=runtimeClasspath,testRuntimeClasspath +org.antlr:antlr4-runtime:4.7=compileClasspath,testCompileClasspath org.apache.arrow:arrow-format:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-memory-core:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.arrow:arrow-vector:15.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.avro:avro:1.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-job-management:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-model-pipeline:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-core-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-google-cloud-dataflow-java:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-runners-java-fn-execution:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-expansion-service:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-arrow:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-avro:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-extensions-protobuf:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-harness:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.beam:beam-sdks-java-transform-service-launcher:2.57.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-job-management:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-model-pipeline:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-core-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-runners-java-fn-execution:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-expansion-service:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-arrow:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-avro:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-extensions-protobuf:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-harness:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.beam:beam-sdks-java-transform-service-launcher:2.58.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-grpc-1_60_1:0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -284,25 +288,25 @@ org.bouncycastle:bcprov-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCom org.bouncycastle:bcutil-jdk18on:1.78.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,testCompileClasspath org.checkerframework:checker-compat-qual:2.5.6=runtimeClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.44.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=runtimeClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections-api:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.collections:eclipse-collections:11.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-core:10.15.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.flywaydb:flyway-database-postgresql:10.15.2=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 +org.flywaydb:flyway-core:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.flywaydb:flyway-database-postgresql:10.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=runtimeClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=runtimeClasspath,testRuntimeClasspath org.gwtproject:gwt-user:2.10.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-core:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-hikaricp:5.6.15.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.logging:jboss-logging:3.4.3.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss:jandex:2.4.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=runtimeClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-ant:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-core:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate.orm:hibernate-hikaricp:6.5.2.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=runtimeClasspath,testRuntimeClasspath org.jcommander:jcommander:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-bom:1.4.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.9.20=runtimeClasspath,testRuntimeClasspath @@ -317,12 +321,11 @@ org.jetbrains.kotlinx:kotlinx-datetime:0.4.0=compileClasspath,runtimeClasspath,t org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline:3.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline:3.26.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.joda:joda-money:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20240303=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.18.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=runtimeClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ogce:xpp3:1.1.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -335,21 +338,21 @@ org.rnorth.duct-tape:duct-tape:1.0.8=compileClasspath,runtimeClasspath,testCompi org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-jdk14:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.1=runtimeClasspath,testRuntimeClasspath -org.testcontainers:database-commons:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:jdbc:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:postgresql:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:database-commons:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:jdbc:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:postgresql:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.w3c.css:sac:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-api:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-diagram:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-loader:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-postgresql:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-text:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-tools:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler-utility:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -us.fatehi:schemacrawler:16.21.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-api:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-diagram:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-loader:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-postgresql:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-text:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-tools:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler-utility:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +us.fatehi:schemacrawler:16.22.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath xerces:xmlParserAPIs:2.6.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,providedCompile,providedRuntime,testAnnotationProcessor diff --git a/util/build.gradle b/util/build.gradle index 40f8e9a9f..f9079c1a9 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -35,7 +35,7 @@ dependencies { runtimeOnly deps['org.eclipse.angus:jakarta.mail'] implementation deps['jakarta.mail:jakarta.mail-api'] implementation deps['jakarta.inject:jakarta.inject-api'] - implementation deps['javax.xml.bind:jaxb-api'] + implementation deps['jakarta.xml.bind:jakarta.xml.bind-api'] implementation deps['joda-time:joda-time'] implementation deps['org.bouncycastle:bcpkix-jdk18on'] implementation deps['org.bouncycastle:bcprov-jdk18on'] diff --git a/util/gradle.lockfile b/util/gradle.lockfile index f6810a426..568dada68 100644 --- a/util/gradle.lockfile +++ b/util/gradle.lockfile @@ -5,30 +5,30 @@ aopalliance:aopalliance:1.0=annotationProcessor,errorprone,testAnnotationProcess com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:3.0.5=annotationProcessor,errorprone,testAnnotationProcessor com.github.ben-manes.caffeine:caffeine:3.1.8=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.3.6=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.3.6=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.0=testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.0=testCompileClasspath,testRuntimeClasspath 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:2.6.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2:2.46.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.136.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.136.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.41.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.33.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.50.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-httpjson:2.50.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.50.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.23.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.23.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2:2.47.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.137.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.137.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.42.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.37.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:api-common:2.34.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-grpc:2.51.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax-httpjson:2.51.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.api:gax:2.51.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.24.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.24.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value-annotations:1.10.4=compileClasspath com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=annotationProcessor,errorprone,testAnnotationProcessor com.google.auto.value:auto-value:1.11.0=annotationProcessor,deploy_jar,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationProcessor -com.google.cloud:google-cloud-tasks:2.46.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.cloud:google-cloud-tasks:2.47.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,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.11.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor @@ -37,7 +37,7 @@ com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar, com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.29.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.7.1=checkstyle com.google.errorprone:error_prone_check_api:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_core:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor @@ -54,9 +54,7 @@ com.google.guava:guava-testlib:33.2.1-jre=testCompileClasspath,testRuntimeClassp com.google.guava:guava:31.0.1-jre=checkstyle com.google.guava:guava:32.1.1-jre=errorprone com.google.guava:guava:33.0.0-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.1.0-jre=compileClasspath -com.google.guava:guava:33.2.1-android=deploy_jar,runtimeClasspath -com.google.guava:guava:33.2.1-jre=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-jre=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-apache-v2:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.http-client:google-http-client-gson:1.44.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -69,33 +67,33 @@ com.google.protobuf:protobuf-java-util:3.25.3=compileClasspath,deploy_jar,runtim com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor com.google.protobuf:protobuf-java:3.25.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.re2j:re2j:1.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.truth:truth:1.4.3=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.truth:truth:1.4.4=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.ibm.icu:icu4j:75.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:9.3=checkstyle com.squareup:javapoet:1.13.0=annotationProcessor,testAnnotationProcessor com.squareup:kotlinpoet:1.11.0=annotationProcessor,testAnnotationProcessor commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.17.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle commons-logging:commons-logging:1.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.62.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.62.2=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-services:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.65.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-xds:1.65.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -103,10 +101,9 @@ io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.4.0-b180830.0359=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.12.7=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.15=testCompileClasspath,testRuntimeClasspath @@ -127,13 +124,13 @@ org.checkerframework:checker-compat-qual:2.5.6=compileClasspath,deploy_jar,runti org.checkerframework:checker-qual:3.12.0=checkstyle org.checkerframework:checker-qual:3.33.0=errorprone org.checkerframework:checker-qual:3.41.0=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.44.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=deploy_jar,runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.45.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=deploy_jar,runtimeClasspath,testRuntimeClasspath org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath org.eclipse.angus:jakarta.mail:2.0.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:3.0=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.11=jacocoAnt org.jacoco:org.jacoco.core:0.8.11=jacocoAnt @@ -146,15 +143,15 @@ org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProc org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:0.3.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.11.0-M2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.11.0-M2=testRuntimeClasspath -org.junit:junit-bom:5.11.0-M2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.0-RC1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.0-RC1=testRuntimeClasspath +org.junit:junit-bom:5.11.0-RC1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.12.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:5.12.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath @@ -167,8 +164,8 @@ org.pcollections:pcollections:3.1.4=annotationProcessor,errorprone,testAnnotatio 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,testRuntimeClasspath -org.testcontainers:junit-jupiter:1.19.8=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.19.8=testCompileClasspath,testRuntimeClasspath +org.testcontainers:junit-jupiter:1.20.1=testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.20.1=testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.6.9=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:2.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty= diff --git a/util/src/main/java/google/registry/util/XmlEnumUtils.java b/util/src/main/java/google/registry/util/XmlEnumUtils.java index 49d0ea404..484d89b59 100644 --- a/util/src/main/java/google/registry/util/XmlEnumUtils.java +++ b/util/src/main/java/google/registry/util/XmlEnumUtils.java @@ -14,7 +14,7 @@ package google.registry.util; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; /** Utility methods related to xml enums. */ public class XmlEnumUtils { diff --git a/util/src/main/java/google/registry/util/XmlToEnumMapper.java b/util/src/main/java/google/registry/util/XmlToEnumMapper.java index 80de7cd45..85f01e37a 100644 --- a/util/src/main/java/google/registry/util/XmlToEnumMapper.java +++ b/util/src/main/java/google/registry/util/XmlToEnumMapper.java @@ -17,7 +17,7 @@ package google.registry.util; import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import com.google.common.collect.ImmutableMap; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; /** Efficient lookup from xml enums to java enums */ public final class XmlToEnumMapper> {