From f80c81a1115e9f6d2b1410663b2c19ca0b1aef8f Mon Sep 17 00:00:00 2001 From: Adrian Clay Date: Wed, 26 Jun 2024 10:38:48 +0100 Subject: [PATCH] NIAD-3119: Upgrade to Spring Framework 6.1 (#649) * Bump org.springframework.boot from 2.5.13 to 3.3.0 in /common Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.5.13 to 3.3.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.13...v3.3.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump org.springframework.boot from 2.5.12 to 3.3.0 in /db-connector Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.5.12 to 3.3.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.5.12...v3.3.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump org.springframework.boot from 2.7.18 to 3.3.0 in /gp2gp-translator Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.18 to 3.3.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.18...v3.3.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump org.springframework.boot from 2.7.18 to 3.3.0 in /gpc-api-facade Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 2.7.18 to 3.3.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.18...v3.3.0) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump io.rest-assured:rest-assured from 4.4.0 to 5.4.0 in /gpc-api-facade Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 4.4.0 to 5.4.0. - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.4.0...rest-assured-5.4.0) --- updated-dependencies: - dependency-name: io.rest-assured:rest-assured dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Switch from javax -> jakarta namespace Also switch Qpid JMS from 1.x to 2.x branch as 2.x supports jakarta * Fix Spring 6 breaking changes to StatusCode API --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- common/build.gradle | 6 ++--- db-connector/build.gradle | 2 +- gp2gp-translator/build.gradle | 2 +- .../pss/translator/amqp/ServiceFailureIT.java | 4 +-- .../translator/amqp/Gp2GpQueuePublisher.java | 2 +- .../pss/translator/amqp/JmsReader.java | 4 +-- .../amqp/MhsDaisyChainingQueueConsumer.java | 4 +-- .../pss/translator/amqp/MhsDlqPublisher.java | 2 +- .../pss/translator/amqp/MhsQueueConsumer.java | 4 +-- .../pss/translator/amqp/PssQueueConsumer.java | 6 ++--- .../service/AcknowledgeRecordService.java | 2 +- .../service/AttachmentHandlerService.java | 2 +- .../AttachmentReferenceUpdaterService.java | 2 +- .../service/InboundMessageMergingService.java | 4 +-- .../translator/task/COPCMessageHandler.java | 4 +-- .../task/EhrExtractMessageHandler.java | 4 +-- .../task/MhsQueueMessageHandler.java | 6 ++--- .../translator/task/QueueMessageHandler.java | 4 +-- .../task/scheduled/EHRTimeoutHandler.java | 2 +- .../translator/util/XmlUnmarshallUtil.java | 8 +++--- .../MhsDaisyChainingQueueConsumerTest.java | 4 +-- .../translator/amqp/MhsQueueConsumerTest.java | 4 +-- ...entHandlerServiceStoreAttachmentTests.java | 2 +- ...ttachmentReferenceUpdaterServiceTests.java | 2 +- .../InboundMessageMergingServiceTests.java | 4 +-- .../NackAckPreparationServiceTest.java | 2 +- .../SkeletonProcessingServiceTests.java | 2 +- .../task/COPCMessageHandlerTest.java | 4 +-- .../task/EhrExtractMessageHandlerTest.java | 4 +-- .../task/MhsQueueMessageHandlerTest.java | 6 ++--- .../task/QueueMessageHandlerTest.java | 4 +-- gpc-api-facade/build.gradle | 4 +-- .../common/methodNotAllowedResponseBody.json | 2 +- .../unsupportedMediaTypeResponseBody.json | 2 +- .../config/filter/ConversationIdFilter.java | 8 +++--- .../AcknowledgeRecordController.java | 4 +-- .../controller/PatientTransferController.java | 2 +- .../OperationOutcomeExceptionHandler.java | 21 ++++++++------- .../validation/PatientTransferRequest.java | 4 +-- .../PatientTransferRequestValidator.java | 4 +-- .../gpc/service/AcknowledgeRecordService.java | 4 +-- .../pss/gpc/amqp/PssQueuePublisherTest.java | 2 +- .../PatientTransferRequestValidatorTest.java | 2 +- schema/build.gradle | 4 +-- .../npfit/hl7/localisation/MessageType.java | 6 ++--- schema/src/main/java/org/hl7/v3/AD.java | 18 ++++++------- schema/src/main/java/org/hl7/v3/ADXP.java | 10 +++---- schema/src/main/java/org/hl7/v3/ANY.java | 10 +++---- .../java/org/hl7/v3/ActClassControlActX.java | 4 +-- .../hl7/v3/ActClassFinancialContractX.java | 4 +-- .../hl7/v3/ActClassObservationSeriesX.java | 4 +-- .../java/org/hl7/v3/ActClassObservationX.java | 4 +-- .../org/hl7/v3/ActClassPublicHealthCaseX.java | 4 +-- .../main/java/org/hl7/v3/ActClassROIX.java | 4 +-- .../main/java/org/hl7/v3/ActClassRootX.java | 4 +-- .../main/java/org/hl7/v3/ActClassSupplyX.java | 4 +-- .../java/org/hl7/v3/ActClinicalDocumentX.java | 4 +-- .../hl7/v3/ActDocumentStructureClassX.java | 4 +-- .../org/hl7/v3/ActMoodCompletionTrackX.java | 4 +-- .../main/java/org/hl7/v3/ActMoodIntentX.java | 4 +-- .../java/org/hl7/v3/ActMoodPredicateX.java | 6 ++--- .../hl7/v3/ActRelationshipConditionalX.java | 4 +-- .../org/hl7/v3/ActRelationshipExcerptX.java | 4 +-- .../org/hl7/v3/ActRelationshipFulfillsX.java | 4 +-- .../hl7/v3/ActRelationshipHasComponentX.java | 4 +-- .../org/hl7/v3/ActRelationshipOutcomeX.java | 4 +-- .../org/hl7/v3/ActRelationshipPertainsX.java | 4 +-- .../org/hl7/v3/ActRelationshipPostsX.java | 4 +-- .../org/hl7/v3/ActRelationshipReasonX.java | 4 +-- .../hl7/v3/ActRelationshipReplacementX.java | 4 +-- .../org/hl7/v3/ActRelationshipSequelX.java | 4 +-- .../main/java/org/hl7/v3/AskedButUnknown.java | 4 +-- schema/src/main/java/org/hl7/v3/BIN.java | 10 +++---- schema/src/main/java/org/hl7/v3/BL.java | 8 +++--- schema/src/main/java/org/hl7/v3/BN.java | 8 +++--- schema/src/main/java/org/hl7/v3/CD.java | 16 ++++++------ schema/src/main/java/org/hl7/v3/CE.java | 8 +++--- schema/src/main/java/org/hl7/v3/CO.java | 6 ++--- .../v3/COPCIN000001UK01ControlActEvent.java | 8 +++--- .../org/hl7/v3/COPCIN000001UK01Message.java | 2 +- .../org/hl7/v3/COPCIN000001UK01Subject.java | 6 ++--- .../hl7/v3/COPCMT000001UK01PayloadBody.java | 6 ++--- .../COPCMT000001UK01PayloadInformation.java | 6 ++--- .../COPCMT000001UK01PertinentInformation.java | 6 ++--- schema/src/main/java/org/hl7/v3/CR.java | 8 +++--- schema/src/main/java/org/hl7/v3/CS.java | 6 ++--- schema/src/main/java/org/hl7/v3/CV.java | 8 +++--- .../org/hl7/v3/ContextControlAdditiveX.java | 4 +-- .../hl7/v3/ContextControlNonPropagatingX.java | 4 +-- .../org/hl7/v3/ContextControlOverridingX.java | 4 +-- .../hl7/v3/ContextControlPropagatingX.java | 4 +-- .../java/org/hl7/v3/CsAddressPartType.java | 4 +-- .../java/org/hl7/v3/CsBinaryDataEncoding.java | 6 ++--- .../main/java/org/hl7/v3/CsCalendarCycle.java | 4 +-- .../org/hl7/v3/CsCompressionAlgorithm.java | 4 +-- .../org/hl7/v3/CsEntityNamePartQualifier.java | 4 +-- .../java/org/hl7/v3/CsEntityNamePartType.java | 4 +-- .../main/java/org/hl7/v3/CsEntityNameUse.java | 6 ++--- .../org/hl7/v3/CsIntegrityCheckAlgorithm.java | 6 ++--- .../main/java/org/hl7/v3/CsNullFlavor.java | 4 +-- .../java/org/hl7/v3/CsPostalAddressUse.java | 4 +-- .../hl7/v3/CsProbabilityDistributionType.java | 6 ++--- .../main/java/org/hl7/v3/CsSetOperator.java | 4 +-- .../hl7/v3/CsTelecommunicationAddressUse.java | 4 +-- .../main/java/org/hl7/v3/CsTimingEvent.java | 4 +-- .../main/java/org/hl7/v3/CsUpdateMode.java | 6 ++--- .../java/org/hl7/v3/DocumentTableCellX.java | 4 +-- .../hl7/v3/DocumentTableColumnStructureX.java | 4 +-- .../hl7/v3/DocumentTableRowStructureX.java | 4 +-- schema/src/main/java/org/hl7/v3/ED.java | 16 ++++++------ .../java/org/hl7/v3/EDNPfITTextXHTML.java | 6 ++--- schema/src/main/java/org/hl7/v3/EN.java | 10 +++---- schema/src/main/java/org/hl7/v3/ENXP.java | 10 +++---- .../src/main/java/org/hl7/v3/EnDelimiter.java | 6 ++--- schema/src/main/java/org/hl7/v3/EnFamily.java | 6 ++--- schema/src/main/java/org/hl7/v3/EnGiven.java | 6 ++--- schema/src/main/java/org/hl7/v3/EnPrefix.java | 6 ++--- schema/src/main/java/org/hl7/v3/EnSuffix.java | 6 ++--- .../org/hl7/v3/EntityClassContainerX.java | 4 +-- .../java/org/hl7/v3/EntityClassDeviceX.java | 4 +-- .../hl7/v3/EntityClassDocumentReceivingX.java | 4 +-- .../org/hl7/v3/EntityClassLivingSubjectX.java | 4 +-- .../java/org/hl7/v3/EntityClassMaterialX.java | 4 +-- .../EntityClassNonPersonLivingSubjectX.java | 4 +-- .../org/hl7/v3/EntityClassOrganizationX.java | 4 +-- .../v3/EntityClassPersonOrOrgReceivingX.java | 4 +-- .../java/org/hl7/v3/EntityClassPlaceX.java | 4 +-- .../java/org/hl7/v3/EntityClassRootX.java | 4 +-- .../hl7/v3/EntityDeterminerDeterminedX.java | 4 +-- .../java/org/hl7/v3/EntityDeterminerX.java | 4 +-- .../java/org/hl7/v3/EntityStatusNormalX.java | 6 ++--- .../main/java/org/hl7/v3/EntityStatusX.java | 6 ++--- .../src/main/java/org/hl7/v3/HassupportX.java | 4 +-- schema/src/main/java/org/hl7/v3/II.java | 8 +++--- schema/src/main/java/org/hl7/v3/INT.java | 10 +++---- schema/src/main/java/org/hl7/v3/IVLINT.java | 16 ++++++------ schema/src/main/java/org/hl7/v3/IVLPQ.java | 10 +++---- schema/src/main/java/org/hl7/v3/IVLTS.java | 6 ++--- schema/src/main/java/org/hl7/v3/IVXBTS.java | 8 +++--- .../java/org/hl7/v3/LicensedEntityRoleX.java | 4 +-- .../src/main/java/org/hl7/v3/ListTypeX.java | 6 ++--- .../java/org/hl7/v3/MCAIMT040101UK03Act.java | 12 ++++----- .../org/hl7/v3/MCAIMT040101UK03Author.java | 14 +++++----- .../org/hl7/v3/MCAIMT040101UK03Author2.java | 14 +++++----- .../v3/MCAIMT040101UK03ControlActEvent.java | 14 +++++----- .../MCAIMT040101UK03DetectedIssueEvent.java | 14 +++++----- .../org/hl7/v3/MCAIMT040101UK03Reason.java | 14 +++++----- .../org/hl7/v3/MCAIMT040101UK03Subject.java | 14 +++++----- .../org/hl7/v3/MCCIMT010101UK12Agent.java | 12 ++++----- ...IMT010101UK12CommunicationFunctionRcv.java | 14 +++++----- ...IMT010101UK12CommunicationFunctionSnd.java | 14 +++++----- .../v3/MCCIMT010101UK12ControlActEvent.java | 12 ++++----- .../org/hl7/v3/MCCIMT010101UK12Device.java | 14 +++++----- .../org/hl7/v3/MCCIMT010101UK12Message.java | 16 ++++++------ .../hl7/v3/MCCIMT010101UK12Organization.java | 14 +++++----- schema/src/main/java/org/hl7/v3/MO.java | 12 ++++----- schema/src/main/java/org/hl7/v3/ON.java | 6 ++--- .../main/java/org/hl7/v3/ObjectFactory.java | 6 ++--- schema/src/main/java/org/hl7/v3/Other.java | 4 +-- schema/src/main/java/org/hl7/v3/PN.java | 6 ++--- schema/src/main/java/org/hl7/v3/PQ.java | 12 ++++----- schema/src/main/java/org/hl7/v3/PQInc.java | 14 +++++----- schema/src/main/java/org/hl7/v3/PQR.java | 8 +++--- .../org/hl7/v3/ParticipationAncillaryX.java | 4 +-- .../org/hl7/v3/ParticipationConsumableX.java | 4 +-- .../hl7/v3/ParticipationIndirectTargetX.java | 4 +-- .../ParticipationInformationGeneratorX.java | 4 +-- .../ParticipationInformationRecipientX.java | 4 +-- .../v3/ParticipationPhysicalPerformerX.java | 4 +-- .../hl7/v3/ParticipationTargetDeviceX.java | 4 +-- .../hl7/v3/ParticipationTargetDirectX.java | 4 +-- .../hl7/v3/ParticipationTargetLocationX.java | 4 +-- .../java/org/hl7/v3/ParticipationTypeX.java | 4 +-- .../org/hl7/v3/ParticipationVerifierX.java | 4 +-- schema/src/main/java/org/hl7/v3/QTY.java | 8 +++--- .../org/hl7/v3/RCCTMT120101UK01Agent.java | 14 +++++----- .../org/hl7/v3/RCCTMT120101UK01AgentSDS.java | 14 +++++----- .../org/hl7/v3/RCCTMT120101UK01Device.java | 12 ++++----- .../org/hl7/v3/RCCTMT120101UK01DeviceSDS.java | 14 +++++----- .../hl7/v3/RCCTMT120101UK01Organization.java | 12 ++++----- .../v3/RCCTMT120101UK01OrganizationSDS.java | 14 +++++----- .../org/hl7/v3/RCCTMT120101UK01Person.java | 12 ++++----- .../org/hl7/v3/RCCTMT120101UK01PersonSDS.java | 14 +++++----- .../v3/RCMRIN030000UK06ControlActEvent.java | 14 +++++----- .../org/hl7/v3/RCMRIN030000UK06Message.java | 14 +++++----- .../org/hl7/v3/RCMRIN030000UK06Subject.java | 14 +++++----- .../v3/RCMRIN030000UK07ControlActEvent.java | 14 +++++----- .../org/hl7/v3/RCMRIN030000UK07Message.java | 14 +++++----- .../org/hl7/v3/RCMRIN030000UK07Subject.java | 14 +++++----- .../v3/RCMRMT030101UK04AgentDirectory.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04AgentRef.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Annotation.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Author.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Author2.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Author3.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Author4.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Authorise.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Component.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Component02.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Component2.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Component3.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Component4.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Component6.java | 14 +++++----- .../v3/RCMRMT030101UK04CompositionRef.java | 16 ++++++------ .../v3/RCMRMT030101UK04CompoundStatement.java | 16 ++++++------ .../v3/RCMRMT030101UK04ConditionNamed.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Consumable.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Destination.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Discontinue.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Dispense.java | 16 ++++++------ .../v3/RCMRMT030101UK04EhrComposition.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04EhrEmpty.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04EhrExtract.java | 16 ++++++------ ...MRMT030101UK04EhrExtractSpecification.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04EhrFolder.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04EhrRequest.java | 16 ++++++------ .../v3/RCMRMT030101UK04ExternalDocument.java | 16 ++++++------ .../v3/RCMRMT030101UK04InFulfillmentOf.java | 16 ++++++------ .../v3/RCMRMT030101UK04InFulfillmentOf02.java | 16 ++++++------ .../v3/RCMRMT030101UK04InFulfillmentOf2.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Informant.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04InformantRole.java | 16 ++++++------ .../RCMRMT030101UK04InterpretationRange.java | 14 +++++----- .../hl7/v3/RCMRMT030101UK04Limitation.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04LinkSet.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04LocatedEntity.java | 14 +++++----- .../org/hl7/v3/RCMRMT030101UK04Location.java | 16 ++++++------ .../RCMRMT030101UK04ManufacturedProduct.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Material.java | 16 ++++++------ .../v3/RCMRMT030101UK04MedicationDosage.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04MedicationRef.java | 16 ++++++------ .../RCMRMT030101UK04MedicationStatement.java | 16 ++++++------ .../RCMRMT030101UK04NarrativeStatement.java | 16 ++++++------ .../RCMRMT030101UK04ObservationStatement.java | 16 ++++++------ .../java/org/hl7/v3/RCMRMT030101UK04Part.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Participant.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Participant2.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Patient.java | 16 ++++++------ .../v3/RCMRMT030101UK04PatientSubject.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Performer.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Person.java | 14 +++++----- .../RCMRMT030101UK04PersonalRelationship.java | 16 ++++++------ .../RCMRMT030101UK04PertinentInformation.java | 16 ++++++------ ...CMRMT030101UK04PertinentInformation02.java | 16 ++++++------ ...RCMRMT030101UK04PertinentInformation2.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Place.java | 12 ++++----- .../hl7/v3/RCMRMT030101UK04PlanStatement.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Predecessor.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Prescribe.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Product.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Reason.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Reference.java | 16 ++++++------ .../v3/RCMRMT030101UK04ReferenceRange.java | 16 ++++++------ ...RCMRMT030101UK04RegistrationStatement.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04ReplacementOf.java | 16 ++++++------ .../v3/RCMRMT030101UK04ReplacementOf2.java | 16 ++++++------ .../v3/RCMRMT030101UK04RequestStatement.java | 16 ++++++------ .../v3/RCMRMT030101UK04ResponsibleParty.java | 16 ++++++------ .../v3/RCMRMT030101UK04ResponsibleParty2.java | 16 ++++++------ .../v3/RCMRMT030101UK04ResponsibleParty3.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04ReversalOf.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04SequelTo.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Specimen.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04Specimen03.java | 16 ++++++------ .../v3/RCMRMT030101UK04SpecimenMaterial.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04SpecimenRole.java | 16 ++++++------ .../hl7/v3/RCMRMT030101UK04StatementRef.java | 16 ++++++------ .../org/hl7/v3/RCMRMT030101UK04Subject.java | 16 ++++++------ .../v3/RCMRMT030101UK04SupplyAnnotation.java | 16 ++++++------ schema/src/main/java/org/hl7/v3/REAL.java | 8 +++--- schema/src/main/java/org/hl7/v3/RTO.java | 6 ++--- .../src/main/java/org/hl7/v3/RTOQTYQTY.java | 14 +++++----- .../main/java/org/hl7/v3/RoleClassAgentX.java | 4 +-- .../org/hl7/v3/RoleClassAssignedEntityX.java | 4 +-- .../java/org/hl7/v3/RoleClassContactX.java | 4 +-- .../hl7/v3/RoleClassDistributedMaterialX.java | 4 +-- .../java/org/hl7/v3/RoleClassEmployeeX.java | 4 +-- .../hl7/v3/RoleClassInactiveIngredientX.java | 4 +-- .../hl7/v3/RoleClassIngredientEntityX.java | 4 +-- .../org/hl7/v3/RoleClassIsSpeciesEntityX.java | 4 +-- .../org/hl7/v3/RoleClassLocatedEntityX.java | 4 +-- .../hl7/v3/RoleClassManufacturedProductX.java | 4 +-- .../hl7/v3/RoleClassMutualRelationshipX.java | 4 +-- .../org/hl7/v3/RoleClassOntologicalX.java | 4 +-- .../java/org/hl7/v3/RoleClassPartitiveX.java | 4 +-- .../java/org/hl7/v3/RoleClassPassiveX.java | 4 +-- .../hl7/v3/RoleClassRelationshipFormalX.java | 4 +-- .../v3/RoleClassServiceDeliveryLocationX.java | 4 +-- .../java/org/hl7/v3/RoleClassSpecimenX.java | 4 +-- .../java/org/hl7/v3/RoleStatusNormalX.java | 6 ++--- .../src/main/java/org/hl7/v3/RoleStatusX.java | 6 ++--- schema/src/main/java/org/hl7/v3/SC.java | 12 ++++----- schema/src/main/java/org/hl7/v3/SXCMTS.java | 10 +++---- .../src/main/java/org/hl7/v3/StrucDocBr.java | 6 ++--- .../main/java/org/hl7/v3/StrucDocCaption.java | 24 ++++++++--------- .../src/main/java/org/hl7/v3/StrucDocCol.java | 16 ++++++------ .../java/org/hl7/v3/StrucDocColgroup.java | 16 ++++++------ .../main/java/org/hl7/v3/StrucDocContent.java | 24 ++++++++--------- .../java/org/hl7/v3/StrucDocFootnote.java | 24 ++++++++--------- .../java/org/hl7/v3/StrucDocFootnoteRef.java | 18 ++++++------- .../main/java/org/hl7/v3/StrucDocItem.java | 24 ++++++++--------- .../java/org/hl7/v3/StrucDocLinkHtml.java | 24 ++++++++--------- .../main/java/org/hl7/v3/StrucDocList.java | 18 ++++++------- .../java/org/hl7/v3/StrucDocParagraph.java | 24 ++++++++--------- .../org/hl7/v3/StrucDocRenderMultiMedia.java | 18 ++++++------- .../src/main/java/org/hl7/v3/StrucDocSub.java | 8 +++--- .../src/main/java/org/hl7/v3/StrucDocSup.java | 8 +++--- .../main/java/org/hl7/v3/StrucDocTable.java | 18 ++++++------- .../main/java/org/hl7/v3/StrucDocTbody.java | 18 ++++++------- .../src/main/java/org/hl7/v3/StrucDocTd.java | 26 +++++++++---------- .../main/java/org/hl7/v3/StrucDocText.java | 24 ++++++++--------- .../main/java/org/hl7/v3/StrucDocTfoot.java | 18 ++++++------- .../src/main/java/org/hl7/v3/StrucDocTh.java | 26 +++++++++---------- .../main/java/org/hl7/v3/StrucDocThead.java | 18 ++++++------- .../main/java/org/hl7/v3/StrucDocTitle.java | 24 ++++++++--------- .../java/org/hl7/v3/StrucDocTitleContent.java | 24 ++++++++--------- .../org/hl7/v3/StrucDocTitleFootnote.java | 24 ++++++++--------- .../src/main/java/org/hl7/v3/StrucDocTr.java | 20 +++++++------- schema/src/main/java/org/hl7/v3/TEL.java | 8 +++--- schema/src/main/java/org/hl7/v3/TN.java | 6 ++--- schema/src/main/java/org/hl7/v3/TS.java | 10 +++---- .../java/org/hl7/v3/TableRowGroupTypeX.java | 6 ++--- .../src/main/java/org/hl7/v3/Thumbnail.java | 6 ++--- .../v3/UKCTMT120301UK02AgentPersonSDS.java | 14 +++++----- .../org/hl7/v3/UKCTMT120301UK02PersonSDS.java | 14 +++++----- .../hl7/v3/UKCTMT120501UK03AgentOrgSDS.java | 16 ++++++------ .../v3/UKCTMT120501UK03OrganizationSDS.java | 16 ++++++------ .../org/hl7/v3/UKCTMT120501UK03Place.java | 14 +++++----- ...CTMT120501UK03ServiceDeliveryLocation.java | 16 ++++++------ .../v3/UKCTMT120901UK01AgentPersonSDS.java | 14 +++++----- .../java/org/hl7/v3/UKCTMT120901UK01Part.java | 14 +++++----- .../org/hl7/v3/UKCTMT120901UK01PersonSDS.java | 14 +++++----- .../org/hl7/v3/UKCTMT120901UK01SDSRole.java | 14 +++++----- .../v3/UKCTMT121001UK01AgentSystemSDS.java | 14 +++++----- .../org/hl7/v3/UKCTMT121001UK01SystemSDS.java | 14 +++++----- schema/src/main/java/org/hl7/v3/URL.java | 10 +++---- .../main/java/org/hl7/v3/ValueAdapter.java | 2 +- .../org/hl7/v3/XActMoodDefEvnRqoPrmsPrpX.java | 4 +-- .../main/java/org/hl7/v3/XActMoodDefEvnX.java | 4 +-- .../hl7/v3/XActMoodDocumentObservationX.java | 4 +-- .../org/hl7/v3/XActMoodEvnOrdPrmsPrpX.java | 4 +-- .../java/org/hl7/v3/XActMoodIntentEventX.java | 4 +-- .../java/org/hl7/v3/XActMoodOrdPrmsEvnX.java | 4 +-- .../java/org/hl7/v3/XActMoodOrdPrmsX.java | 4 +-- .../org/hl7/v3/XActMoodRqoPrpAptArqX.java | 4 +-- .../org/hl7/v3/XActRelationshipDocumentX.java | 4 +-- .../XActRelationshipExternalReferenceX.java | 4 +-- .../v3/XActRelationshipPatientTransportX.java | 4 +-- .../v3/XActRelationshipPertinentInfoX.java | 4 +-- .../org/hl7/v3/XDocumentEntrySubjectX.java | 4 +-- .../java/org/hl7/v3/XDocumentSubjectX.java | 4 +-- .../v3/XEncounterPerformerParticipationX.java | 4 +-- .../hl7/v3/XInformationRecipientRoleX.java | 4 +-- .../org/hl7/v3/XInformationRecipientX.java | 4 +-- .../v3/XParticipationAuthorPerformerX.java | 4 +-- .../hl7/v3/XParticipationVrfRespSprfWitX.java | 4 +-- .../v3/XRoleClassAccommodationRequestorX.java | 4 +-- .../hl7/v3/XRoleClassCoverageInvoiceX.java | 4 +-- .../java/org/hl7/v3/XRoleClassCoverageX.java | 4 +-- .../hl7/v3/XRoleClassCredentialedEntityX.java | 4 +-- .../XRoleClassPayeePolicyRelationshipX.java | 4 +-- .../main/java/org/hl7/v3/package-info.java | 2 +- .../java/xhtml/npfit/presentationtext/A.java | 18 ++++++------- .../npfit/presentationtext/BodyType.java | 10 +++---- .../xhtml/npfit/presentationtext/BrType.java | 6 ++--- .../xhtml/npfit/presentationtext/Caption.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/H2.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/H3.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/H4.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/H5.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/H6.java | 18 ++++++------- .../npfit/presentationtext/HeadType.java | 6 ++--- .../java/xhtml/npfit/presentationtext/Li.java | 20 +++++++------- .../npfit/presentationtext/ObjectFactory.java | 6 ++--- .../java/xhtml/npfit/presentationtext/Ol.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/P.java | 24 ++++++++--------- .../xhtml/npfit/presentationtext/Pre.java | 18 ++++++------- .../xhtml/npfit/presentationtext/Table.java | 16 ++++++------ .../xhtml/npfit/presentationtext/Tbody.java | 18 ++++++------- .../java/xhtml/npfit/presentationtext/Td.java | 16 ++++++------ .../xhtml/npfit/presentationtext/Tfoot.java | 10 +++---- .../java/xhtml/npfit/presentationtext/Th.java | 12 ++++----- .../xhtml/npfit/presentationtext/Thead.java | 12 ++++----- .../java/xhtml/npfit/presentationtext/Tr.java | 20 +++++++------- .../java/xhtml/npfit/presentationtext/Ul.java | 18 ++++++------- .../npfit/presentationtext/package-info.java | 2 +- 386 files changed, 1900 insertions(+), 1901 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 9c0a5afaa..997256931 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.5.13' + id 'org.springframework.boot' version '3.3.0' id 'io.spring.dependency-management' version '1.1.5' id 'java' id 'java-library' @@ -25,9 +25,7 @@ dependencies { api 'org.springframework.boot:spring-boot-starter-webflux' api 'org.springframework:spring-jms' api 'org.apache.commons:commons-lang3:3.14.0' - api ('org.apache.qpid:qpid-jms-client:1.3.0') { - exclude group: 'io.netty', module: 'netty-codec-http' - } + api 'org.apache.qpid:qpid-jms-client:2.5.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' diff --git a/db-connector/build.gradle b/db-connector/build.gradle index e62eb7dfb..4926ba94f 100644 --- a/db-connector/build.gradle +++ b/db-connector/build.gradle @@ -8,7 +8,7 @@ buildscript { } plugins { - id 'org.springframework.boot' version '2.5.12' + id 'org.springframework.boot' version '3.3.0' id 'io.spring.dependency-management' version '1.1.5' id 'java' id 'checkstyle' diff --git a/gp2gp-translator/build.gradle b/gp2gp-translator/build.gradle index 137b56ad1..25f8d4853 100644 --- a/gp2gp-translator/build.gradle +++ b/gp2gp-translator/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.7.18' + id 'org.springframework.boot' version '3.3.0' id 'io.spring.dependency-management' version '1.1.5' id 'java' id 'checkstyle' diff --git a/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/amqp/ServiceFailureIT.java b/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/amqp/ServiceFailureIT.java index eed354f5e..3f99262ad 100644 --- a/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/amqp/ServiceFailureIT.java +++ b/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/amqp/ServiceFailureIT.java @@ -60,8 +60,8 @@ import uk.nhs.adaptors.pss.translator.task.SendContinueRequestHandler; import uk.nhs.adaptors.pss.translator.task.SendNACKMessageHandler; import uk.nhs.adaptors.pss.util.BaseEhrHandler; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; @SpringBootTest(webEnvironment = RANDOM_PORT) diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/Gp2GpQueuePublisher.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/Gp2GpQueuePublisher.java index 4b4c5082e..cadb28860 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/Gp2GpQueuePublisher.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/Gp2GpQueuePublisher.java @@ -1,6 +1,6 @@ package uk.nhs.adaptors.pss.translator.amqp; -import javax.jms.Message; +import jakarta.jms.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/JmsReader.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/JmsReader.java index 2e2e641f8..a0f075f9c 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/JmsReader.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/JmsReader.java @@ -2,8 +2,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import org.apache.commons.codec.binary.Base64; import org.apache.qpid.jms.message.JmsBytesMessage; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumer.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumer.java index a06a9b838..b44b07b98 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumer.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumer.java @@ -1,7 +1,7 @@ package uk.nhs.adaptors.pss.translator.amqp; -import javax.jms.Message; -import javax.jms.Session; +import jakarta.jms.Message; +import jakarta.jms.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDlqPublisher.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDlqPublisher.java index b649b0bba..02405af3e 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDlqPublisher.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsDlqPublisher.java @@ -1,6 +1,6 @@ package uk.nhs.adaptors.pss.translator.amqp; -import javax.jms.Message; +import jakarta.jms.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumer.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumer.java index d4ccbae74..52edc3439 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumer.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumer.java @@ -1,7 +1,7 @@ package uk.nhs.adaptors.pss.translator.amqp; -import javax.jms.Message; -import javax.jms.Session; +import jakarta.jms.Message; +import jakarta.jms.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/PssQueueConsumer.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/PssQueueConsumer.java index 12cda3c96..14bde0970 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/PssQueueConsumer.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/amqp/PssQueueConsumer.java @@ -1,8 +1,8 @@ package uk.nhs.adaptors.pss.translator.amqp; -import javax.jms.Message; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Message; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AcknowledgeRecordService.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AcknowledgeRecordService.java index f111fe27c..bc8651a35 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AcknowledgeRecordService.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AcknowledgeRecordService.java @@ -14,7 +14,7 @@ import uk.nhs.adaptors.pss.translator.mhs.model.InboundMessage; import uk.nhs.adaptors.pss.translator.model.NACKReason; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.Map; import static uk.nhs.adaptors.common.enums.ConfirmationResponse.ABA_INCORRECT_PATIENT; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerService.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerService.java index da480efaa..94f69454a 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerService.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerService.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.zip.GZIPInputStream; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.ValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterService.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterService.java index e3f4d9a33..804551540 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterService.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterService.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.ValidationException; import org.apache.commons.text.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java index bb13ad351..49c908e52 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingService.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.Optional; -import javax.xml.bind.JAXBException; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.ValidationException; import javax.xml.transform.TransformerException; import org.hl7.v3.RCMRIN030000UK06Message; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java index 046f0889e..e32d2bc67 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java @@ -14,8 +14,8 @@ import java.util.Comparator; import java.util.List; -import javax.xml.bind.JAXBException; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.ValidationException; import org.hl7.v3.COPCIN000001UK01Message; import org.hl7.v3.RCMRIN030000UK06Message; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandler.java index a064a9066..9df13e8ba 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandler.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandler.java @@ -40,8 +40,8 @@ import uk.nhs.adaptors.pss.translator.util.DateFormatUtil; import uk.nhs.adaptors.pss.translator.util.XmlParseUtilService; -import javax.xml.bind.JAXBException; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.ValidationException; import javax.xml.transform.TransformerException; import java.text.ParseException; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandler.java index 7d629cad7..835fb8e54 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandler.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandler.java @@ -2,9 +2,9 @@ import static uk.nhs.adaptors.common.enums.MigrationStatus.EHR_GENERAL_PROCESSING_ERROR; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.xml.bind.JAXBException; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.TransformerException; import org.hl7.v3.RCMRIN030000UK06Message; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandler.java index 46feb9ee0..95f60ce39 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandler.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandler.java @@ -12,8 +12,8 @@ import uk.nhs.adaptors.common.service.MDCService; import uk.nhs.adaptors.pss.translator.service.AcknowledgeRecordService; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java index 61295d392..e8d02b55f 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/scheduled/EHRTimeoutHandler.java @@ -23,7 +23,7 @@ import java.time.format.DateTimeParseException; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.hl7.v3.RCMRIN030000UK06Message; import org.springframework.beans.factory.annotation.Autowired; diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/util/XmlUnmarshallUtil.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/util/XmlUnmarshallUtil.java index 2c61480bb..9430c5b71 100644 --- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/util/XmlUnmarshallUtil.java +++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/util/XmlUnmarshallUtil.java @@ -4,10 +4,10 @@ import java.io.File; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumerTest.java index 0f3c9fda6..ffe611289 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsDaisyChainingQueueConsumerTest.java @@ -6,8 +6,8 @@ import java.util.UUID; -import javax.jms.Message; -import javax.jms.Session; +import jakarta.jms.Message; +import jakarta.jms.Session; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumerTest.java index f3b84cc5b..a55032bc0 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/amqp/MhsQueueConsumerTest.java @@ -6,8 +6,8 @@ import java.util.UUID; -import javax.jms.Message; -import javax.jms.Session; +import jakarta.jms.Message; +import jakarta.jms.Session; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerServiceStoreAttachmentTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerServiceStoreAttachmentTests.java index bff38d330..4425fab8d 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerServiceStoreAttachmentTests.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentHandlerServiceStoreAttachmentTests.java @@ -20,7 +20,7 @@ import uk.nhs.adaptors.pss.translator.storage.StorageException; import uk.nhs.adaptors.pss.translator.storage.StorageManagerService; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.ValidationException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterServiceTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterServiceTests.java index 0606e81e5..36d92437f 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterServiceTests.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/AttachmentReferenceUpdaterServiceTests.java @@ -18,7 +18,7 @@ import java.io.StringReader; import java.util.List; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.ValidationException; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingServiceTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingServiceTests.java index bb3de54f5..a50f5e983 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingServiceTests.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/InboundMessageMergingServiceTests.java @@ -21,8 +21,8 @@ import java.util.ArrayList; -import javax.xml.bind.JAXBException; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.ValidationException; import javax.xml.transform.TransformerException; import org.hl7.v3.RCMRIN030000UK06Message; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/NackAckPreparationServiceTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/NackAckPreparationServiceTest.java index ae1a13bd7..6fc4ea328 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/NackAckPreparationServiceTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/NackAckPreparationServiceTest.java @@ -23,7 +23,7 @@ import static uk.nhs.adaptors.pss.translator.model.NACKReason.LARGE_MESSAGE_REASSEMBLY_FAILURE; import static uk.nhs.adaptors.pss.translator.model.NACKReason.LARGE_MESSAGE_ATTACHMENTS_NOT_RECEIVED; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.hl7.v3.COPCIN000001UK01Message; import org.hl7.v3.RCMRIN030000UK06Message; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java index 6b22b8354..ddd1ee071 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.TransformerException; import org.junit.jupiter.api.Test; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandlerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandlerTest.java index 3e221044d..92bda0bd1 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandlerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandlerTest.java @@ -30,8 +30,8 @@ import java.util.Arrays; import java.util.List; -import javax.xml.bind.JAXBException; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.ValidationException; import org.apache.commons.lang3.StringUtils; import org.hl7.v3.COPCIN000001UK01Message; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandlerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandlerTest.java index 551de680a..19cd52c12 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandlerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/EhrExtractMessageHandlerTest.java @@ -28,8 +28,8 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBException; -import javax.xml.bind.ValidationException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.ValidationException; import javax.xml.transform.TransformerException; import org.hl7.fhir.dstu3.model.Bundle; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandlerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandlerTest.java index 6170dc5bb..8e63b97b7 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandlerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/MhsQueueMessageHandlerTest.java @@ -17,9 +17,9 @@ import java.text.ParseException; import java.util.Locale; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.xml.bind.JAXBException; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.TransformerException; import org.hl7.v3.RCMRIN030000UK06Message; diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandlerTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandlerTest.java index 3eb9dfbe7..e3aad5ced 100644 --- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandlerTest.java +++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/task/QueueMessageHandlerTest.java @@ -13,8 +13,8 @@ import uk.nhs.adaptors.common.service.MDCService; import uk.nhs.adaptors.pss.translator.service.AcknowledgeRecordService; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import java.util.Locale; import java.util.UUID; diff --git a/gpc-api-facade/build.gradle b/gpc-api-facade/build.gradle index d9e847068..b200e054e 100644 --- a/gpc-api-facade/build.gradle +++ b/gpc-api-facade/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.7.18' + id 'org.springframework.boot' version '3.3.1' id 'io.spring.dependency-management' version '1.1.5' id 'java' id 'checkstyle' @@ -34,7 +34,7 @@ dependencies { testImplementation 'org.assertj:assertj-core:3.26.0' testImplementation 'org.projectlombok:lombok' testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation 'io.rest-assured:rest-assured:4.4.0' + testImplementation 'io.rest-assured:rest-assured:5.4.0' } test { diff --git a/gpc-api-facade/src/integrationTest/resources/responses/common/methodNotAllowedResponseBody.json b/gpc-api-facade/src/integrationTest/resources/responses/common/methodNotAllowedResponseBody.json index 3a6414b28..49229c567 100644 --- a/gpc-api-facade/src/integrationTest/resources/responses/common/methodNotAllowedResponseBody.json +++ b/gpc-api-facade/src/integrationTest/resources/responses/common/methodNotAllowedResponseBody.json @@ -18,7 +18,7 @@ } ] }, - "diagnostics": "Request method '{{requestMethod}}' not supported" + "diagnostics": "Request method '{{requestMethod}}' is not supported" } ] } \ No newline at end of file diff --git a/gpc-api-facade/src/integrationTest/resources/responses/common/unsupportedMediaTypeResponseBody.json b/gpc-api-facade/src/integrationTest/resources/responses/common/unsupportedMediaTypeResponseBody.json index d3ae6a43b..01dfa4a47 100644 --- a/gpc-api-facade/src/integrationTest/resources/responses/common/unsupportedMediaTypeResponseBody.json +++ b/gpc-api-facade/src/integrationTest/resources/responses/common/unsupportedMediaTypeResponseBody.json @@ -18,7 +18,7 @@ } ] }, - "diagnostics": "Content type 'text/plain' not supported" + "diagnostics": "Content-Type 'text/plain' is not supported" } ] } \ No newline at end of file diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/config/filter/ConversationIdFilter.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/config/filter/ConversationIdFilter.java index 3bfebcac3..c3a6afcb4 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/config/filter/ConversationIdFilter.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/config/filter/ConversationIdFilter.java @@ -6,10 +6,10 @@ import static org.springframework.util.ObjectUtils.isEmpty; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/AcknowledgeRecordController.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/AcknowledgeRecordController.java index 41869643c..aa39c4844 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/AcknowledgeRecordController.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/AcknowledgeRecordController.java @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RestController; import uk.nhs.adaptors.pss.gpc.service.AcknowledgeRecordService; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.OK; diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/PatientTransferController.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/PatientTransferController.java index 04394eddd..ca34ecab9 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/PatientTransferController.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/PatientTransferController.java @@ -25,7 +25,7 @@ import java.util.Map; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.hl7.fhir.dstu3.model.CodeableConcept; import org.hl7.fhir.dstu3.model.OperationOutcome; diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/handler/OperationOutcomeExceptionHandler.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/handler/OperationOutcomeExceptionHandler.java index ffd8da599..63598a597 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/handler/OperationOutcomeExceptionHandler.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/handler/OperationOutcomeExceptionHandler.java @@ -22,15 +22,15 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolationException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; import org.hl7.fhir.dstu3.model.CodeableConcept; import org.hl7.fhir.dstu3.model.OperationOutcome; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.lang.Nullable; @@ -64,7 +64,7 @@ public class OperationOutcomeExceptionHandler extends ResponseEntityExceptionHan @Override protected ResponseEntity handleNoHandlerFoundException( - NoHandlerFoundException ex, HttpHeaders requestHeaders, HttpStatus status, WebRequest request) { + NoHandlerFoundException ex, HttpHeaders requestHeaders, HttpStatusCode status, WebRequest request) { HttpServletRequest servletReq = ((ServletWebRequest) request).getRequest(); String errorMessage = servletReq.getRequestURI() + " not found"; CodeableConcept details = CodeableConceptUtils.createCodeableConcept("RESOURCE_NOT_FOUND", ISSUE_SYSTEM, "Resource not found", @@ -75,7 +75,7 @@ protected ResponseEntity handleNoHandlerFoundException( @Override protected ResponseEntity handleHttpRequestMethodNotSupported( - HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) { + HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) { headers.put(ALLOW, List.of(getAllowedMethods(request))); CodeableConcept details = CodeableConceptUtils.createCodeableConcept("METHOD_NOT_SUPPORTED", ISSUE_SYSTEM, "Method not supported", null); @@ -85,7 +85,7 @@ protected ResponseEntity handleHttpRequestMethodNotSupported( @Override protected ResponseEntity handleHttpMediaTypeNotSupported( - HttpMediaTypeNotSupportedException ex, HttpHeaders requestHeaders, HttpStatus status, WebRequest request) { + HttpMediaTypeNotSupportedException ex, HttpHeaders requestHeaders, HttpStatusCode status, WebRequest request) { CodeableConcept details = CodeableConceptUtils.createCodeableConcept("UNSUPPORTED_MEDIA_TYPE", ISSUE_SYSTEM, "Unsupported media " + "type", null); OperationOutcome operationOutcome = createOperationOutcome(NOTSUPPORTED, ERROR, details, ex.getMessage()); @@ -94,13 +94,13 @@ protected ResponseEntity handleHttpMediaTypeNotSupported( @Override protected ResponseEntity handleExceptionInternal( - Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { + Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatusCode status, WebRequest request) { return handleAllExceptions(ex); } @Override protected ResponseEntity handleHttpMessageNotReadable( - HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) { + HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) { return unprocessableEntityResponse(ex); } @@ -142,7 +142,8 @@ private ResponseEntity unprocessableEntityResponse(Exception ex) { return errorResponse(new HttpHeaders(), UNPROCESSABLE_ENTITY, operationOutcome); } - private ResponseEntity errorResponse(HttpHeaders headers, HttpStatus status, OperationOutcome operationOutcome) { + private ResponseEntity errorResponse(HttpHeaders headers, HttpStatusCode status, OperationOutcome operationOutcome) { + headers = HttpHeaders.writableHttpHeaders(headers); headers.put(CONTENT_TYPE, singletonList(APPLICATION_FHIR_JSON_VALUE)); String content = fhirParser.encodeToJson(operationOutcome); return new ResponseEntity<>(content, headers, status); @@ -153,7 +154,7 @@ private String getAllowedMethods(WebRequest request) { String requestURI = servletReq.getRequestURI(); return ALLOWED_METHODS.get(requestURI) .stream() - .map(Enum::name) + .map(HttpMethod::name) .collect(joining(",")); } } diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequest.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequest.java index d4bfa3ea1..bb6fad1bd 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequest.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequest.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Constraint(validatedBy = PatientTransferRequestValidator.class) @Target(PARAMETER) diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidator.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidator.java index 726174a74..fdd729e03 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidator.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidator.java @@ -2,8 +2,8 @@ import static java.util.Objects.nonNull; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.hl7.fhir.dstu3.model.Identifier; import org.hl7.fhir.dstu3.model.Parameters; diff --git a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/service/AcknowledgeRecordService.java b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/service/AcknowledgeRecordService.java index ea5979c2d..f0eca9a7c 100644 --- a/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/service/AcknowledgeRecordService.java +++ b/gpc-api-facade/src/main/java/uk/nhs/adaptors/pss/gpc/service/AcknowledgeRecordService.java @@ -10,8 +10,8 @@ import uk.nhs.adaptors.common.enums.MigrationStatus; import uk.nhs.adaptors.pss.gpc.amqp.PssQueuePublisher; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.Locale; diff --git a/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/amqp/PssQueuePublisherTest.java b/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/amqp/PssQueuePublisherTest.java index 77588b5be..7d715b546 100644 --- a/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/amqp/PssQueuePublisherTest.java +++ b/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/amqp/PssQueuePublisherTest.java @@ -6,7 +6,7 @@ import java.util.UUID; -import javax.jms.Session; +import jakarta.jms.Session; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidatorTest.java b/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidatorTest.java index fa9413529..56736a7c0 100644 --- a/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidatorTest.java +++ b/gpc-api-facade/src/test/java/uk/nhs/adaptors/pss/gpc/controller/validation/PatientTransferRequestValidatorTest.java @@ -4,7 +4,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidatorContext; import org.hl7.fhir.dstu3.model.BooleanType; import org.hl7.fhir.dstu3.model.Identifier; diff --git a/schema/build.gradle b/schema/build.gradle index 58fab52a6..ed4a102e4 100644 --- a/schema/build.gradle +++ b/schema/build.gradle @@ -8,8 +8,8 @@ repositories { } dependencies { - api 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' - api 'com.sun.xml.bind:jaxb-impl:2.4.0-b180830.0438' + api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + api 'com.sun.xml.bind:jaxb-impl:4.0.0' api 'com.sun.istack:istack-commons-runtime:4.1.0-M1' implementation 'org.apache.commons:commons-lang3:3.12.0' diff --git a/schema/src/main/java/npfit/hl7/localisation/MessageType.java b/schema/src/main/java/npfit/hl7/localisation/MessageType.java index 416fcae03..9cf9381a5 100644 --- a/schema/src/main/java/npfit/hl7/localisation/MessageType.java +++ b/schema/src/main/java/npfit/hl7/localisation/MessageType.java @@ -2,9 +2,9 @@ import org.hl7.v3.II; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/AD.java b/schema/src/main/java/org/hl7/v3/AD.java index 1b26993e5..451892dc1 100644 --- a/schema/src/main/java/org/hl7/v3/AD.java +++ b/schema/src/main/java/org/hl7/v3/AD.java @@ -4,15 +4,15 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/schema/src/main/java/org/hl7/v3/ADXP.java b/schema/src/main/java/org/hl7/v3/ADXP.java index 56203e419..826dbf6c7 100644 --- a/schema/src/main/java/org/hl7/v3/ADXP.java +++ b/schema/src/main/java/org/hl7/v3/ADXP.java @@ -1,11 +1,11 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ANY.java b/schema/src/main/java/org/hl7/v3/ANY.java index 89932dea5..82128aa6b 100644 --- a/schema/src/main/java/org/hl7/v3/ANY.java +++ b/schema/src/main/java/org/hl7/v3/ANY.java @@ -1,11 +1,11 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassControlActX.java b/schema/src/main/java/org/hl7/v3/ActClassControlActX.java index c3e0c18f9..39c68c39c 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassControlActX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassControlActX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassFinancialContractX.java b/schema/src/main/java/org/hl7/v3/ActClassFinancialContractX.java index de2f338e8..5f834b8be 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassFinancialContractX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassFinancialContractX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassObservationSeriesX.java b/schema/src/main/java/org/hl7/v3/ActClassObservationSeriesX.java index dcd1df8f5..8f7f6c6f3 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassObservationSeriesX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassObservationSeriesX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassObservationX.java b/schema/src/main/java/org/hl7/v3/ActClassObservationX.java index bc4248813..24473aafd 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassObservationX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassObservationX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassPublicHealthCaseX.java b/schema/src/main/java/org/hl7/v3/ActClassPublicHealthCaseX.java index cc551be5b..14310f074 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassPublicHealthCaseX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassPublicHealthCaseX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassROIX.java b/schema/src/main/java/org/hl7/v3/ActClassROIX.java index 58afaf096..8d452b2e9 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassROIX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassROIX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassRootX.java b/schema/src/main/java/org/hl7/v3/ActClassRootX.java index 8b6530ff4..9a1f65bb3 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassRootX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassRootX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClassSupplyX.java b/schema/src/main/java/org/hl7/v3/ActClassSupplyX.java index d13698d47..105925ef1 100644 --- a/schema/src/main/java/org/hl7/v3/ActClassSupplyX.java +++ b/schema/src/main/java/org/hl7/v3/ActClassSupplyX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActClinicalDocumentX.java b/schema/src/main/java/org/hl7/v3/ActClinicalDocumentX.java index 4f8ee3803..b24601bb9 100644 --- a/schema/src/main/java/org/hl7/v3/ActClinicalDocumentX.java +++ b/schema/src/main/java/org/hl7/v3/ActClinicalDocumentX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActDocumentStructureClassX.java b/schema/src/main/java/org/hl7/v3/ActDocumentStructureClassX.java index 5f31b0173..130b31339 100644 --- a/schema/src/main/java/org/hl7/v3/ActDocumentStructureClassX.java +++ b/schema/src/main/java/org/hl7/v3/ActDocumentStructureClassX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActMoodCompletionTrackX.java b/schema/src/main/java/org/hl7/v3/ActMoodCompletionTrackX.java index fd1b6958e..8c6b67545 100644 --- a/schema/src/main/java/org/hl7/v3/ActMoodCompletionTrackX.java +++ b/schema/src/main/java/org/hl7/v3/ActMoodCompletionTrackX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActMoodIntentX.java b/schema/src/main/java/org/hl7/v3/ActMoodIntentX.java index 4845f0ea8..4310acef6 100644 --- a/schema/src/main/java/org/hl7/v3/ActMoodIntentX.java +++ b/schema/src/main/java/org/hl7/v3/ActMoodIntentX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActMoodPredicateX.java b/schema/src/main/java/org/hl7/v3/ActMoodPredicateX.java index 570ffcd4d..f050b9d50 100644 --- a/schema/src/main/java/org/hl7/v3/ActMoodPredicateX.java +++ b/schema/src/main/java/org/hl7/v3/ActMoodPredicateX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipConditionalX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipConditionalX.java index 2cef18dc2..e9a6b730d 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipConditionalX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipConditionalX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipExcerptX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipExcerptX.java index 51647d09b..82d1e334e 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipExcerptX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipExcerptX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipFulfillsX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipFulfillsX.java index abe9565cf..6a7ab34fc 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipFulfillsX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipFulfillsX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipHasComponentX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipHasComponentX.java index 20e0290b1..51583ad02 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipHasComponentX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipHasComponentX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipOutcomeX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipOutcomeX.java index 5c430c67e..181607f06 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipOutcomeX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipOutcomeX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipPertainsX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipPertainsX.java index 13ff55991..6475fdc4a 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipPertainsX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipPertainsX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipPostsX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipPostsX.java index 717b1af33..96cf7578e 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipPostsX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipPostsX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipReasonX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipReasonX.java index 7d84494bd..6ad049c92 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipReasonX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipReasonX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipReplacementX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipReplacementX.java index bb2fd96b8..cf43dd38d 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipReplacementX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipReplacementX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ActRelationshipSequelX.java b/schema/src/main/java/org/hl7/v3/ActRelationshipSequelX.java index 810186c76..7ea9cc3b7 100644 --- a/schema/src/main/java/org/hl7/v3/ActRelationshipSequelX.java +++ b/schema/src/main/java/org/hl7/v3/ActRelationshipSequelX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/AskedButUnknown.java b/schema/src/main/java/org/hl7/v3/AskedButUnknown.java index 61ee6df84..43fef1c54 100644 --- a/schema/src/main/java/org/hl7/v3/AskedButUnknown.java +++ b/schema/src/main/java/org/hl7/v3/AskedButUnknown.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/BIN.java b/schema/src/main/java/org/hl7/v3/BIN.java index fea10ba07..6602025d5 100644 --- a/schema/src/main/java/org/hl7/v3/BIN.java +++ b/schema/src/main/java/org/hl7/v3/BIN.java @@ -1,11 +1,11 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/BL.java b/schema/src/main/java/org/hl7/v3/BL.java index 9a3e5cf51..ef71656d5 100644 --- a/schema/src/main/java/org/hl7/v3/BL.java +++ b/schema/src/main/java/org/hl7/v3/BL.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/BN.java b/schema/src/main/java/org/hl7/v3/BN.java index 08ad4d262..876067173 100644 --- a/schema/src/main/java/org/hl7/v3/BN.java +++ b/schema/src/main/java/org/hl7/v3/BN.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CD.java b/schema/src/main/java/org/hl7/v3/CD.java index 0a67f42c4..48039a106 100644 --- a/schema/src/main/java/org/hl7/v3/CD.java +++ b/schema/src/main/java/org/hl7/v3/CD.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/CE.java b/schema/src/main/java/org/hl7/v3/CE.java index 89edf3ca6..bf51993e3 100644 --- a/schema/src/main/java/org/hl7/v3/CE.java +++ b/schema/src/main/java/org/hl7/v3/CE.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CO.java b/schema/src/main/java/org/hl7/v3/CO.java index 04f339903..a5d1c7a00 100644 --- a/schema/src/main/java/org/hl7/v3/CO.java +++ b/schema/src/main/java/org/hl7/v3/CO.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/COPCIN000001UK01ControlActEvent.java b/schema/src/main/java/org/hl7/v3/COPCIN000001UK01ControlActEvent.java index 407e9129d..35103ce5b 100644 --- a/schema/src/main/java/org/hl7/v3/COPCIN000001UK01ControlActEvent.java +++ b/schema/src/main/java/org/hl7/v3/COPCIN000001UK01ControlActEvent.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.List; diff --git a/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Message.java b/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Message.java index ab2f4207c..e3bd0a1cf 100644 --- a/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Message.java +++ b/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Message.java @@ -1,7 +1,7 @@ package org.hl7.v3; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Subject.java b/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Subject.java index 66522121f..7a48cc1c5 100644 --- a/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Subject.java +++ b/schema/src/main/java/org/hl7/v3/COPCIN000001UK01Subject.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.List; diff --git a/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadBody.java b/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadBody.java index 1966cd54f..1d4386ac5 100644 --- a/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadBody.java +++ b/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadBody.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.List; diff --git a/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadInformation.java b/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadInformation.java index 0be0c0842..31b5351b6 100644 --- a/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadInformation.java +++ b/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PayloadInformation.java @@ -3,9 +3,9 @@ import npfit.hl7.localisation.MessageType; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.List; diff --git a/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PertinentInformation.java b/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PertinentInformation.java index ce7006b70..9a7468f77 100644 --- a/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PertinentInformation.java +++ b/schema/src/main/java/org/hl7/v3/COPCMT000001UK01PertinentInformation.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.List; diff --git a/schema/src/main/java/org/hl7/v3/CR.java b/schema/src/main/java/org/hl7/v3/CR.java index 80b3cd865..1b289be18 100644 --- a/schema/src/main/java/org/hl7/v3/CR.java +++ b/schema/src/main/java/org/hl7/v3/CR.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CS.java b/schema/src/main/java/org/hl7/v3/CS.java index af5718063..1bc3a34b4 100644 --- a/schema/src/main/java/org/hl7/v3/CS.java +++ b/schema/src/main/java/org/hl7/v3/CS.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CV.java b/schema/src/main/java/org/hl7/v3/CV.java index 4fd22180d..0617070bb 100644 --- a/schema/src/main/java/org/hl7/v3/CV.java +++ b/schema/src/main/java/org/hl7/v3/CV.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ContextControlAdditiveX.java b/schema/src/main/java/org/hl7/v3/ContextControlAdditiveX.java index 1974d5b22..5e38ba9f9 100644 --- a/schema/src/main/java/org/hl7/v3/ContextControlAdditiveX.java +++ b/schema/src/main/java/org/hl7/v3/ContextControlAdditiveX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ContextControlNonPropagatingX.java b/schema/src/main/java/org/hl7/v3/ContextControlNonPropagatingX.java index d4c586099..ef6b0947f 100644 --- a/schema/src/main/java/org/hl7/v3/ContextControlNonPropagatingX.java +++ b/schema/src/main/java/org/hl7/v3/ContextControlNonPropagatingX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ContextControlOverridingX.java b/schema/src/main/java/org/hl7/v3/ContextControlOverridingX.java index 2e71c7f3c..15441c08b 100644 --- a/schema/src/main/java/org/hl7/v3/ContextControlOverridingX.java +++ b/schema/src/main/java/org/hl7/v3/ContextControlOverridingX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ContextControlPropagatingX.java b/schema/src/main/java/org/hl7/v3/ContextControlPropagatingX.java index 1089e2d42..6fbec3d2f 100644 --- a/schema/src/main/java/org/hl7/v3/ContextControlPropagatingX.java +++ b/schema/src/main/java/org/hl7/v3/ContextControlPropagatingX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsAddressPartType.java b/schema/src/main/java/org/hl7/v3/CsAddressPartType.java index 255838f53..5b45216e4 100644 --- a/schema/src/main/java/org/hl7/v3/CsAddressPartType.java +++ b/schema/src/main/java/org/hl7/v3/CsAddressPartType.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsBinaryDataEncoding.java b/schema/src/main/java/org/hl7/v3/CsBinaryDataEncoding.java index 5bedb0e09..ca5d1f7ca 100644 --- a/schema/src/main/java/org/hl7/v3/CsBinaryDataEncoding.java +++ b/schema/src/main/java/org/hl7/v3/CsBinaryDataEncoding.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsCalendarCycle.java b/schema/src/main/java/org/hl7/v3/CsCalendarCycle.java index 17ff9ae52..97ff86f5b 100644 --- a/schema/src/main/java/org/hl7/v3/CsCalendarCycle.java +++ b/schema/src/main/java/org/hl7/v3/CsCalendarCycle.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsCompressionAlgorithm.java b/schema/src/main/java/org/hl7/v3/CsCompressionAlgorithm.java index efe97d981..6350debdb 100644 --- a/schema/src/main/java/org/hl7/v3/CsCompressionAlgorithm.java +++ b/schema/src/main/java/org/hl7/v3/CsCompressionAlgorithm.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsEntityNamePartQualifier.java b/schema/src/main/java/org/hl7/v3/CsEntityNamePartQualifier.java index 68a8e9434..d66b49a90 100644 --- a/schema/src/main/java/org/hl7/v3/CsEntityNamePartQualifier.java +++ b/schema/src/main/java/org/hl7/v3/CsEntityNamePartQualifier.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsEntityNamePartType.java b/schema/src/main/java/org/hl7/v3/CsEntityNamePartType.java index 89d4e6935..5f804c78e 100644 --- a/schema/src/main/java/org/hl7/v3/CsEntityNamePartType.java +++ b/schema/src/main/java/org/hl7/v3/CsEntityNamePartType.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsEntityNameUse.java b/schema/src/main/java/org/hl7/v3/CsEntityNameUse.java index 025e57401..da1da1322 100644 --- a/schema/src/main/java/org/hl7/v3/CsEntityNameUse.java +++ b/schema/src/main/java/org/hl7/v3/CsEntityNameUse.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsIntegrityCheckAlgorithm.java b/schema/src/main/java/org/hl7/v3/CsIntegrityCheckAlgorithm.java index 6e60b7f62..3593318f3 100644 --- a/schema/src/main/java/org/hl7/v3/CsIntegrityCheckAlgorithm.java +++ b/schema/src/main/java/org/hl7/v3/CsIntegrityCheckAlgorithm.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsNullFlavor.java b/schema/src/main/java/org/hl7/v3/CsNullFlavor.java index 9e52354af..bb89e8442 100644 --- a/schema/src/main/java/org/hl7/v3/CsNullFlavor.java +++ b/schema/src/main/java/org/hl7/v3/CsNullFlavor.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsPostalAddressUse.java b/schema/src/main/java/org/hl7/v3/CsPostalAddressUse.java index ba71b2b38..48f97e542 100644 --- a/schema/src/main/java/org/hl7/v3/CsPostalAddressUse.java +++ b/schema/src/main/java/org/hl7/v3/CsPostalAddressUse.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsProbabilityDistributionType.java b/schema/src/main/java/org/hl7/v3/CsProbabilityDistributionType.java index 47cf44c6a..2e0abaf29 100644 --- a/schema/src/main/java/org/hl7/v3/CsProbabilityDistributionType.java +++ b/schema/src/main/java/org/hl7/v3/CsProbabilityDistributionType.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsSetOperator.java b/schema/src/main/java/org/hl7/v3/CsSetOperator.java index 14be74cf1..944c6c2d2 100644 --- a/schema/src/main/java/org/hl7/v3/CsSetOperator.java +++ b/schema/src/main/java/org/hl7/v3/CsSetOperator.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsTelecommunicationAddressUse.java b/schema/src/main/java/org/hl7/v3/CsTelecommunicationAddressUse.java index 190901d47..7fb6c5667 100644 --- a/schema/src/main/java/org/hl7/v3/CsTelecommunicationAddressUse.java +++ b/schema/src/main/java/org/hl7/v3/CsTelecommunicationAddressUse.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsTimingEvent.java b/schema/src/main/java/org/hl7/v3/CsTimingEvent.java index 29e423779..a52458f38 100644 --- a/schema/src/main/java/org/hl7/v3/CsTimingEvent.java +++ b/schema/src/main/java/org/hl7/v3/CsTimingEvent.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/CsUpdateMode.java b/schema/src/main/java/org/hl7/v3/CsUpdateMode.java index 8d096468f..805a90017 100644 --- a/schema/src/main/java/org/hl7/v3/CsUpdateMode.java +++ b/schema/src/main/java/org/hl7/v3/CsUpdateMode.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/DocumentTableCellX.java b/schema/src/main/java/org/hl7/v3/DocumentTableCellX.java index 76398fde4..d2934db63 100644 --- a/schema/src/main/java/org/hl7/v3/DocumentTableCellX.java +++ b/schema/src/main/java/org/hl7/v3/DocumentTableCellX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/DocumentTableColumnStructureX.java b/schema/src/main/java/org/hl7/v3/DocumentTableColumnStructureX.java index 1bf28c543..b638223a3 100644 --- a/schema/src/main/java/org/hl7/v3/DocumentTableColumnStructureX.java +++ b/schema/src/main/java/org/hl7/v3/DocumentTableColumnStructureX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/DocumentTableRowStructureX.java b/schema/src/main/java/org/hl7/v3/DocumentTableRowStructureX.java index 0bcc7860d..e32189acd 100644 --- a/schema/src/main/java/org/hl7/v3/DocumentTableRowStructureX.java +++ b/schema/src/main/java/org/hl7/v3/DocumentTableRowStructureX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ED.java b/schema/src/main/java/org/hl7/v3/ED.java index df168d770..ef7d91d4b 100644 --- a/schema/src/main/java/org/hl7/v3/ED.java +++ b/schema/src/main/java/org/hl7/v3/ED.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; diff --git a/schema/src/main/java/org/hl7/v3/EDNPfITTextXHTML.java b/schema/src/main/java/org/hl7/v3/EDNPfITTextXHTML.java index 1a0663189..86fb0bd02 100644 --- a/schema/src/main/java/org/hl7/v3/EDNPfITTextXHTML.java +++ b/schema/src/main/java/org/hl7/v3/EDNPfITTextXHTML.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EN.java b/schema/src/main/java/org/hl7/v3/EN.java index a85a54ea9..c391bd42b 100644 --- a/schema/src/main/java/org/hl7/v3/EN.java +++ b/schema/src/main/java/org/hl7/v3/EN.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** * diff --git a/schema/src/main/java/org/hl7/v3/ENXP.java b/schema/src/main/java/org/hl7/v3/ENXP.java index 5d71ea764..eecb168a0 100644 --- a/schema/src/main/java/org/hl7/v3/ENXP.java +++ b/schema/src/main/java/org/hl7/v3/ENXP.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EnDelimiter.java b/schema/src/main/java/org/hl7/v3/EnDelimiter.java index 84b8741c3..4f3408507 100644 --- a/schema/src/main/java/org/hl7/v3/EnDelimiter.java +++ b/schema/src/main/java/org/hl7/v3/EnDelimiter.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EnFamily.java b/schema/src/main/java/org/hl7/v3/EnFamily.java index ce8fa067d..d2848e901 100644 --- a/schema/src/main/java/org/hl7/v3/EnFamily.java +++ b/schema/src/main/java/org/hl7/v3/EnFamily.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EnGiven.java b/schema/src/main/java/org/hl7/v3/EnGiven.java index b9764c187..ff5785fbd 100644 --- a/schema/src/main/java/org/hl7/v3/EnGiven.java +++ b/schema/src/main/java/org/hl7/v3/EnGiven.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EnPrefix.java b/schema/src/main/java/org/hl7/v3/EnPrefix.java index 0182bc8f7..842104d48 100644 --- a/schema/src/main/java/org/hl7/v3/EnPrefix.java +++ b/schema/src/main/java/org/hl7/v3/EnPrefix.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EnSuffix.java b/schema/src/main/java/org/hl7/v3/EnSuffix.java index eb5388c48..fff0a5b45 100644 --- a/schema/src/main/java/org/hl7/v3/EnSuffix.java +++ b/schema/src/main/java/org/hl7/v3/EnSuffix.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassContainerX.java b/schema/src/main/java/org/hl7/v3/EntityClassContainerX.java index b3d966e49..63a5a2564 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassContainerX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassContainerX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassDeviceX.java b/schema/src/main/java/org/hl7/v3/EntityClassDeviceX.java index 79dba7dd6..7d1153b42 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassDeviceX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassDeviceX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassDocumentReceivingX.java b/schema/src/main/java/org/hl7/v3/EntityClassDocumentReceivingX.java index 66faa1dc0..0e80ce527 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassDocumentReceivingX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassDocumentReceivingX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassLivingSubjectX.java b/schema/src/main/java/org/hl7/v3/EntityClassLivingSubjectX.java index 6f9107cb3..00e9c63f9 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassLivingSubjectX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassLivingSubjectX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassMaterialX.java b/schema/src/main/java/org/hl7/v3/EntityClassMaterialX.java index b63c6710e..0dfb0efd0 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassMaterialX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassMaterialX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassNonPersonLivingSubjectX.java b/schema/src/main/java/org/hl7/v3/EntityClassNonPersonLivingSubjectX.java index 9fdb913ea..f7c54e656 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassNonPersonLivingSubjectX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassNonPersonLivingSubjectX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassOrganizationX.java b/schema/src/main/java/org/hl7/v3/EntityClassOrganizationX.java index f54443994..d84252477 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassOrganizationX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassOrganizationX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassPersonOrOrgReceivingX.java b/schema/src/main/java/org/hl7/v3/EntityClassPersonOrOrgReceivingX.java index b24206ccb..58f40d4e6 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassPersonOrOrgReceivingX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassPersonOrOrgReceivingX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassPlaceX.java b/schema/src/main/java/org/hl7/v3/EntityClassPlaceX.java index c8936c298..ed6654479 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassPlaceX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassPlaceX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityClassRootX.java b/schema/src/main/java/org/hl7/v3/EntityClassRootX.java index 6273b5248..4adb8b6ef 100644 --- a/schema/src/main/java/org/hl7/v3/EntityClassRootX.java +++ b/schema/src/main/java/org/hl7/v3/EntityClassRootX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityDeterminerDeterminedX.java b/schema/src/main/java/org/hl7/v3/EntityDeterminerDeterminedX.java index 5ce5fce2d..49960ae84 100644 --- a/schema/src/main/java/org/hl7/v3/EntityDeterminerDeterminedX.java +++ b/schema/src/main/java/org/hl7/v3/EntityDeterminerDeterminedX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityDeterminerX.java b/schema/src/main/java/org/hl7/v3/EntityDeterminerX.java index e2b1e1635..41eea1d0a 100644 --- a/schema/src/main/java/org/hl7/v3/EntityDeterminerX.java +++ b/schema/src/main/java/org/hl7/v3/EntityDeterminerX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityStatusNormalX.java b/schema/src/main/java/org/hl7/v3/EntityStatusNormalX.java index eccad4d95..504443787 100644 --- a/schema/src/main/java/org/hl7/v3/EntityStatusNormalX.java +++ b/schema/src/main/java/org/hl7/v3/EntityStatusNormalX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/EntityStatusX.java b/schema/src/main/java/org/hl7/v3/EntityStatusX.java index a9707c32f..48e47d21d 100644 --- a/schema/src/main/java/org/hl7/v3/EntityStatusX.java +++ b/schema/src/main/java/org/hl7/v3/EntityStatusX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/HassupportX.java b/schema/src/main/java/org/hl7/v3/HassupportX.java index ad20836a7..27820fcf2 100644 --- a/schema/src/main/java/org/hl7/v3/HassupportX.java +++ b/schema/src/main/java/org/hl7/v3/HassupportX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/II.java b/schema/src/main/java/org/hl7/v3/II.java index 9acf15247..dbb730a63 100644 --- a/schema/src/main/java/org/hl7/v3/II.java +++ b/schema/src/main/java/org/hl7/v3/II.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/INT.java b/schema/src/main/java/org/hl7/v3/INT.java index ff2d2b973..12594b128 100644 --- a/schema/src/main/java/org/hl7/v3/INT.java +++ b/schema/src/main/java/org/hl7/v3/INT.java @@ -2,11 +2,11 @@ package org.hl7.v3; import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/IVLINT.java b/schema/src/main/java/org/hl7/v3/IVLINT.java index 755adc3ad..bcb4bcf15 100644 --- a/schema/src/main/java/org/hl7/v3/IVLINT.java +++ b/schema/src/main/java/org/hl7/v3/IVLINT.java @@ -5,14 +5,14 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/IVLPQ.java b/schema/src/main/java/org/hl7/v3/IVLPQ.java index 8310c9c04..75e19db9d 100644 --- a/schema/src/main/java/org/hl7/v3/IVLPQ.java +++ b/schema/src/main/java/org/hl7/v3/IVLPQ.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** * <p>Java class for IVL_PQ complex type. diff --git a/schema/src/main/java/org/hl7/v3/IVLTS.java b/schema/src/main/java/org/hl7/v3/IVLTS.java index feac17864..b10498af5 100644 --- a/schema/src/main/java/org/hl7/v3/IVLTS.java +++ b/schema/src/main/java/org/hl7/v3/IVLTS.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * <p>Java class for IVL_TS complex type. diff --git a/schema/src/main/java/org/hl7/v3/IVXBTS.java b/schema/src/main/java/org/hl7/v3/IVXBTS.java index ef9cd3735..c5605af47 100644 --- a/schema/src/main/java/org/hl7/v3/IVXBTS.java +++ b/schema/src/main/java/org/hl7/v3/IVXBTS.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/LicensedEntityRoleX.java b/schema/src/main/java/org/hl7/v3/LicensedEntityRoleX.java index e0e92d437..c2ccab7be 100644 --- a/schema/src/main/java/org/hl7/v3/LicensedEntityRoleX.java +++ b/schema/src/main/java/org/hl7/v3/LicensedEntityRoleX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ListTypeX.java b/schema/src/main/java/org/hl7/v3/ListTypeX.java index 504677acd..959accbf7 100644 --- a/schema/src/main/java/org/hl7/v3/ListTypeX.java +++ b/schema/src/main/java/org/hl7/v3/ListTypeX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Act.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Act.java index a174783ef..5a678890c 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Act.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Act.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author.java index b08b74ad1..3f7d489aa 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author2.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author2.java index e03d8a915..f4a7b61d2 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author2.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Author2.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03ControlActEvent.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03ControlActEvent.java index 024d5c812..24c08ffe3 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03ControlActEvent.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03ControlActEvent.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03DetectedIssueEvent.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03DetectedIssueEvent.java index 77dc8826a..08248d413 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03DetectedIssueEvent.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03DetectedIssueEvent.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Reason.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Reason.java index 23cbd1ac2..c42c983a4 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Reason.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Reason.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Subject.java b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Subject.java index cd2f41c8f..a3ab2533a 100644 --- a/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Subject.java +++ b/schema/src/main/java/org/hl7/v3/MCAIMT040101UK03Subject.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Agent.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Agent.java index bce648378..541540693 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Agent.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Agent.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionRcv.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionRcv.java index da8cb9382..940335d4e 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionRcv.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionRcv.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionSnd.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionSnd.java index 97314411c..3e73438b6 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionSnd.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12CommunicationFunctionSnd.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12ControlActEvent.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12ControlActEvent.java index c6410e045..60bc1231c 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12ControlActEvent.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12ControlActEvent.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Device.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Device.java index 7146bf9b3..f8ad2435f 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Device.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Device.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Message.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Message.java index 31329d8b9..8e2b55284 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Message.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Message.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Organization.java b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Organization.java index 071578f56..c6ce474f1 100644 --- a/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Organization.java +++ b/schema/src/main/java/org/hl7/v3/MCCIMT010101UK12Organization.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/MO.java b/schema/src/main/java/org/hl7/v3/MO.java index 5b467b318..5ac68b370 100644 --- a/schema/src/main/java/org/hl7/v3/MO.java +++ b/schema/src/main/java/org/hl7/v3/MO.java @@ -1,12 +1,12 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/ON.java b/schema/src/main/java/org/hl7/v3/ON.java index 9651bbd8b..dff9b2e9f 100644 --- a/schema/src/main/java/org/hl7/v3/ON.java +++ b/schema/src/main/java/org/hl7/v3/ON.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ObjectFactory.java b/schema/src/main/java/org/hl7/v3/ObjectFactory.java index a4492e541..361749788 100644 --- a/schema/src/main/java/org/hl7/v3/ObjectFactory.java +++ b/schema/src/main/java/org/hl7/v3/ObjectFactory.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/schema/src/main/java/org/hl7/v3/Other.java b/schema/src/main/java/org/hl7/v3/Other.java index 4e4b91244..cbbbdec8e 100644 --- a/schema/src/main/java/org/hl7/v3/Other.java +++ b/schema/src/main/java/org/hl7/v3/Other.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/PN.java b/schema/src/main/java/org/hl7/v3/PN.java index b01b02327..f6d626817 100644 --- a/schema/src/main/java/org/hl7/v3/PN.java +++ b/schema/src/main/java/org/hl7/v3/PN.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/PQ.java b/schema/src/main/java/org/hl7/v3/PQ.java index c11f56356..1522ef2a9 100644 --- a/schema/src/main/java/org/hl7/v3/PQ.java +++ b/schema/src/main/java/org/hl7/v3/PQ.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/PQInc.java b/schema/src/main/java/org/hl7/v3/PQInc.java index 16afa6dbc..5a082a12e 100644 --- a/schema/src/main/java/org/hl7/v3/PQInc.java +++ b/schema/src/main/java/org/hl7/v3/PQInc.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/PQR.java b/schema/src/main/java/org/hl7/v3/PQR.java index a8380cb7e..2be5a23cd 100644 --- a/schema/src/main/java/org/hl7/v3/PQR.java +++ b/schema/src/main/java/org/hl7/v3/PQR.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationAncillaryX.java b/schema/src/main/java/org/hl7/v3/ParticipationAncillaryX.java index 5b5c58492..7e143f9da 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationAncillaryX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationAncillaryX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationConsumableX.java b/schema/src/main/java/org/hl7/v3/ParticipationConsumableX.java index ab0d4af0a..72f83494d 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationConsumableX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationConsumableX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationIndirectTargetX.java b/schema/src/main/java/org/hl7/v3/ParticipationIndirectTargetX.java index 957898e85..65ce3fc96 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationIndirectTargetX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationIndirectTargetX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationInformationGeneratorX.java b/schema/src/main/java/org/hl7/v3/ParticipationInformationGeneratorX.java index b54a26bec..df4a1dc56 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationInformationGeneratorX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationInformationGeneratorX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationInformationRecipientX.java b/schema/src/main/java/org/hl7/v3/ParticipationInformationRecipientX.java index 95925f209..a126ff905 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationInformationRecipientX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationInformationRecipientX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationPhysicalPerformerX.java b/schema/src/main/java/org/hl7/v3/ParticipationPhysicalPerformerX.java index f64a5c55d..025dda9d1 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationPhysicalPerformerX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationPhysicalPerformerX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationTargetDeviceX.java b/schema/src/main/java/org/hl7/v3/ParticipationTargetDeviceX.java index d2fc07f15..f1a44b5fa 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationTargetDeviceX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationTargetDeviceX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationTargetDirectX.java b/schema/src/main/java/org/hl7/v3/ParticipationTargetDirectX.java index 6d47a5088..c863ce4fb 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationTargetDirectX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationTargetDirectX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationTargetLocationX.java b/schema/src/main/java/org/hl7/v3/ParticipationTargetLocationX.java index 2c50a33ae..7263a1a81 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationTargetLocationX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationTargetLocationX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationTypeX.java b/schema/src/main/java/org/hl7/v3/ParticipationTypeX.java index d4f30b26b..05f534ca1 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationTypeX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationTypeX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ParticipationVerifierX.java b/schema/src/main/java/org/hl7/v3/ParticipationVerifierX.java index 1df2ed2a6..7a76af55e 100644 --- a/schema/src/main/java/org/hl7/v3/ParticipationVerifierX.java +++ b/schema/src/main/java/org/hl7/v3/ParticipationVerifierX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/QTY.java b/schema/src/main/java/org/hl7/v3/QTY.java index 7b6bf730c..a1275bf55 100644 --- a/schema/src/main/java/org/hl7/v3/QTY.java +++ b/schema/src/main/java/org/hl7/v3/QTY.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Agent.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Agent.java index 2f285e0f4..3ee743320 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Agent.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Agent.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01AgentSDS.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01AgentSDS.java index 22a4aaf7e..5d9665d1e 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01AgentSDS.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01AgentSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Device.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Device.java index ce0a47e67..1945c27d7 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Device.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Device.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01DeviceSDS.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01DeviceSDS.java index 4d509f8e5..56075970f 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01DeviceSDS.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01DeviceSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Organization.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Organization.java index 3b9faef64..47890ad87 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Organization.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Organization.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01OrganizationSDS.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01OrganizationSDS.java index 98cb929f7..1e4d85261 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01OrganizationSDS.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01OrganizationSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Person.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Person.java index 33c137247..e92526829 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Person.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01Person.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01PersonSDS.java b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01PersonSDS.java index 1e7a506f2..2b7e665e4 100644 --- a/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01PersonSDS.java +++ b/schema/src/main/java/org/hl7/v3/RCCTMT120101UK01PersonSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06ControlActEvent.java b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06ControlActEvent.java index 7770a36e5..eaef7996d 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06ControlActEvent.java +++ b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06ControlActEvent.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Message.java b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Message.java index b6706762d..ca6f3abd0 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Message.java +++ b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Message.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Subject.java b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Subject.java index d7f90bb0f..67870cc6d 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Subject.java +++ b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK06Subject.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07ControlActEvent.java b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07ControlActEvent.java index 5a25870f0..79e802f9c 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07ControlActEvent.java +++ b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07ControlActEvent.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Message.java b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Message.java index 1e09ccc41..41ce6c2ff 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Message.java +++ b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Message.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Subject.java b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Subject.java index 6f2bf4fe4..0d476d3df 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Subject.java +++ b/schema/src/main/java/org/hl7/v3/RCMRIN030000UK07Subject.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentDirectory.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentDirectory.java index 6a564abf7..51c3d497a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentDirectory.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentDirectory.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentRef.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentRef.java index 6e2bd983c..9a5b367c7 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentRef.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04AgentRef.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Annotation.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Annotation.java index 64ac37254..3a7ecb5e1 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Annotation.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Annotation.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author.java index a310effe0..cdae2440d 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author2.java index d0ff1c5d6..290930252 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author3.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author3.java index 6b9607f22..d2f8ad013 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author3.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author3.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author4.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author4.java index 3fadff24f..7a947310c 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author4.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Author4.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Authorise.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Authorise.java index 09c30d3d2..0ce201061 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Authorise.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Authorise.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component.java index b1dcbdbdd..d82111fa4 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component02.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component02.java index e5f0686cb..74f48a2c2 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component02.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component02.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component2.java index fc20a2693..1e61e282c 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component3.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component3.java index 8c9a96f43..0b8df6c4b 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component3.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component3.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component4.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component4.java index 46b5906e5..b4ce59c66 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component4.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component4.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * <p>Java class for RCMR_MT030101UK04.Component4 complex type. diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component6.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component6.java index 142fca1a2..7db143982 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component6.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Component6.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompositionRef.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompositionRef.java index 13e936fa7..85970cebb 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompositionRef.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompositionRef.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompoundStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompoundStatement.java index 349619a40..3cd3e2591 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompoundStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04CompoundStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ConditionNamed.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ConditionNamed.java index e6396df48..eab6b0a33 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ConditionNamed.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ConditionNamed.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Consumable.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Consumable.java index 85cdc7422..602ea2397 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Consumable.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Consumable.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Destination.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Destination.java index 249739e64..2719acd7a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Destination.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Destination.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Discontinue.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Discontinue.java index fea774e70..6ad3bd2ff 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Discontinue.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Discontinue.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Dispense.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Dispense.java index d0cfdaeba..fdb49cf9a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Dispense.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Dispense.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrComposition.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrComposition.java index f7036f7fc..eebd81c9d 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrComposition.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrComposition.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrEmpty.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrEmpty.java index 8ab174c8e..0119475b6 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrEmpty.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrEmpty.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtract.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtract.java index 15b3cadb0..5ee9c7465 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtract.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtract.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtractSpecification.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtractSpecification.java index c2391634d..df783cc38 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtractSpecification.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrExtractSpecification.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrFolder.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrFolder.java index 8f737b545..96345a698 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrFolder.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrFolder.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrRequest.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrRequest.java index 340552a74..9b42eb6e8 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrRequest.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04EhrRequest.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ExternalDocument.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ExternalDocument.java index edce12c4e..f17c55f0c 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ExternalDocument.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ExternalDocument.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf.java index a273b0903..35e38b545 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf02.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf02.java index 83b836748..5b0541e5b 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf02.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf02.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf2.java index 400857d88..9fc978646 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InFulfillmentOf2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Informant.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Informant.java index e45978c9d..84d3343be 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Informant.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Informant.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InformantRole.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InformantRole.java index 6b68ce0b4..0262793e4 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InformantRole.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InformantRole.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InterpretationRange.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InterpretationRange.java index 16711b094..1b64df187 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InterpretationRange.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04InterpretationRange.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +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; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Limitation.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Limitation.java index db595e328..74e8bfecd 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Limitation.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Limitation.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LinkSet.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LinkSet.java index 89c1e15a1..5512202c8 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LinkSet.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LinkSet.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LocatedEntity.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LocatedEntity.java index b983b35b8..9d8766cda 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LocatedEntity.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04LocatedEntity.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +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; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Location.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Location.java index 17fd764b3..f9b0e401a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Location.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Location.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ManufacturedProduct.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ManufacturedProduct.java index b57d0c543..4305c3c5f 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ManufacturedProduct.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ManufacturedProduct.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Material.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Material.java index 306cf3889..2a204cbde 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Material.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Material.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationDosage.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationDosage.java index 7a91f09ed..2efd7d706 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationDosage.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationDosage.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationRef.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationRef.java index 5fb0eafec..5bf85f719 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationRef.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationRef.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationStatement.java index 3c151a521..5f484a776 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04MedicationStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04NarrativeStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04NarrativeStatement.java index cb539ec14..7af5e9666 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04NarrativeStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04NarrativeStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ObservationStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ObservationStatement.java index 0db503ee1..f7f62eee3 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ObservationStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ObservationStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.hl7.v3.RCMRMT030101UK04Specimen; diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Part.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Part.java index 6de302f08..ea09d75f6 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Part.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Part.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant.java index 061e6d7e5..e87f87b9f 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant2.java index 0a44df906..714af2bf8 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Participant2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Patient.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Patient.java index 508769314..49159d9ed 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Patient.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Patient.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PatientSubject.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PatientSubject.java index 341d142b0..2a2fe8092 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PatientSubject.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PatientSubject.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Performer.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Performer.java index a616bd9a6..75b18be5d 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Performer.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Performer.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Person.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Person.java index 214550233..9facc58e2 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Person.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Person.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +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; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PersonalRelationship.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PersonalRelationship.java index 0473e437b..1ea4b9a22 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PersonalRelationship.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PersonalRelationship.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation.java index e831589be..6da857355 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation02.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation02.java index 09919a83b..56133b583 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation02.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation02.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation2.java index 0c2f519ea..3452fe732 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PertinentInformation2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Place.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Place.java index ac4a48b73..bfc609155 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Place.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Place.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PlanStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PlanStatement.java index 3ee712948..6362cdc0a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PlanStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04PlanStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Predecessor.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Predecessor.java index 4c3b1209b..42e3c78ae 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Predecessor.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Predecessor.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Prescribe.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Prescribe.java index c81478dbc..532f070cb 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Prescribe.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Prescribe.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Product.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Product.java index e12192ba8..489b9def1 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Product.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Product.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reason.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reason.java index dc996b2dd..e03fccc44 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reason.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reason.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reference.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reference.java index 2ac5fb68a..c00f66ce9 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reference.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Reference.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReferenceRange.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReferenceRange.java index 835b93927..f0bf4153a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReferenceRange.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReferenceRange.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RegistrationStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RegistrationStatement.java index f38dc370c..4fdfcded7 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RegistrationStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RegistrationStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf.java index 9569d4976..ba42a52c3 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf2.java index d95a9cc44..2d182793c 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReplacementOf2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RequestStatement.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RequestStatement.java index b6085de30..efc512268 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RequestStatement.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04RequestStatement.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty.java index 55cecda8e..a2a0214c8 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty2.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty2.java index 9e7aabb90..573eed120 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty2.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty2.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty3.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty3.java index e152906f5..bb8132ecf 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty3.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ResponsibleParty3.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReversalOf.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReversalOf.java index cb2035178..cca2ab311 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReversalOf.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04ReversalOf.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SequelTo.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SequelTo.java index b7b5d203d..cefa547eb 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SequelTo.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SequelTo.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen.java index 5009b932d..250309710 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen03.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen03.java index 913b779c3..c2ec41e05 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen03.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Specimen03.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenMaterial.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenMaterial.java index dfb043984..6c515f18a 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenMaterial.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenMaterial.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenRole.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenRole.java index 6f0970ab3..e532c41c0 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenRole.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SpecimenRole.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04StatementRef.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04StatementRef.java index 0028f152d..42853957f 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04StatementRef.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04StatementRef.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Subject.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Subject.java index 515c17cc0..76dfd7c46 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Subject.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04Subject.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SupplyAnnotation.java b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SupplyAnnotation.java index 568c5522a..9faabe023 100644 --- a/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SupplyAnnotation.java +++ b/schema/src/main/java/org/hl7/v3/RCMRMT030101UK04SupplyAnnotation.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/REAL.java b/schema/src/main/java/org/hl7/v3/REAL.java index 98676c876..5743658b5 100644 --- a/schema/src/main/java/org/hl7/v3/REAL.java +++ b/schema/src/main/java/org/hl7/v3/REAL.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RTO.java b/schema/src/main/java/org/hl7/v3/RTO.java index 47c78c234..2b85355a5 100644 --- a/schema/src/main/java/org/hl7/v3/RTO.java +++ b/schema/src/main/java/org/hl7/v3/RTO.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RTOQTYQTY.java b/schema/src/main/java/org/hl7/v3/RTOQTYQTY.java index 6b8d98f6f..254550bfa 100644 --- a/schema/src/main/java/org/hl7/v3/RTOQTYQTY.java +++ b/schema/src/main/java/org/hl7/v3/RTOQTYQTY.java @@ -1,13 +1,13 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassAgentX.java b/schema/src/main/java/org/hl7/v3/RoleClassAgentX.java index 97eb62715..f4b52b506 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassAgentX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassAgentX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassAssignedEntityX.java b/schema/src/main/java/org/hl7/v3/RoleClassAssignedEntityX.java index de4fbda49..5575820cb 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassAssignedEntityX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassAssignedEntityX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassContactX.java b/schema/src/main/java/org/hl7/v3/RoleClassContactX.java index cea404cb2..09feaebbd 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassContactX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassContactX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassDistributedMaterialX.java b/schema/src/main/java/org/hl7/v3/RoleClassDistributedMaterialX.java index 0f9542658..53b4e9018 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassDistributedMaterialX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassDistributedMaterialX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassEmployeeX.java b/schema/src/main/java/org/hl7/v3/RoleClassEmployeeX.java index 9290c7cf8..d04514bd9 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassEmployeeX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassEmployeeX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassInactiveIngredientX.java b/schema/src/main/java/org/hl7/v3/RoleClassInactiveIngredientX.java index fc9e1ebd3..2179cb569 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassInactiveIngredientX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassInactiveIngredientX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassIngredientEntityX.java b/schema/src/main/java/org/hl7/v3/RoleClassIngredientEntityX.java index d7b119271..59857e337 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassIngredientEntityX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassIngredientEntityX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassIsSpeciesEntityX.java b/schema/src/main/java/org/hl7/v3/RoleClassIsSpeciesEntityX.java index 8788d36dc..c0b1a122a 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassIsSpeciesEntityX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassIsSpeciesEntityX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassLocatedEntityX.java b/schema/src/main/java/org/hl7/v3/RoleClassLocatedEntityX.java index 414da00c9..07fa68142 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassLocatedEntityX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassLocatedEntityX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassManufacturedProductX.java b/schema/src/main/java/org/hl7/v3/RoleClassManufacturedProductX.java index e20fce66b..ede3e423d 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassManufacturedProductX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassManufacturedProductX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassMutualRelationshipX.java b/schema/src/main/java/org/hl7/v3/RoleClassMutualRelationshipX.java index 3c8537c30..e103aa204 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassMutualRelationshipX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassMutualRelationshipX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassOntologicalX.java b/schema/src/main/java/org/hl7/v3/RoleClassOntologicalX.java index 242038356..701f18154 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassOntologicalX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassOntologicalX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassPartitiveX.java b/schema/src/main/java/org/hl7/v3/RoleClassPartitiveX.java index 0a82f8883..473255d1c 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassPartitiveX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassPartitiveX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassPassiveX.java b/schema/src/main/java/org/hl7/v3/RoleClassPassiveX.java index 71a90c0d8..5c0033474 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassPassiveX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassPassiveX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassRelationshipFormalX.java b/schema/src/main/java/org/hl7/v3/RoleClassRelationshipFormalX.java index ba8f525af..959952b6a 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassRelationshipFormalX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassRelationshipFormalX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassServiceDeliveryLocationX.java b/schema/src/main/java/org/hl7/v3/RoleClassServiceDeliveryLocationX.java index a381c75e2..76b8e263b 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassServiceDeliveryLocationX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassServiceDeliveryLocationX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleClassSpecimenX.java b/schema/src/main/java/org/hl7/v3/RoleClassSpecimenX.java index ff30c1738..c21f6db4c 100644 --- a/schema/src/main/java/org/hl7/v3/RoleClassSpecimenX.java +++ b/schema/src/main/java/org/hl7/v3/RoleClassSpecimenX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleStatusNormalX.java b/schema/src/main/java/org/hl7/v3/RoleStatusNormalX.java index e533accfe..e46b95196 100644 --- a/schema/src/main/java/org/hl7/v3/RoleStatusNormalX.java +++ b/schema/src/main/java/org/hl7/v3/RoleStatusNormalX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/RoleStatusX.java b/schema/src/main/java/org/hl7/v3/RoleStatusX.java index 32142f9d9..7c270851f 100644 --- a/schema/src/main/java/org/hl7/v3/RoleStatusX.java +++ b/schema/src/main/java/org/hl7/v3/RoleStatusX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/SC.java b/schema/src/main/java/org/hl7/v3/SC.java index 522cbc753..accb8fc1b 100644 --- a/schema/src/main/java/org/hl7/v3/SC.java +++ b/schema/src/main/java/org/hl7/v3/SC.java @@ -1,12 +1,12 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/SXCMTS.java b/schema/src/main/java/org/hl7/v3/SXCMTS.java index 2a7f7c889..8fa8b1da4 100644 --- a/schema/src/main/java/org/hl7/v3/SXCMTS.java +++ b/schema/src/main/java/org/hl7/v3/SXCMTS.java @@ -1,11 +1,11 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocBr.java b/schema/src/main/java/org/hl7/v3/StrucDocBr.java index 6e7a785cf..e879e340e 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocBr.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocBr.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocCaption.java b/schema/src/main/java/org/hl7/v3/StrucDocCaption.java index b18856353..2b44527f1 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocCaption.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocCaption.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocCol.java b/schema/src/main/java/org/hl7/v3/StrucDocCol.java index 694d1f533..306999760 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocCol.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocCol.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocColgroup.java b/schema/src/main/java/org/hl7/v3/StrucDocColgroup.java index 02c6ab1ba..1f419e0fd 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocColgroup.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocColgroup.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocContent.java b/schema/src/main/java/org/hl7/v3/StrucDocContent.java index e0139b51b..af4ab1572 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocContent.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocContent.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocFootnote.java b/schema/src/main/java/org/hl7/v3/StrucDocFootnote.java index edbd1026b..10dfd7baf 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocFootnote.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocFootnote.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocFootnoteRef.java b/schema/src/main/java/org/hl7/v3/StrucDocFootnoteRef.java index 3a6c62cbc..9c9a95fab 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocFootnoteRef.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocFootnoteRef.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlIDREF; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocItem.java b/schema/src/main/java/org/hl7/v3/StrucDocItem.java index 53b700cd8..dcf4f1569 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocItem.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocItem.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocLinkHtml.java b/schema/src/main/java/org/hl7/v3/StrucDocLinkHtml.java index c3be6fe02..0a115bfc1 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocLinkHtml.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocLinkHtml.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocList.java b/schema/src/main/java/org/hl7/v3/StrucDocList.java index f51155d9b..7aef0de0c 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocList.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocList.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocParagraph.java b/schema/src/main/java/org/hl7/v3/StrucDocParagraph.java index 818736cf2..639c0298f 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocParagraph.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocParagraph.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocRenderMultiMedia.java b/schema/src/main/java/org/hl7/v3/StrucDocRenderMultiMedia.java index 654f32708..7238ee2ba 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocRenderMultiMedia.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocRenderMultiMedia.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlIDREF; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocSub.java b/schema/src/main/java/org/hl7/v3/StrucDocSub.java index 678f32b1b..8265e659e 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocSub.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocSub.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocSup.java b/schema/src/main/java/org/hl7/v3/StrucDocSup.java index 2c53af8fb..034e4f623 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocSup.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocSup.java @@ -1,10 +1,10 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTable.java b/schema/src/main/java/org/hl7/v3/StrucDocTable.java index 9af31902f..a852947b6 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTable.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTable.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTbody.java b/schema/src/main/java/org/hl7/v3/StrucDocTbody.java index adc91c839..7b4305f74 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTbody.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTbody.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTd.java b/schema/src/main/java/org/hl7/v3/StrucDocTd.java index 9e13259b6..8baae24f7 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTd.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTd.java @@ -4,19 +4,19 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlIDREF; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocText.java b/schema/src/main/java/org/hl7/v3/StrucDocText.java index 268f4e86c..316e29a87 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocText.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocText.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTfoot.java b/schema/src/main/java/org/hl7/v3/StrucDocTfoot.java index ec1bafe5a..8dd24cb31 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTfoot.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTfoot.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTh.java b/schema/src/main/java/org/hl7/v3/StrucDocTh.java index 83a115f23..2f6e88ec5 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTh.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTh.java @@ -4,19 +4,19 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlIDREF; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocThead.java b/schema/src/main/java/org/hl7/v3/StrucDocThead.java index 32a13ebc7..bee4375f3 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocThead.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocThead.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTitle.java b/schema/src/main/java/org/hl7/v3/StrucDocTitle.java index 110fecb70..a59f83bb7 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTitle.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTitle.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTitleContent.java b/schema/src/main/java/org/hl7/v3/StrucDocTitleContent.java index bc17f23e0..3d6abede3 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTitleContent.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTitleContent.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTitleFootnote.java b/schema/src/main/java/org/hl7/v3/StrucDocTitleFootnote.java index 3ab2e2651..fa0e68c96 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTitleFootnote.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTitleFootnote.java @@ -4,18 +4,18 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/StrucDocTr.java b/schema/src/main/java/org/hl7/v3/StrucDocTr.java index ea1266b36..0666c57cc 100644 --- a/schema/src/main/java/org/hl7/v3/StrucDocTr.java +++ b/schema/src/main/java/org/hl7/v3/StrucDocTr.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/TEL.java b/schema/src/main/java/org/hl7/v3/TEL.java index 14b2b9cef..a92078af1 100644 --- a/schema/src/main/java/org/hl7/v3/TEL.java +++ b/schema/src/main/java/org/hl7/v3/TEL.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/TN.java b/schema/src/main/java/org/hl7/v3/TN.java index fe8845dd4..6fe64321d 100644 --- a/schema/src/main/java/org/hl7/v3/TN.java +++ b/schema/src/main/java/org/hl7/v3/TN.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/TS.java b/schema/src/main/java/org/hl7/v3/TS.java index 151147522..80cbcc9f3 100644 --- a/schema/src/main/java/org/hl7/v3/TS.java +++ b/schema/src/main/java/org/hl7/v3/TS.java @@ -1,11 +1,11 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/TableRowGroupTypeX.java b/schema/src/main/java/org/hl7/v3/TableRowGroupTypeX.java index 164b38669..e37cfe694 100644 --- a/schema/src/main/java/org/hl7/v3/TableRowGroupTypeX.java +++ b/schema/src/main/java/org/hl7/v3/TableRowGroupTypeX.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/Thumbnail.java b/schema/src/main/java/org/hl7/v3/Thumbnail.java index 409eef7e2..f676c24fb 100644 --- a/schema/src/main/java/org/hl7/v3/Thumbnail.java +++ b/schema/src/main/java/org/hl7/v3/Thumbnail.java @@ -1,9 +1,9 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02AgentPersonSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02AgentPersonSDS.java index eb5884a33..8d8c09a63 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02AgentPersonSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02AgentPersonSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02PersonSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02PersonSDS.java index 7d8b77f93..67c0e0157 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02PersonSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120301UK02PersonSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03AgentOrgSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03AgentOrgSDS.java index 08aa7bb75..bdc9e0bcc 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03AgentOrgSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03AgentOrgSDS.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03OrganizationSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03OrganizationSDS.java index 9eaf6c50f..66a0c34b5 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03OrganizationSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03OrganizationSDS.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03Place.java b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03Place.java index 2461f8f46..349ad22a8 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03Place.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03Place.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +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; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03ServiceDeliveryLocation.java b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03ServiceDeliveryLocation.java index aae742c59..32e07094d 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03ServiceDeliveryLocation.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120501UK03ServiceDeliveryLocation.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01AgentPersonSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01AgentPersonSDS.java index 0ebdc5ac1..468941109 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01AgentPersonSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01AgentPersonSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01Part.java b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01Part.java index f63e51ba0..cbed4db57 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01Part.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01Part.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01PersonSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01PersonSDS.java index 76b8ff823..5762f07e1 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01PersonSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01PersonSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01SDSRole.java b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01SDSRole.java index b113341f1..0d585df03 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01SDSRole.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT120901UK01SDSRole.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01AgentSystemSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01AgentSystemSDS.java index 5d8270801..0573bb0f2 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01AgentSystemSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01AgentSystemSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01SystemSDS.java b/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01SystemSDS.java index 3dbeead1d..3fc984d26 100644 --- a/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01SystemSDS.java +++ b/schema/src/main/java/org/hl7/v3/UKCTMT121001UK01SystemSDS.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/org/hl7/v3/URL.java b/schema/src/main/java/org/hl7/v3/URL.java index 9eaa063d2..6b8b7e69e 100644 --- a/schema/src/main/java/org/hl7/v3/URL.java +++ b/schema/src/main/java/org/hl7/v3/URL.java @@ -1,11 +1,11 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/ValueAdapter.java b/schema/src/main/java/org/hl7/v3/ValueAdapter.java index 22795dd07..3014cab94 100644 --- a/schema/src/main/java/org/hl7/v3/ValueAdapter.java +++ b/schema/src/main/java/org/hl7/v3/ValueAdapter.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Element; diff --git a/schema/src/main/java/org/hl7/v3/XActMoodDefEvnRqoPrmsPrpX.java b/schema/src/main/java/org/hl7/v3/XActMoodDefEvnRqoPrmsPrpX.java index 9a6c71b63..ccc562a34 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodDefEvnRqoPrmsPrpX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodDefEvnRqoPrmsPrpX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodDefEvnX.java b/schema/src/main/java/org/hl7/v3/XActMoodDefEvnX.java index 1fca65a27..a0f91830e 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodDefEvnX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodDefEvnX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodDocumentObservationX.java b/schema/src/main/java/org/hl7/v3/XActMoodDocumentObservationX.java index 61521ed19..1336973e3 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodDocumentObservationX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodDocumentObservationX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodEvnOrdPrmsPrpX.java b/schema/src/main/java/org/hl7/v3/XActMoodEvnOrdPrmsPrpX.java index 8b49e81aa..118c2e58e 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodEvnOrdPrmsPrpX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodEvnOrdPrmsPrpX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodIntentEventX.java b/schema/src/main/java/org/hl7/v3/XActMoodIntentEventX.java index de43910bc..0e2f11f8a 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodIntentEventX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodIntentEventX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsEvnX.java b/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsEvnX.java index 62aaed1ea..32c69bd39 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsEvnX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsEvnX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsX.java b/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsX.java index b10a2c3d7..393215274 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodOrdPrmsX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActMoodRqoPrpAptArqX.java b/schema/src/main/java/org/hl7/v3/XActMoodRqoPrpAptArqX.java index 8656452db..4a6b58d4a 100644 --- a/schema/src/main/java/org/hl7/v3/XActMoodRqoPrpAptArqX.java +++ b/schema/src/main/java/org/hl7/v3/XActMoodRqoPrpAptArqX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActRelationshipDocumentX.java b/schema/src/main/java/org/hl7/v3/XActRelationshipDocumentX.java index cbb87117c..a21767f62 100644 --- a/schema/src/main/java/org/hl7/v3/XActRelationshipDocumentX.java +++ b/schema/src/main/java/org/hl7/v3/XActRelationshipDocumentX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActRelationshipExternalReferenceX.java b/schema/src/main/java/org/hl7/v3/XActRelationshipExternalReferenceX.java index 20f05bbf8..48e02c235 100644 --- a/schema/src/main/java/org/hl7/v3/XActRelationshipExternalReferenceX.java +++ b/schema/src/main/java/org/hl7/v3/XActRelationshipExternalReferenceX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActRelationshipPatientTransportX.java b/schema/src/main/java/org/hl7/v3/XActRelationshipPatientTransportX.java index 5ec32bde4..a2f02d289 100644 --- a/schema/src/main/java/org/hl7/v3/XActRelationshipPatientTransportX.java +++ b/schema/src/main/java/org/hl7/v3/XActRelationshipPatientTransportX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XActRelationshipPertinentInfoX.java b/schema/src/main/java/org/hl7/v3/XActRelationshipPertinentInfoX.java index 77da47838..2be55a16a 100644 --- a/schema/src/main/java/org/hl7/v3/XActRelationshipPertinentInfoX.java +++ b/schema/src/main/java/org/hl7/v3/XActRelationshipPertinentInfoX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XDocumentEntrySubjectX.java b/schema/src/main/java/org/hl7/v3/XDocumentEntrySubjectX.java index 615f2c502..bdb076411 100644 --- a/schema/src/main/java/org/hl7/v3/XDocumentEntrySubjectX.java +++ b/schema/src/main/java/org/hl7/v3/XDocumentEntrySubjectX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XDocumentSubjectX.java b/schema/src/main/java/org/hl7/v3/XDocumentSubjectX.java index 174178ba2..f92d38935 100644 --- a/schema/src/main/java/org/hl7/v3/XDocumentSubjectX.java +++ b/schema/src/main/java/org/hl7/v3/XDocumentSubjectX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XEncounterPerformerParticipationX.java b/schema/src/main/java/org/hl7/v3/XEncounterPerformerParticipationX.java index 09bbfa82f..80c75a574 100644 --- a/schema/src/main/java/org/hl7/v3/XEncounterPerformerParticipationX.java +++ b/schema/src/main/java/org/hl7/v3/XEncounterPerformerParticipationX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XInformationRecipientRoleX.java b/schema/src/main/java/org/hl7/v3/XInformationRecipientRoleX.java index e6cd361e7..b03653864 100644 --- a/schema/src/main/java/org/hl7/v3/XInformationRecipientRoleX.java +++ b/schema/src/main/java/org/hl7/v3/XInformationRecipientRoleX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XInformationRecipientX.java b/schema/src/main/java/org/hl7/v3/XInformationRecipientX.java index a49222796..6b0f43bb6 100644 --- a/schema/src/main/java/org/hl7/v3/XInformationRecipientX.java +++ b/schema/src/main/java/org/hl7/v3/XInformationRecipientX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XParticipationAuthorPerformerX.java b/schema/src/main/java/org/hl7/v3/XParticipationAuthorPerformerX.java index 61a5b0208..0973dca0e 100644 --- a/schema/src/main/java/org/hl7/v3/XParticipationAuthorPerformerX.java +++ b/schema/src/main/java/org/hl7/v3/XParticipationAuthorPerformerX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XParticipationVrfRespSprfWitX.java b/schema/src/main/java/org/hl7/v3/XParticipationVrfRespSprfWitX.java index 0ca6d862c..21f033f63 100644 --- a/schema/src/main/java/org/hl7/v3/XParticipationVrfRespSprfWitX.java +++ b/schema/src/main/java/org/hl7/v3/XParticipationVrfRespSprfWitX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XRoleClassAccommodationRequestorX.java b/schema/src/main/java/org/hl7/v3/XRoleClassAccommodationRequestorX.java index e173c0fc5..479904022 100644 --- a/schema/src/main/java/org/hl7/v3/XRoleClassAccommodationRequestorX.java +++ b/schema/src/main/java/org/hl7/v3/XRoleClassAccommodationRequestorX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XRoleClassCoverageInvoiceX.java b/schema/src/main/java/org/hl7/v3/XRoleClassCoverageInvoiceX.java index 1b021f383..d32cdeffc 100644 --- a/schema/src/main/java/org/hl7/v3/XRoleClassCoverageInvoiceX.java +++ b/schema/src/main/java/org/hl7/v3/XRoleClassCoverageInvoiceX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XRoleClassCoverageX.java b/schema/src/main/java/org/hl7/v3/XRoleClassCoverageX.java index ff4b41b29..94b1c8c41 100644 --- a/schema/src/main/java/org/hl7/v3/XRoleClassCoverageX.java +++ b/schema/src/main/java/org/hl7/v3/XRoleClassCoverageX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XRoleClassCredentialedEntityX.java b/schema/src/main/java/org/hl7/v3/XRoleClassCredentialedEntityX.java index ae4f80e8d..2f2452370 100644 --- a/schema/src/main/java/org/hl7/v3/XRoleClassCredentialedEntityX.java +++ b/schema/src/main/java/org/hl7/v3/XRoleClassCredentialedEntityX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/XRoleClassPayeePolicyRelationshipX.java b/schema/src/main/java/org/hl7/v3/XRoleClassPayeePolicyRelationshipX.java index d899ce89c..3904069ce 100644 --- a/schema/src/main/java/org/hl7/v3/XRoleClassPayeePolicyRelationshipX.java +++ b/schema/src/main/java/org/hl7/v3/XRoleClassPayeePolicyRelationshipX.java @@ -1,8 +1,8 @@ package org.hl7.v3; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/org/hl7/v3/package-info.java b/schema/src/main/java/org/hl7/v3/package-info.java index eb2557201..c8ccd88e6 100644 --- a/schema/src/main/java/org/hl7/v3/package-info.java +++ b/schema/src/main/java/org/hl7/v3/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:v3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:v3", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.hl7.v3; diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/A.java b/schema/src/main/java/xhtml/npfit/presentationtext/A.java index e92b0fa1b..af3bc3e07 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/A.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/A.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/BodyType.java b/schema/src/main/java/xhtml/npfit/presentationtext/BodyType.java index a69c4a239..1ae12be2f 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/BodyType.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/BodyType.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/BrType.java b/schema/src/main/java/xhtml/npfit/presentationtext/BrType.java index 2ac6e6078..d98ff37ae 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/BrType.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/BrType.java @@ -1,9 +1,9 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Caption.java b/schema/src/main/java/xhtml/npfit/presentationtext/Caption.java index f6766be6f..b29f3d041 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Caption.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Caption.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/H2.java b/schema/src/main/java/xhtml/npfit/presentationtext/H2.java index 6a184c865..44c40dfe5 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/H2.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/H2.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/H3.java b/schema/src/main/java/xhtml/npfit/presentationtext/H3.java index 82d7c66cb..b187bf960 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/H3.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/H3.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/H4.java b/schema/src/main/java/xhtml/npfit/presentationtext/H4.java index 3c899ffec..1aa7b72ac 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/H4.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/H4.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/H5.java b/schema/src/main/java/xhtml/npfit/presentationtext/H5.java index d2d1070bf..4a60083ae 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/H5.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/H5.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/H6.java b/schema/src/main/java/xhtml/npfit/presentationtext/H6.java index 02162005f..01d5c4ced 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/H6.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/H6.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/HeadType.java b/schema/src/main/java/xhtml/npfit/presentationtext/HeadType.java index 3c9453611..db1244121 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/HeadType.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/HeadType.java @@ -1,9 +1,9 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Li.java b/schema/src/main/java/xhtml/npfit/presentationtext/Li.java index c212e9cb6..bb7fb55dd 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Li.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Li.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/ObjectFactory.java b/schema/src/main/java/xhtml/npfit/presentationtext/ObjectFactory.java index 9455e9875..2b87ce4dd 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/ObjectFactory.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/ObjectFactory.java @@ -1,9 +1,9 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Ol.java b/schema/src/main/java/xhtml/npfit/presentationtext/Ol.java index 6536d47c3..eef59bd7f 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Ol.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Ol.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/P.java b/schema/src/main/java/xhtml/npfit/presentationtext/P.java index ac0766875..46ff5e2ba 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/P.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/P.java @@ -3,18 +3,18 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Pre.java b/schema/src/main/java/xhtml/npfit/presentationtext/Pre.java index 516a9ed5e..d16e4c01a 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Pre.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Pre.java @@ -1,15 +1,15 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -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.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +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.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Table.java b/schema/src/main/java/xhtml/npfit/presentationtext/Table.java index 3621680b7..d36382590 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Table.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Table.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Tbody.java b/schema/src/main/java/xhtml/npfit/presentationtext/Tbody.java index 05b3ad9ad..3d1099feb 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Tbody.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Tbody.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Td.java b/schema/src/main/java/xhtml/npfit/presentationtext/Td.java index de4455663..d4d924915 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Td.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Td.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Tfoot.java b/schema/src/main/java/xhtml/npfit/presentationtext/Tfoot.java index 05e67abd5..231af8821 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Tfoot.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Tfoot.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -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.XmlType; +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.XmlType; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Th.java b/schema/src/main/java/xhtml/npfit/presentationtext/Th.java index 4df68d83c..c9a4a2916 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Th.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Th.java @@ -1,12 +1,12 @@ package xhtml.npfit.presentationtext; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Thead.java b/schema/src/main/java/xhtml/npfit/presentationtext/Thead.java index 70b8d96a9..f112d3c02 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Thead.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Thead.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Tr.java b/schema/src/main/java/xhtml/npfit/presentationtext/Tr.java index 88433cd32..ced4dccee 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Tr.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Tr.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/Ul.java b/schema/src/main/java/xhtml/npfit/presentationtext/Ul.java index 6b28c3505..7dda64ac9 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/Ul.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/Ul.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/schema/src/main/java/xhtml/npfit/presentationtext/package-info.java b/schema/src/main/java/xhtml/npfit/presentationtext/package-info.java index a111fb257..ce9e1aebd 100644 --- a/schema/src/main/java/xhtml/npfit/presentationtext/package-info.java +++ b/schema/src/main/java/xhtml/npfit/presentationtext/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "xhtml:NPfIT:PresentationText", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "xhtml:NPfIT:PresentationText", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package xhtml.npfit.presentationtext;