From 6f797c3cc5e614a126868df44065cd5ad01eaec9 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Tue, 2 May 2023 11:12:52 -0400 Subject: [PATCH 1/4] conversion with unit tests --- .github/workflows/mvn.yml | 24 ++++++++ pom.xml | 60 +++++++++++-------- .../jaxb/model/client_v2/ClientSummary.java | 10 ++-- .../jaxb/model/clientgroup/ClientType.java | 6 +- .../jaxb/model/clientgroup/MemberType.java | 6 +- .../jaxb/model/clientgroup/ObjectFactory.java | 6 +- .../model/clientgroup/OrcidClientGroup.java | 8 +-- .../jaxb/model/clientgroup/RedirectUri.java | 16 ++--- .../model/clientgroup/RedirectUriType.java | 6 +- .../jaxb/model/clientgroup/RedirectUris.java | 10 ++-- .../jaxb/model/clientgroup/package-info.java | 2 +- .../jaxb/model/common/AvailableLocales.java | 4 +- .../orcid/jaxb/model/common/SequenceType.java | 4 +- .../adapters/AvailableLocalesAdapter.java | 2 +- .../common/adapters/CitationTypeAdapter.java | 2 +- .../adapters/ContributorRoleAdapter.java | 2 +- .../common/adapters/CurrencyAdapter.java | 2 +- .../FundingContributorRoleAdapter.java | 2 +- .../common/adapters/FundingTypeAdapter.java | 2 +- .../adapters/Iso3166CountryAdapter.java | 2 +- .../common/adapters/LanguageCodeAdapter.java | 2 +- .../adapters/PeerReviewRoleAdapter.java | 2 +- .../PeerReviewSubjectTypeAdapter.java | 2 +- .../adapters/PeerReviewTypeAdapter.java | 2 +- .../common/adapters/RelationshipAdapter.java | 2 +- .../common/adapters/ResourceTypeAdapter.java | 2 +- .../common/adapters/SequenceTypeAdapter.java | 2 +- .../common/adapters/WorkTypeAdapter.java | 2 +- .../orcid/jaxb/model/common_v2/Amount.java | 12 ++-- .../jaxb/model/common_v2/Contributor.java | 10 ++-- .../common_v2/ContributorAttributes.java | 10 ++-- .../model/common_v2/ContributorEmail.java | 10 ++-- .../model/common_v2/ContributorOrcid.java | 2 +- .../jaxb/model/common_v2/ContributorRole.java | 6 +- .../orcid/jaxb/model/common_v2/Country.java | 10 ++-- .../jaxb/model/common_v2/CreatedDate.java | 12 ++-- .../jaxb/model/common_v2/CreditName.java | 10 ++-- .../org/orcid/jaxb/model/common_v2/Day.java | 10 ++-- .../common_v2/DisambiguatedOrganization.java | 12 ++-- .../orcid/jaxb/model/common_v2/FuzzyDate.java | 10 ++-- .../jaxb/model/common_v2/Iso3166Country.java | 4 +- .../model/common_v2/LastModifiedDate.java | 12 ++-- .../orcid/jaxb/model/common_v2/Locale.java | 6 +- .../orcid/jaxb/model/common_v2/MediaType.java | 6 +- .../org/orcid/jaxb/model/common_v2/Month.java | 10 ++-- .../jaxb/model/common_v2/OrcidIdBase.java | 8 +-- .../jaxb/model/common_v2/OrcidIdentifier.java | 2 +- .../orcid/jaxb/model/common_v2/OrcidType.java | 6 +- .../jaxb/model/common_v2/Organization.java | 10 ++-- .../model/common_v2/OrganizationAddress.java | 10 ++-- .../OrganizationDefinedFundingSubType.java | 10 ++-- .../jaxb/model/common_v2/PublicationDate.java | 10 ++-- .../orcid/jaxb/model/common_v2/Source.java | 10 ++-- .../jaxb/model/common_v2/SourceClientId.java | 2 +- .../jaxb/model/common_v2/SourceName.java | 10 ++-- .../jaxb/model/common_v2/SourceOrcid.java | 2 +- .../orcid/jaxb/model/common_v2/Subtitle.java | 10 ++-- .../org/orcid/jaxb/model/common_v2/Title.java | 10 ++-- .../jaxb/model/common_v2/TranslatedTitle.java | 12 ++-- .../org/orcid/jaxb/model/common_v2/Url.java | 12 ++-- .../jaxb/model/common_v2/Visibility.java | 6 +- .../org/orcid/jaxb/model/common_v2/Year.java | 10 ++-- .../jaxb/model/common_v2/package-info.java | 2 +- .../jaxb/model/error_v2/ObjectFactory.java | 2 +- .../orcid/jaxb/model/error_v2/OrcidError.java | 12 ++-- .../jaxb/model/error_v2/package-info.java | 2 +- .../jaxb/model/groupid_v2/GroupIdRecord.java | 12 ++-- .../jaxb/model/groupid_v2/GroupIdRecords.java | 10 ++-- .../jaxb/model/groupid_v2/GroupType.java | 7 +-- .../jaxb/model/groupid_v2/ObjectFactory.java | 6 +- .../jaxb/model/groupid_v2/package-info.java | 8 +-- .../message/ActivitiesVisibilityDefault.java | 10 ++-- .../org/orcid/jaxb/model/message/Address.java | 8 +-- .../orcid/jaxb/model/message/Affiliation.java | 12 ++-- .../model/message/AffiliationAddress.java | 10 ++-- .../jaxb/model/message/AffiliationCity.java | 12 ++-- .../model/message/AffiliationCountry.java | 10 ++-- .../jaxb/model/message/AffiliationRegion.java | 10 ++-- .../jaxb/model/message/AffiliationType.java | 6 +- .../jaxb/model/message/Affiliations.java | 8 +-- .../orcid/jaxb/model/message/AgencyName.java | 10 ++-- .../orcid/jaxb/model/message/AgencyOrcid.java | 2 +- .../jaxb/model/message/AlternativeEmail.java | 10 ++-- .../jaxb/model/message/AlternativeEmails.java | 12 ++-- .../org/orcid/jaxb/model/message/Amount.java | 12 ++-- .../jaxb/model/message/ApplicationName.java | 10 ++-- .../jaxb/model/message/ApplicationOrcid.java | 2 +- .../model/message/ApplicationSummary.java | 10 ++-- .../model/message/ApplicationWebsite.java | 12 ++-- .../jaxb/model/message/Applications.java | 12 ++-- .../jaxb/model/message/ApprovalDate.java | 12 ++-- .../orcid/jaxb/model/message/Assignee.java | 12 ++-- .../jaxb/model/message/AssigneeName.java | 10 ++-- .../jaxb/model/message/AssigneeOrcid.java | 2 +- .../orcid/jaxb/model/message/Biography.java | 12 ++-- .../orcid/jaxb/model/message/Citation.java | 8 +-- .../jaxb/model/message/CitationType.java | 6 +- .../org/orcid/jaxb/model/message/Claimed.java | 10 ++-- .../jaxb/model/message/CompletionDate.java | 12 ++-- .../jaxb/model/message/ContactDetails.java | 8 +-- .../orcid/jaxb/model/message/Contributor.java | 10 ++-- .../model/message/ContributorAttributes.java | 10 ++-- .../jaxb/model/message/ContributorEmail.java | 10 ++-- .../jaxb/model/message/ContributorOrcid.java | 2 +- .../jaxb/model/message/ContributorRole.java | 6 +- .../org/orcid/jaxb/model/message/Country.java | 14 ++--- .../orcid/jaxb/model/message/CreatedDate.java | 12 ++-- .../jaxb/model/message/CreationMethod.java | 4 +- .../orcid/jaxb/model/message/CreditName.java | 12 ++-- .../org/orcid/jaxb/model/message/Day.java | 10 ++-- .../jaxb/model/message/DeactivationDate.java | 12 ++-- .../jaxb/model/message/DelegateSummary.java | 10 ++-- .../orcid/jaxb/model/message/Delegation.java | 12 ++-- .../jaxb/model/message/DelegationDetails.java | 10 ++-- .../jaxb/model/message/DepartmentName.java | 10 ++-- .../jaxb/model/message/DeprecatedDate.java | 12 ++-- .../model/message/DeveloperToolsEnabled.java | 10 ++-- .../message/DisambiguatedOrganization.java | 10 ++-- .../org/orcid/jaxb/model/message/Email.java | 12 ++-- .../jaxb/model/message/EncryptedPassword.java | 10 ++-- .../orcid/jaxb/model/message/ErrorDesc.java | 8 +-- .../model/message/ExternalIdCommonName.java | 10 ++-- .../model/message/ExternalIdReference.java | 10 ++-- .../jaxb/model/message/ExternalIdSource.java | 2 +- .../jaxb/model/message/ExternalIdUrl.java | 12 ++-- .../model/message/ExternalIdentifier.java | 12 ++-- .../model/message/ExternalIdentifiers.java | 12 ++-- .../orcid/jaxb/model/message/FamilyName.java | 12 ++-- .../org/orcid/jaxb/model/message/Funding.java | 12 ++-- .../jaxb/model/message/FundingAgency.java | 10 ++-- .../model/message/FundingContributor.java | 10 ++-- .../message/FundingContributorAttributes.java | 10 ++-- .../model/message/FundingContributorRole.java | 6 +- .../model/message/FundingContributors.java | 10 ++-- .../message/FundingExternalIdentifier.java | 10 ++-- .../FundingExternalIdentifierType.java | 6 +- .../message/FundingExternalIdentifiers.java | 10 ++-- .../orcid/jaxb/model/message/FundingList.java | 12 ++-- .../jaxb/model/message/FundingTitle.java | 10 ++-- .../orcid/jaxb/model/message/FundingType.java | 6 +- .../orcid/jaxb/model/message/FuzzyDate.java | 10 ++-- .../orcid/jaxb/model/message/GivenNames.java | 12 ++-- .../jaxb/model/message/GivenPermissionBy.java | 10 ++-- .../jaxb/model/message/GivenPermissionTo.java | 10 ++-- .../orcid/jaxb/model/message/GrantDate.java | 12 ++-- .../model/message/GrantExternalProgram.java | 10 ++-- .../jaxb/model/message/GrantSources.java | 8 +-- .../jaxb/model/message/Iso3166Country.java | 4 +- .../org/orcid/jaxb/model/message/Keyword.java | 12 ++-- .../orcid/jaxb/model/message/Keywords.java | 10 ++-- .../jaxb/model/message/LastModifiedDate.java | 12 ++-- .../org/orcid/jaxb/model/message/Locale.java | 6 +- .../orcid/jaxb/model/message/MediaType.java | 6 +- .../org/orcid/jaxb/model/message/Month.java | 10 ++-- .../jaxb/model/message/ObjectFactory.java | 6 +- .../org/orcid/jaxb/model/message/Orcid.java | 10 ++-- .../jaxb/model/message/OrcidActivities.java | 10 ++-- .../orcid/jaxb/model/message/OrcidBio.java | 10 ++-- .../jaxb/model/message/OrcidDeprecated.java | 12 ++-- .../jaxb/model/message/OrcidHistory.java | 12 ++-- .../orcid/jaxb/model/message/OrcidIdBase.java | 12 ++-- .../jaxb/model/message/OrcidIdentifier.java | 2 +- .../jaxb/model/message/OrcidInternal.java | 12 ++-- .../jaxb/model/message/OrcidMessage.java | 20 +++---- .../jaxb/model/message/OrcidPreferences.java | 10 ++-- .../jaxb/model/message/OrcidProfile.java | 14 ++--- .../jaxb/model/message/OrcidSearchResult.java | 10 ++-- .../model/message/OrcidSearchResults.java | 12 ++-- .../orcid/jaxb/model/message/OrcidType.java | 6 +- .../orcid/jaxb/model/message/OrcidWork.java | 14 ++--- .../orcid/jaxb/model/message/OrcidWorks.java | 12 ++-- .../jaxb/model/message/Organization.java | 10 ++-- .../model/message/OrganizationAddress.java | 8 +-- .../OrganizationDefinedFundingSubType.java | 10 ++-- .../orcid/jaxb/model/message/OtherName.java | 12 ++-- .../orcid/jaxb/model/message/OtherNames.java | 12 ++-- .../jaxb/model/message/PersonalDetails.java | 10 ++-- .../orcid/jaxb/model/message/Preferences.java | 12 ++-- .../jaxb/model/message/PrimaryRecord.java | 10 ++-- .../jaxb/model/message/PublicationDate.java | 10 ++-- .../orcid/jaxb/model/message/ReferredBy.java | 2 +- .../jaxb/model/message/RelevancyScore.java | 10 ++-- .../jaxb/model/message/ResearcherUrl.java | 12 ++-- .../jaxb/model/message/ResearcherUrls.java | 12 ++-- .../orcid/jaxb/model/message/RoleTitle.java | 10 ++-- .../jaxb/model/message/SalesforceId.java | 10 ++-- .../org/orcid/jaxb/model/message/Scope.java | 6 +- .../orcid/jaxb/model/message/ScopePath.java | 10 ++-- .../jaxb/model/message/ScopePathType.java | 6 +- .../orcid/jaxb/model/message/ScopePaths.java | 10 ++-- .../jaxb/model/message/SecurityDetails.java | 10 ++-- ...SendAdministrativeChangeNotifications.java | 10 ++-- .../message/SendChangeNotifications.java | 10 ++-- .../jaxb/model/message/SendOrcidNews.java | 10 ++-- .../jaxb/model/message/SequenceType.java | 6 +- .../jaxb/model/message/ShortDescription.java | 10 ++-- .../org/orcid/jaxb/model/message/Source.java | 10 ++-- .../jaxb/model/message/SourceClientId.java | 2 +- .../orcid/jaxb/model/message/SourceDate.java | 12 ++-- .../orcid/jaxb/model/message/SourceName.java | 10 ++-- .../orcid/jaxb/model/message/SourceOrcid.java | 2 +- .../jaxb/model/message/SourceReference.java | 10 ++-- .../jaxb/model/message/SubmissionDate.java | 12 ++-- .../orcid/jaxb/model/message/Subtitle.java | 10 ++-- .../org/orcid/jaxb/model/message/Title.java | 10 ++-- .../jaxb/model/message/TranslatedTitle.java | 12 ++-- .../org/orcid/jaxb/model/message/Url.java | 12 ++-- .../org/orcid/jaxb/model/message/UrlName.java | 10 ++-- .../jaxb/model/message/VerifiedEmail.java | 10 ++-- .../model/message/VerifiedPrimaryEmail.java | 10 ++-- .../orcid/jaxb/model/message/Visibility.java | 6 +- .../org/orcid/jaxb/model/message/Work.java | 12 ++-- .../jaxb/model/message/WorkCategory.java | 2 +- .../jaxb/model/message/WorkContributors.java | 8 +-- .../model/message/WorkExternalIdentifier.java | 10 ++-- .../message/WorkExternalIdentifierId.java | 10 ++-- .../message/WorkExternalIdentifierType.java | 6 +- .../message/WorkExternalIdentifiers.java | 12 ++-- .../orcid/jaxb/model/message/WorkSource.java | 4 +- .../orcid/jaxb/model/message/WorkTitle.java | 10 ++-- .../orcid/jaxb/model/message/WorkType.java | 2 +- .../model/message/WorkVisibilityDefault.java | 10 ++-- .../org/orcid/jaxb/model/message/Year.java | 10 ++-- .../jaxb/model/message/package-info.java | 2 +- .../amended_v2/AmendedSection.java | 2 +- .../amended_v2/NotificationAmended.java | 12 ++-- .../custom_v2/NotificationCustom.java | 14 ++--- .../notification/custom_v2/ObjectFactory.java | 2 +- .../notification/custom_v2/package-info.java | 2 +- .../permission_v2/AuthorizationUrl.java | 12 ++-- .../notification/permission_v2/Item.java | 14 ++--- .../notification/permission_v2/ItemType.java | 4 +- .../notification/permission_v2/Items.java | 12 ++-- .../permission_v2/NotificationPermission.java | 14 ++--- .../NotificationPermissions.java | 10 ++-- .../permission_v2/ObjectFactory.java | 2 +- .../permission_v2/package-info.java | 8 +-- .../model/notification_v2/Notification.java | 12 ++-- .../notification_v2/NotificationType.java | 6 +- .../model/notification_v2/package-info.java | 2 +- .../record/summary_v2/ActivitiesSummary.java | 12 ++-- .../record/summary_v2/EducationSummary.java | 12 ++-- .../model/record/summary_v2/Educations.java | 12 ++-- .../record/summary_v2/EmploymentSummary.java | 12 ++-- .../model/record/summary_v2/Employments.java | 12 ++-- .../model/record/summary_v2/FundingGroup.java | 10 ++-- .../record/summary_v2/FundingSummary.java | 12 ++-- .../model/record/summary_v2/Fundings.java | 12 ++-- .../record/summary_v2/PeerReviewGroup.java | 10 ++-- .../record/summary_v2/PeerReviewSummary.java | 12 ++-- .../model/record/summary_v2/PeerReviews.java | 12 ++-- .../model/record/summary_v2/WorkGroup.java | 10 ++-- .../model/record/summary_v2/WorkSummary.java | 12 ++-- .../jaxb/model/record/summary_v2/Works.java | 12 ++-- .../model/record/summary_v2/package-info.java | 18 +++--- .../jaxb/model/record/util/RecordUtil.java | 6 +- .../orcid/jaxb/model/record_v2/Address.java | 12 ++-- .../orcid/jaxb/model/record_v2/Addresses.java | 12 ++-- .../jaxb/model/record_v2/AffiliationType.java | 6 +- .../orcid/jaxb/model/record_v2/Biography.java | 12 ++-- .../orcid/jaxb/model/record_v2/Citation.java | 8 +-- .../jaxb/model/record_v2/CitationType.java | 6 +- .../org/orcid/jaxb/model/record_v2/City.java | 12 ++-- .../jaxb/model/record_v2/CompletionDate.java | 12 ++-- .../jaxb/model/record_v2/CreditName.java | 2 +- .../model/record_v2/DeactivationDate.java | 12 ++-- .../jaxb/model/record_v2/Deprecated.java | 10 ++-- .../jaxb/model/record_v2/DeprecatedDate.java | 12 ++-- .../orcid/jaxb/model/record_v2/Education.java | 12 ++-- .../jaxb/model/record_v2/Educations.java | 10 ++-- .../org/orcid/jaxb/model/record_v2/Email.java | 14 ++--- .../orcid/jaxb/model/record_v2/Emails.java | 12 ++-- .../jaxb/model/record_v2/Employment.java | 12 ++-- .../jaxb/model/record_v2/Employments.java | 10 ++-- .../jaxb/model/record_v2/ExternalID.java | 8 +-- .../jaxb/model/record_v2/ExternalIDs.java | 10 ++-- .../jaxb/model/record_v2/FamilyName.java | 10 ++-- .../orcid/jaxb/model/record_v2/Funding.java | 12 ++-- .../model/record_v2/FundingContributor.java | 10 ++-- .../FundingContributorAttributes.java | 10 ++-- .../record_v2/FundingContributorRole.java | 6 +- .../model/record_v2/FundingContributors.java | 10 ++-- .../jaxb/model/record_v2/FundingList.java | 10 ++-- .../jaxb/model/record_v2/FundingTitle.java | 10 ++-- .../jaxb/model/record_v2/FundingType.java | 6 +- .../jaxb/model/record_v2/GivenNames.java | 10 ++-- .../jaxb/model/record_v2/GroupOrcid.java | 2 +- .../orcid/jaxb/model/record_v2/History.java | 10 ++-- .../orcid/jaxb/model/record_v2/Keyword.java | 12 ++-- .../orcid/jaxb/model/record_v2/Keywords.java | 12 ++-- .../org/orcid/jaxb/model/record_v2/Name.java | 12 ++-- .../orcid/jaxb/model/record_v2/OrcidId.java | 10 ++-- .../orcid/jaxb/model/record_v2/OrcidIds.java | 10 ++-- .../orcid/jaxb/model/record_v2/OtherName.java | 12 ++-- .../jaxb/model/record_v2/OtherNames.java | 12 ++-- .../jaxb/model/record_v2/PeerReview.java | 12 ++-- .../jaxb/model/record_v2/PeerReviewType.java | 6 +- .../orcid/jaxb/model/record_v2/Person.java | 12 ++-- .../record_v2/PersonExternalIdentifier.java | 12 ++-- .../record_v2/PersonExternalIdentifiers.java | 12 ++-- .../jaxb/model/record_v2/PersonalDetails.java | 12 ++-- .../jaxb/model/record_v2/Preferences.java | 10 ++-- .../jaxb/model/record_v2/PrimaryRecord.java | 10 ++-- .../orcid/jaxb/model/record_v2/Record.java | 14 ++--- .../orcid/jaxb/model/record_v2/Region.java | 10 ++-- .../jaxb/model/record_v2/Relationship.java | 6 +- .../jaxb/model/record_v2/ResearcherUrl.java | 12 ++-- .../jaxb/model/record_v2/ResearcherUrls.java | 12 ++-- .../org/orcid/jaxb/model/record_v2/Role.java | 6 +- .../jaxb/model/record_v2/SequenceType.java | 6 +- .../jaxb/model/record_v2/SourceReference.java | 10 ++-- .../orcid/jaxb/model/record_v2/Subject.java | 12 ++-- .../jaxb/model/record_v2/SubmissionDate.java | 12 ++-- .../org/orcid/jaxb/model/record_v2/Work.java | 12 ++-- .../orcid/jaxb/model/record_v2/WorkBulk.java | 12 ++-- .../jaxb/model/record_v2/WorkCategory.java | 2 +- .../model/record_v2/WorkContributors.java | 10 ++-- .../jaxb/model/record_v2/WorkSource.java | 4 +- .../orcid/jaxb/model/record_v2/WorkTitle.java | 10 ++-- .../orcid/jaxb/model/record_v2/WorkType.java | 2 +- .../org/orcid/jaxb/model/record_v2/Works.java | 10 ++-- .../jaxb/model/record_v2/package-info.java | 48 +++++++-------- .../orcid/jaxb/model/search_v2/Result.java | 8 +-- .../orcid/jaxb/model/search_v2/Search.java | 12 ++-- .../jaxb/model/search_v2/package-info.java | 8 +-- .../model/statistics/StatisticsSummary.java | 2 +- .../model/statistics/StatisticsTimeline.java | 8 +-- .../v3/release/client/ClientSummary.java | 10 ++-- .../jaxb/model/v3/release/common/Amount.java | 14 ++--- .../model/v3/release/common/Contributor.java | 10 ++-- .../release/common/ContributorAttributes.java | 12 ++-- .../v3/release/common/ContributorEmail.java | 10 ++-- .../v3/release/common/ContributorOrcid.java | 2 +- .../jaxb/model/v3/release/common/Country.java | 12 ++-- .../model/v3/release/common/CreatedDate.java | 12 ++-- .../model/v3/release/common/CreditName.java | 10 ++-- .../jaxb/model/v3/release/common/Day.java | 10 ++-- .../common/DisambiguatedOrganization.java | 12 ++-- .../model/v3/release/common/FuzzyDate.java | 10 ++-- .../v3/release/common/LastModifiedDate.java | 12 ++-- .../jaxb/model/v3/release/common/Month.java | 10 ++-- .../model/v3/release/common/OrcidIdBase.java | 8 +-- .../v3/release/common/OrcidIdentifier.java | 2 +- .../model/v3/release/common/Organization.java | 10 ++-- .../release/common/OrganizationAddress.java | 12 ++-- .../OrganizationDefinedFundingSubType.java | 10 ++-- .../v3/release/common/PublicationDate.java | 8 +-- .../jaxb/model/v3/release/common/Source.java | 10 ++-- .../v3/release/common/SourceClientId.java | 2 +- .../model/v3/release/common/SourceName.java | 10 ++-- .../model/v3/release/common/SourceOrcid.java | 2 +- .../model/v3/release/common/Subtitle.java | 10 ++-- .../jaxb/model/v3/release/common/Title.java | 10 ++-- .../v3/release/common/TransientError.java | 12 ++-- .../common/TransientNonEmptyString.java | 6 +- .../v3/release/common/TranslatedTitle.java | 14 ++--- .../jaxb/model/v3/release/common/Url.java | 12 ++-- .../model/v3/release/common/Visibility.java | 6 +- .../jaxb/model/v3/release/common/Year.java | 10 ++-- .../model/v3/release/common/package-info.java | 2 +- .../model/v3/release/error/ObjectFactory.java | 2 +- .../model/v3/release/error/OrcidError.java | 12 ++-- .../model/v3/release/error/package-info.java | 2 +- .../v3/release/groupid/GroupIdRecord.java | 12 ++-- .../v3/release/groupid/GroupIdRecords.java | 10 ++-- .../v3/release/groupid/ObjectFactory.java | 6 +- .../v3/release/groupid/package-info.java | 8 +-- .../v3/release/notification/Notification.java | 12 ++-- .../notification/NotificationType.java | 6 +- .../notification/amended/AmendedSection.java | 2 +- .../amended/NotificationAmended.java | 12 ++-- .../custom/NotificationCustom.java | 14 ++--- .../notification/custom/ObjectFactory.java | 2 +- .../notification/custom/package-info.java | 2 +- .../v3/release/notification/package-info.java | 2 +- .../permission/AuthorizationUrl.java | 12 ++-- .../release/notification/permission/Item.java | 14 ++--- .../notification/permission/ItemType.java | 4 +- .../notification/permission/Items.java | 12 ++-- .../permission/NotificationPermission.java | 14 ++--- .../permission/NotificationPermissions.java | 10 ++-- .../permission/ObjectFactory.java | 2 +- .../notification/permission/package-info.java | 8 +-- .../jaxb/model/v3/release/record/Address.java | 12 ++-- .../model/v3/release/record/Addresses.java | 12 ++-- .../model/v3/release/record/Affiliation.java | 12 ++-- .../v3/release/record/AffiliationType.java | 6 +- .../model/v3/release/record/Biography.java | 12 ++-- .../model/v3/release/record/Citation.java | 4 +- .../jaxb/model/v3/release/record/City.java | 12 ++-- .../v3/release/record/CompletionDate.java | 12 ++-- .../model/v3/release/record/CreditName.java | 2 +- .../v3/release/record/DeactivationDate.java | 12 ++-- .../model/v3/release/record/Deprecated.java | 10 ++-- .../v3/release/record/DeprecatedDate.java | 12 ++-- .../model/v3/release/record/Distinction.java | 2 +- .../model/v3/release/record/Education.java | 2 +- .../model/v3/release/record/Educations.java | 10 ++-- .../jaxb/model/v3/release/record/Email.java | 14 ++--- .../jaxb/model/v3/release/record/Emails.java | 12 ++-- .../model/v3/release/record/Employment.java | 2 +- .../model/v3/release/record/Employments.java | 10 ++-- .../model/v3/release/record/ExternalID.java | 12 ++-- .../model/v3/release/record/ExternalIDs.java | 10 ++-- .../model/v3/release/record/FamilyName.java | 10 ++-- .../jaxb/model/v3/release/record/Funding.java | 14 ++--- .../v3/release/record/FundingContributor.java | 10 ++-- .../record/FundingContributorAttributes.java | 10 ++-- .../release/record/FundingContributors.java | 10 ++-- .../model/v3/release/record/FundingList.java | 10 ++-- .../model/v3/release/record/FundingTitle.java | 10 ++-- .../model/v3/release/record/GivenNames.java | 10 ++-- .../model/v3/release/record/GroupOrcid.java | 2 +- .../jaxb/model/v3/release/record/History.java | 10 ++-- .../v3/release/record/InvitedPosition.java | 2 +- .../jaxb/model/v3/release/record/Keyword.java | 12 ++-- .../model/v3/release/record/Keywords.java | 12 ++-- .../model/v3/release/record/Membership.java | 2 +- .../jaxb/model/v3/release/record/Name.java | 12 ++-- .../jaxb/model/v3/release/record/OrcidId.java | 10 ++-- .../model/v3/release/record/OrcidIds.java | 10 ++-- .../model/v3/release/record/OtherName.java | 12 ++-- .../model/v3/release/record/OtherNames.java | 12 ++-- .../model/v3/release/record/PeerReview.java | 14 ++--- .../jaxb/model/v3/release/record/Person.java | 12 ++-- .../record/PersonExternalIdentifier.java | 14 ++--- .../record/PersonExternalIdentifiers.java | 12 ++-- .../v3/release/record/PersonalDetails.java | 12 ++-- .../model/v3/release/record/Preferences.java | 12 ++-- .../v3/release/record/PrimaryRecord.java | 10 ++-- .../v3/release/record/Qualification.java | 2 +- .../jaxb/model/v3/release/record/Record.java | 14 ++--- .../jaxb/model/v3/release/record/Region.java | 10 ++-- .../v3/release/record/ResearchResource.java | 14 ++--- .../release/record/ResearchResourceHosts.java | 10 ++-- .../release/record/ResearchResourceItem.java | 12 ++-- .../release/record/ResearchResourceItems.java | 10 ++-- .../record/ResearchResourceProposal.java | 10 ++-- .../release/record/ResearchResourceTitle.java | 10 ++-- .../v3/release/record/ResearcherUrl.java | 12 ++-- .../v3/release/record/ResearcherUrls.java | 12 ++-- .../jaxb/model/v3/release/record/Service.java | 2 +- .../v3/release/record/SourceReference.java | 10 ++-- .../model/v3/release/record/SourceType.java | 4 +- .../jaxb/model/v3/release/record/Spam.java | 10 ++-- .../jaxb/model/v3/release/record/Subject.java | 12 ++-- .../model/v3/release/record/SubjectName.java | 10 ++-- .../v3/release/record/SubmissionDate.java | 12 ++-- .../jaxb/model/v3/release/record/Work.java | 14 ++--- .../model/v3/release/record/WorkBulk.java | 12 ++-- .../model/v3/release/record/WorkCategory.java | 2 +- .../v3/release/record/WorkContributors.java | 10 ++-- .../model/v3/release/record/WorkSource.java | 4 +- .../model/v3/release/record/WorkTitle.java | 10 ++-- .../jaxb/model/v3/release/record/Works.java | 10 ++-- .../model/v3/release/record/package-info.java | 60 +++++++++---------- .../record/summary/ActivitiesSummary.java | 12 ++-- .../release/record/summary/ActivityGroup.java | 4 +- .../record/summary/AffiliationGroup.java | 12 ++-- .../record/summary/AffiliationSummary.java | 10 ++-- .../release/record/summary/Affiliations.java | 10 ++-- .../record/summary/DistinctionSummary.java | 2 +- .../release/record/summary/Distinctions.java | 2 +- .../record/summary/EducationSummary.java | 2 +- .../v3/release/record/summary/Educations.java | 2 +- .../record/summary/EmploymentSummary.java | 2 +- .../release/record/summary/Employments.java | 2 +- .../release/record/summary/FundingGroup.java | 10 ++-- .../record/summary/FundingSummary.java | 14 ++--- .../v3/release/record/summary/Fundings.java | 12 ++-- .../summary/InvitedPositionSummary.java | 2 +- .../record/summary/InvitedPositions.java | 2 +- .../record/summary/MembershipSummary.java | 2 +- .../release/record/summary/Memberships.java | 2 +- .../summary/PeerReviewDuplicateGroup.java | 10 ++-- .../record/summary/PeerReviewGroup.java | 10 ++-- .../record/summary/PeerReviewSummary.java | 14 ++--- .../release/record/summary/PeerReviews.java | 12 ++-- .../record/summary/QualificationSummary.java | 2 +- .../record/summary/Qualifications.java | 2 +- .../record/summary/ResearchResourceGroup.java | 10 ++-- .../summary/ResearchResourceSummary.java | 12 ++-- .../record/summary/ResearchResources.java | 12 ++-- .../record/summary/ServiceSummary.java | 2 +- .../v3/release/record/summary/Services.java | 2 +- .../v3/release/record/summary/WorkGroup.java | 10 ++-- .../release/record/summary/WorkSummary.java | 14 ++--- .../v3/release/record/summary/Works.java | 12 ++-- .../release/record/summary/package-info.java | 28 ++++----- .../jaxb/model/v3/release/search/Result.java | 8 +-- .../jaxb/model/v3/release/search/Search.java | 12 ++-- .../search/expanded/ExpandedResult.java | 8 +-- .../search/expanded/ExpandedSearch.java | 12 ++-- .../release/search/expanded/package-info.java | 6 +- .../model/v3/release/search/package-info.java | 8 +-- .../org/orcid/entities/MarshallingTest.java | 6 +- .../notification/custom/MarshallingTest.java | 6 +- .../permission/MarshallingTest.java | 8 +-- .../jaxb/test/utils/OrcidTranslator.java | 12 ++-- .../record/ValidateV2IdentifiersTest.java | 10 ++-- .../orcid/record/ValidateV2SamplesTest.java | 8 +-- .../record/ValidateV2_1IdentifiersTest.java | 10 ++-- .../orcid/record/ValidateV2_1SamplesTest.java | 8 +-- .../record/v3/release/SchemaValidateTest.java | 2 +- .../release/TransientNonEmptyStringTest.java | 10 ++-- .../record/v3/release/V3RoundTripTest.java | 2 +- .../v3/release/ValidateV3SamplesTest.java | 8 +-- 507 files changed, 2351 insertions(+), 2318 deletions(-) create mode 100644 .github/workflows/mvn.yml diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml new file mode 100644 index 0000000..4745619 --- /dev/null +++ b/.github/workflows/mvn.yml @@ -0,0 +1,24 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + # Step that does that actual cache save and restore + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '17.0.4+8' + distribution: 'adopt' + - name: Build with mvn + run: mvn -B -ntp clean install diff --git a/pom.xml b/pom.xml index ea7b02e..3511a68 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.orcid - orcid-model - 3.2.0 + orcid-model-jakarta + 3.3.0-SNAPSHOT ORCID - Model Container for all classes that will be used to marshal and unmarshal XML/JSON from the API - http://github.com/ORCID/orcid-model + https://github.com/ORCID/orcid-model ${project.basedir} @@ -21,7 +21,7 @@ MIT License - http://www.opensource.org/licenses/mit-license.php + https://www.opensource.org/licenses/mit-license.php @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.5.0 attach-javadocs @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.0.0 enforce-versions @@ -132,10 +132,10 @@ - 3.6.3 + 3.8.6 - 11 + 17 @@ -145,17 +145,17 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 true - 11 - 11 + 17 + 17 org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 attach-javadocs @@ -191,18 +191,18 @@ 2.6 - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta ${swagger.version} io.swagger.core.v3 - swagger-annotations + swagger-annotations-jakarta ${swagger.version} @@ -222,17 +222,27 @@ com.fasterxml.jackson.core jackson-databind ${jackson.version} - + - com.sun.xml.bind - jaxb-impl - 2.3.6 - + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 + - javax.annotation - javax.annotation-api - 1.3.2 - + org.glassfish.jaxb + jaxb-runtime + 3.0.2 + + + jakarta.validation + jakarta.validation-api + 3.0.2 + + + jakarta.annotation + jakarta.annotation-api + 2.0.0 + diff --git a/src/main/java/org/orcid/jaxb/model/client_v2/ClientSummary.java b/src/main/java/org/orcid/jaxb/model/client_v2/ClientSummary.java index bcb89bb..db98e52 100644 --- a/src/main/java/org/orcid/jaxb/model/client_v2/ClientSummary.java +++ b/src/main/java/org/orcid/jaxb/model/client_v2/ClientSummary.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(propOrder = { "name", "description" }) diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/ClientType.java b/src/main/java/org/orcid/jaxb/model/clientgroup/ClientType.java index c42e162..13fafb0 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/ClientType.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/ClientType.java @@ -10,9 +10,9 @@ import java.util.HashSet; import java.util.Set; -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; import org.orcid.jaxb.model.message.ScopePathType; diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/MemberType.java b/src/main/java/org/orcid/jaxb/model/clientgroup/MemberType.java index 678bf55..d83d651 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/MemberType.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/MemberType.java @@ -1,8 +1,8 @@ package org.orcid.jaxb.model.clientgroup; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/clientgroup/ObjectFactory.java index 8909da3..0806f35 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/ObjectFactory.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.clientgroup; -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/src/main/java/org/orcid/jaxb/model/clientgroup/OrcidClientGroup.java b/src/main/java/org/orcid/jaxb/model/clientgroup/OrcidClientGroup.java index c437785..1e56b01 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/OrcidClientGroup.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/OrcidClientGroup.java @@ -13,10 +13,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; public class OrcidClientGroup implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUri.java b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUri.java index 5a14be6..a802c1a 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUri.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUri.java @@ -3,14 +3,14 @@ import java.io.Serializable; 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.XmlTransient; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.orcid.jaxb.model.message.ScopePathType; diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUriType.java b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUriType.java index b8e80f9..a6da4a5 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUriType.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUriType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.clientgroup; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUris.java b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUris.java index 6d4d9be..55df735 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUris.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/RedirectUris.java @@ -2,11 +2,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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/clientgroup/package-info.java b/src/main/java/org/orcid/jaxb/model/clientgroup/package-info.java index d9c2e46..77a89b9 100644 --- a/src/main/java/org/orcid/jaxb/model/clientgroup/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/clientgroup/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2012.04.18 at 12:45:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/orcid", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/orcid", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.clientgroup; diff --git a/src/main/java/org/orcid/jaxb/model/common/AvailableLocales.java b/src/main/java/org/orcid/jaxb/model/common/AvailableLocales.java index d1e99fb..2c44fee 100644 --- a/src/main/java/org/orcid/jaxb/model/common/AvailableLocales.java +++ b/src/main/java/org/orcid/jaxb/model/common/AvailableLocales.java @@ -1,7 +1,7 @@ package org.orcid.jaxb.model.common; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/common/SequenceType.java b/src/main/java/org/orcid/jaxb/model/common/SequenceType.java index 0baf0e6..17a7418 100644 --- a/src/main/java/org/orcid/jaxb/model/common/SequenceType.java +++ b/src/main/java/org/orcid/jaxb/model/common/SequenceType.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** * @author Declan Newman (declan) diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/AvailableLocalesAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/AvailableLocalesAdapter.java index d7d3f2e..1808417 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/AvailableLocalesAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/AvailableLocalesAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.AvailableLocales; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/CitationTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/CitationTypeAdapter.java index 5e29549..7a611b9 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/CitationTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/CitationTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.CitationType; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/ContributorRoleAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/ContributorRoleAdapter.java index 009a064..8d9b45e 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/ContributorRoleAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/ContributorRoleAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.ContributorRole; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/CurrencyAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/CurrencyAdapter.java index 754d0cf..39631f5 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/CurrencyAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/CurrencyAdapter.java @@ -2,7 +2,7 @@ import java.util.Currency; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class CurrencyAdapter extends XmlAdapter { diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/FundingContributorRoleAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/FundingContributorRoleAdapter.java index f971ab2..bd05376 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/FundingContributorRoleAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/FundingContributorRoleAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.FundingContributorRole; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/FundingTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/FundingTypeAdapter.java index efdee71..c45baed 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/FundingTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/FundingTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.FundingType; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/Iso3166CountryAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/Iso3166CountryAdapter.java index d41e8ed..0d490ae 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/Iso3166CountryAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/Iso3166CountryAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.Iso3166Country; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/LanguageCodeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/LanguageCodeAdapter.java index 02c94b0..5d5e697 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/LanguageCodeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/LanguageCodeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.LanguageCode; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewRoleAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewRoleAdapter.java index fe3a127..7397257 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewRoleAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewRoleAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.Role; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewSubjectTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewSubjectTypeAdapter.java index c2c8bf1..5b1b74f 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewSubjectTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewSubjectTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.PeerReviewSubjectType; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewTypeAdapter.java index 39f6e56..58b8771 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/PeerReviewTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.PeerReviewType; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/RelationshipAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/RelationshipAdapter.java index d2174f6..e5dbe8c 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/RelationshipAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/RelationshipAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.Relationship; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/ResourceTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/ResourceTypeAdapter.java index 4db3aa8..960f1d7 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/ResourceTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/ResourceTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.ResourceType; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/SequenceTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/SequenceTypeAdapter.java index 857006d..d21dc25 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/SequenceTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/SequenceTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.SequenceType; diff --git a/src/main/java/org/orcid/jaxb/model/common/adapters/WorkTypeAdapter.java b/src/main/java/org/orcid/jaxb/model/common/adapters/WorkTypeAdapter.java index da91a56..9c4e08b 100644 --- a/src/main/java/org/orcid/jaxb/model/common/adapters/WorkTypeAdapter.java +++ b/src/main/java/org/orcid/jaxb/model/common/adapters/WorkTypeAdapter.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.common.adapters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.orcid.jaxb.model.common.WorkType; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Amount.java b/src/main/java/org/orcid/jaxb/model/common_v2/Amount.java index 919ce33..e2b2ba4 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Amount.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Amount.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Contributor.java b/src/main/java/org/orcid/jaxb/model/common_v2/Contributor.java index 9a3ee75..eff31cd 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Contributor.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Contributor.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorAttributes.java b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorAttributes.java index cfdca36..343ffd3 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorAttributes.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorAttributes.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -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; import org.orcid.jaxb.model.record_v2.SequenceType; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorEmail.java b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorEmail.java index 0fc7b77..1e444b6 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorEmail.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorEmail.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorOrcid.java b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorOrcid.java index 41a0f94..a6c244c 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorOrcid.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorRole.java b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorRole.java index 9ad6287..a708755 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/ContributorRole.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/ContributorRole.java @@ -1,8 +1,8 @@ package org.orcid.jaxb.model.common_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Country.java b/src/main/java/org/orcid/jaxb/model/common_v2/Country.java index 7ba0e99..4e84434 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Country.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Country.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/CreatedDate.java b/src/main/java/org/orcid/jaxb/model/common_v2/CreatedDate.java index 0d2d026..1a0bd6e 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/CreatedDate.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/CreatedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/CreditName.java b/src/main/java/org/orcid/jaxb/model/common_v2/CreditName.java index ef02f94..a19971c 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/CreditName.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/CreditName.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Day.java b/src/main/java/org/orcid/jaxb/model/common_v2/Day.java index bf2a6dd..532d2fd 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Day.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Day.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/DisambiguatedOrganization.java b/src/main/java/org/orcid/jaxb/model/common_v2/DisambiguatedOrganization.java index df26ef0..51126d2 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/DisambiguatedOrganization.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/DisambiguatedOrganization.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/FuzzyDate.java b/src/main/java/org/orcid/jaxb/model/common_v2/FuzzyDate.java index d26e49b..10cbdf3 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/FuzzyDate.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/FuzzyDate.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Iso3166Country.java b/src/main/java/org/orcid/jaxb/model/common_v2/Iso3166Country.java index 591ffa6..6197436 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Iso3166Country.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Iso3166Country.java @@ -9,8 +9,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for country-type. diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/LastModifiedDate.java b/src/main/java/org/orcid/jaxb/model/common_v2/LastModifiedDate.java index dbd873d..f6a2d65 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/LastModifiedDate.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/LastModifiedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Locale.java b/src/main/java/org/orcid/jaxb/model/common_v2/Locale.java index 7e53722..a124a03 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Locale.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Locale.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.common_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/MediaType.java b/src/main/java/org/orcid/jaxb/model/common_v2/MediaType.java index 244eaee..1d97945 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/MediaType.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/MediaType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.common_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Month.java b/src/main/java/org/orcid/jaxb/model/common_v2/Month.java index 31009a9..9dc04a3 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Month.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Month.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdBase.java b/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdBase.java index 66a46bb..19a22e3 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdBase.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdBase.java @@ -18,10 +18,10 @@ */ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdentifier.java b/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdentifier.java index 5d7e95f..2e90f2b 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/OrcidIdentifier.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/OrcidType.java b/src/main/java/org/orcid/jaxb/model/common_v2/OrcidType.java index ca07287..b354b9c 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/OrcidType.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/OrcidType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.common_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Organization.java b/src/main/java/org/orcid/jaxb/model/common_v2/Organization.java index 4848c12..1d28bc1 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Organization.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Organization.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.common_v2; import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationAddress.java b/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationAddress.java index 57ab0c7..edcd729 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationAddress.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationAddress.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationDefinedFundingSubType.java b/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationDefinedFundingSubType.java index 9c985b6..2abf3d2 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationDefinedFundingSubType.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/OrganizationDefinedFundingSubType.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/PublicationDate.java b/src/main/java/org/orcid/jaxb/model/common_v2/PublicationDate.java index 2eeb26d..1b59af5 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/PublicationDate.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/PublicationDate.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.common_v2; import java.io.Serializable; -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 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 io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Source.java b/src/main/java/org/orcid/jaxb/model/common_v2/Source.java index 001c9c4..8f1297c 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Source.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Source.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/SourceClientId.java b/src/main/java/org/orcid/jaxb/model/common_v2/SourceClientId.java index 3e30b43..a538e81 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/SourceClientId.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/SourceClientId.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/SourceName.java b/src/main/java/org/orcid/jaxb/model/common_v2/SourceName.java index 563ba37..e33e9d6 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/SourceName.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/SourceName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/SourceOrcid.java b/src/main/java/org/orcid/jaxb/model/common_v2/SourceOrcid.java index 101484c..6b96229 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/SourceOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/SourceOrcid.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Subtitle.java b/src/main/java/org/orcid/jaxb/model/common_v2/Subtitle.java index 8467bea..defa21e 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Subtitle.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Subtitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Title.java b/src/main/java/org/orcid/jaxb/model/common_v2/Title.java index a7efa79..e0d5a5b 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Title.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Title.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/TranslatedTitle.java b/src/main/java/org/orcid/jaxb/model/common_v2/TranslatedTitle.java index dc6283a..8b93771 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/TranslatedTitle.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/TranslatedTitle.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Url.java b/src/main/java/org/orcid/jaxb/model/common_v2/Url.java index 42a21d5..faa06b7 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Url.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Url.java @@ -11,12 +11,12 @@ import io.swagger.v3.oas.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Visibility.java b/src/main/java/org/orcid/jaxb/model/common_v2/Visibility.java index b65b09c..38b4946 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Visibility.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Visibility.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.common_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/Year.java b/src/main/java/org/orcid/jaxb/model/common_v2/Year.java index 725bfa8..976d91b 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/Year.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/Year.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.common_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/common_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/common_v2/package-info.java index ed52e82..4090314 100644 --- a/src/main/java/org/orcid/jaxb/model/common_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/common_v2/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/common", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/common", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.common_v2; diff --git a/src/main/java/org/orcid/jaxb/model/error_v2/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/error_v2/ObjectFactory.java index ea2bd0a..58a62b4 100644 --- a/src/main/java/org/orcid/jaxb/model/error_v2/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/error_v2/ObjectFactory.java @@ -8,7 +8,7 @@ package org.orcid.jaxb.model.error_v2; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/src/main/java/org/orcid/jaxb/model/error_v2/OrcidError.java b/src/main/java/org/orcid/jaxb/model/error_v2/OrcidError.java index 94d6d33..d813c36 100644 --- a/src/main/java/org/orcid/jaxb/model/error_v2/OrcidError.java +++ b/src/main/java/org/orcid/jaxb/model/error_v2/OrcidError.java @@ -10,12 +10,12 @@ import java.io.Serializable; -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.XmlSchemaType; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.record.bulk.BulkElement; diff --git a/src/main/java/org/orcid/jaxb/model/error_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/error_v2/package-info.java index ea6060d..49ffae4 100644 --- a/src/main/java/org/orcid/jaxb/model/error_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/error_v2/package-info.java @@ -5,5 +5,5 @@ // Generated on: 2015.01.09 at 01:28:54 PM GMT // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/error", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/error", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.error_v2; diff --git a/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecord.java b/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecord.java index bf23c44..2c52097 100644 --- a/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecord.java +++ b/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecord.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecords.java b/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecords.java index 8da31d4..7b79cf9 100644 --- a/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecords.java +++ b/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupIdRecords.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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupType.java b/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupType.java index 29bef3c..70495bc 100644 --- a/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupType.java +++ b/src/main/java/org/orcid/jaxb/model/groupid_v2/GroupType.java @@ -1,10 +1,9 @@ package org.orcid.jaxb.model.groupid_v2; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; - import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; @XmlType(name = "group-type") @XmlEnum diff --git a/src/main/java/org/orcid/jaxb/model/groupid_v2/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/groupid_v2/ObjectFactory.java index 70724c8..85f229c 100644 --- a/src/main/java/org/orcid/jaxb/model/groupid_v2/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/groupid_v2/ObjectFactory.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.groupid_v2; -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/src/main/java/org/orcid/jaxb/model/groupid_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/groupid_v2/package-info.java index 5e0a262..2e46102 100644 --- a/src/main/java/org/orcid/jaxb/model/groupid_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/groupid_v2/package-info.java @@ -5,9 +5,9 @@ // Generated on: 2012.04.18 at 12:45:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/group-id", xmlns={ - @javax.xml.bind.annotation.XmlNs(prefix = "group-id", namespaceURI = "http://www.orcid.org/ns/group-id"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/group-id", xmlns={ + @jakarta.xml.bind.annotation.XmlNs(prefix = "group-id", namespaceURI = "http://www.orcid.org/ns/group-id"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.groupid_v2; diff --git a/src/main/java/org/orcid/jaxb/model/message/ActivitiesVisibilityDefault.java b/src/main/java/org/orcid/jaxb/model/message/ActivitiesVisibilityDefault.java index 998f72e..5d2f46d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ActivitiesVisibilityDefault.java +++ b/src/main/java/org/orcid/jaxb/model/message/ActivitiesVisibilityDefault.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Address.java b/src/main/java/org/orcid/jaxb/model/message/Address.java index 0ef699e..d16c5b6 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Address.java +++ b/src/main/java/org/orcid/jaxb/model/message/Address.java @@ -9,10 +9,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** *

Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Affiliation.java b/src/main/java/org/orcid/jaxb/model/message/Affiliation.java index 41f806e..00934d6 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Affiliation.java +++ b/src/main/java/org/orcid/jaxb/model/message/Affiliation.java @@ -8,12 +8,12 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/AffiliationAddress.java b/src/main/java/org/orcid/jaxb/model/message/AffiliationAddress.java index 66b0ef6..70ba30c 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AffiliationAddress.java +++ b/src/main/java/org/orcid/jaxb/model/message/AffiliationAddress.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/AffiliationCity.java b/src/main/java/org/orcid/jaxb/model/message/AffiliationCity.java index 1b84943..e09c6e1 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AffiliationCity.java +++ b/src/main/java/org/orcid/jaxb/model/message/AffiliationCity.java @@ -8,12 +8,12 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * City diff --git a/src/main/java/org/orcid/jaxb/model/message/AffiliationCountry.java b/src/main/java/org/orcid/jaxb/model/message/AffiliationCountry.java index 2c66950..037a02a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AffiliationCountry.java +++ b/src/main/java/org/orcid/jaxb/model/message/AffiliationCountry.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * ISO 3611 country diff --git a/src/main/java/org/orcid/jaxb/model/message/AffiliationRegion.java b/src/main/java/org/orcid/jaxb/model/message/AffiliationRegion.java index ef32ebf..c4653cb 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AffiliationRegion.java +++ b/src/main/java/org/orcid/jaxb/model/message/AffiliationRegion.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Region within a country diff --git a/src/main/java/org/orcid/jaxb/model/message/AffiliationType.java b/src/main/java/org/orcid/jaxb/model/message/AffiliationType.java index 62dea6b..ea7b87d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AffiliationType.java +++ b/src/main/java/org/orcid/jaxb/model/message/AffiliationType.java @@ -1,8 +1,8 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/Affiliations.java b/src/main/java/org/orcid/jaxb/model/message/Affiliations.java index ba31187..d32e2d9 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Affiliations.java +++ b/src/main/java/org/orcid/jaxb/model/message/Affiliations.java @@ -13,10 +13,10 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/AgencyName.java b/src/main/java/org/orcid/jaxb/model/message/AgencyName.java index 3cca5ea..8121c65 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AgencyName.java +++ b/src/main/java/org/orcid/jaxb/model/message/AgencyName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/AgencyOrcid.java b/src/main/java/org/orcid/jaxb/model/message/AgencyOrcid.java index ecb757f..9313659 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AgencyOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/message/AgencyOrcid.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "agency-orcid") public class AgencyOrcid extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/AlternativeEmail.java b/src/main/java/org/orcid/jaxb/model/message/AlternativeEmail.java index 604ac91..f47eca4 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AlternativeEmail.java +++ b/src/main/java/org/orcid/jaxb/model/message/AlternativeEmail.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/AlternativeEmails.java b/src/main/java/org/orcid/jaxb/model/message/AlternativeEmails.java index 362f594..5750de1 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AlternativeEmails.java +++ b/src/main/java/org/orcid/jaxb/model/message/AlternativeEmails.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/orcid/jaxb/model/message/Amount.java b/src/main/java/org/orcid/jaxb/model/message/Amount.java index 5b93eb4..55f7207 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Amount.java +++ b/src/main/java/org/orcid/jaxb/model/message/Amount.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/ApplicationName.java b/src/main/java/org/orcid/jaxb/model/message/ApplicationName.java index db6352a..ffed7ab 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ApplicationName.java +++ b/src/main/java/org/orcid/jaxb/model/message/ApplicationName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ApplicationOrcid.java b/src/main/java/org/orcid/jaxb/model/message/ApplicationOrcid.java index 24ee935..d222ae4 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ApplicationOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/message/ApplicationOrcid.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "application-orcid") public class ApplicationOrcid extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/ApplicationSummary.java b/src/main/java/org/orcid/jaxb/model/message/ApplicationSummary.java index 285084a..0007895 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ApplicationSummary.java +++ b/src/main/java/org/orcid/jaxb/model/message/ApplicationSummary.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ApplicationWebsite.java b/src/main/java/org/orcid/jaxb/model/message/ApplicationWebsite.java index 5a7dc73..cec32da 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ApplicationWebsite.java +++ b/src/main/java/org/orcid/jaxb/model/message/ApplicationWebsite.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Applications.java b/src/main/java/org/orcid/jaxb/model/message/Applications.java index 33f5727..350eea7 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Applications.java +++ b/src/main/java/org/orcid/jaxb/model/message/Applications.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/ApprovalDate.java b/src/main/java/org/orcid/jaxb/model/message/ApprovalDate.java index 1f89c0b..2180a00 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ApprovalDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/ApprovalDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/Assignee.java b/src/main/java/org/orcid/jaxb/model/message/Assignee.java index c1e1756..dfdcd2d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Assignee.java +++ b/src/main/java/org/orcid/jaxb/model/message/Assignee.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/AssigneeName.java b/src/main/java/org/orcid/jaxb/model/message/AssigneeName.java index 8fa0d70..8188f7a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AssigneeName.java +++ b/src/main/java/org/orcid/jaxb/model/message/AssigneeName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/AssigneeOrcid.java b/src/main/java/org/orcid/jaxb/model/message/AssigneeOrcid.java index b495516..43bcad8 100644 --- a/src/main/java/org/orcid/jaxb/model/message/AssigneeOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/message/AssigneeOrcid.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "assignee-orcid") public class AssigneeOrcid extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/Biography.java b/src/main/java/org/orcid/jaxb/model/message/Biography.java index 45ba2fd..3334fcf 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Biography.java +++ b/src/main/java/org/orcid/jaxb/model/message/Biography.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Citation.java b/src/main/java/org/orcid/jaxb/model/message/Citation.java index 7f798de..5e6ff57 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Citation.java +++ b/src/main/java/org/orcid/jaxb/model/message/Citation.java @@ -9,10 +9,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; /** * Element to contain a citation of a given type diff --git a/src/main/java/org/orcid/jaxb/model/message/CitationType.java b/src/main/java/org/orcid/jaxb/model/message/CitationType.java index a2c8a2a..291172c 100644 --- a/src/main/java/org/orcid/jaxb/model/message/CitationType.java +++ b/src/main/java/org/orcid/jaxb/model/message/CitationType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/Claimed.java b/src/main/java/org/orcid/jaxb/model/message/Claimed.java index ee12966..db30386 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Claimed.java +++ b/src/main/java/org/orcid/jaxb/model/message/Claimed.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/CompletionDate.java b/src/main/java/org/orcid/jaxb/model/message/CompletionDate.java index e8b941b..43fd42a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/CompletionDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/CompletionDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/ContactDetails.java b/src/main/java/org/orcid/jaxb/model/message/ContactDetails.java index f803278..0787d38 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ContactDetails.java +++ b/src/main/java/org/orcid/jaxb/model/message/ContactDetails.java @@ -11,10 +11,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Contributor.java b/src/main/java/org/orcid/jaxb/model/message/Contributor.java index 8bbe7a1..27c6976 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Contributor.java +++ b/src/main/java/org/orcid/jaxb/model/message/Contributor.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ContributorAttributes.java b/src/main/java/org/orcid/jaxb/model/message/ContributorAttributes.java index df6ae1b..0942c05 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ContributorAttributes.java +++ b/src/main/java/org/orcid/jaxb/model/message/ContributorAttributes.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ContributorEmail.java b/src/main/java/org/orcid/jaxb/model/message/ContributorEmail.java index 7019f97..6fe3949 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ContributorEmail.java +++ b/src/main/java/org/orcid/jaxb/model/message/ContributorEmail.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ContributorOrcid.java b/src/main/java/org/orcid/jaxb/model/message/ContributorOrcid.java index cb01e24..4545952 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ContributorOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/message/ContributorOrcid.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "contributor-orcid") public class ContributorOrcid extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/ContributorRole.java b/src/main/java/org/orcid/jaxb/model/message/ContributorRole.java index a4d87f7..b41e1c7 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ContributorRole.java +++ b/src/main/java/org/orcid/jaxb/model/message/ContributorRole.java @@ -1,8 +1,8 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/Country.java b/src/main/java/org/orcid/jaxb/model/message/Country.java index a5b02e9..88a52a6 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Country.java +++ b/src/main/java/org/orcid/jaxb/model/message/Country.java @@ -8,13 +8,13 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * ISO 3611 country diff --git a/src/main/java/org/orcid/jaxb/model/message/CreatedDate.java b/src/main/java/org/orcid/jaxb/model/message/CreatedDate.java index a8f9087..19fb7cd 100644 --- a/src/main/java/org/orcid/jaxb/model/message/CreatedDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/CreatedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/CreationMethod.java b/src/main/java/org/orcid/jaxb/model/message/CreationMethod.java index 3947c69..aae7bb7 100644 --- a/src/main/java/org/orcid/jaxb/model/message/CreationMethod.java +++ b/src/main/java/org/orcid/jaxb/model/message/CreationMethod.java @@ -7,8 +7,8 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/CreditName.java b/src/main/java/org/orcid/jaxb/model/message/CreditName.java index 7b3d8ff..4e38e58 100644 --- a/src/main/java/org/orcid/jaxb/model/message/CreditName.java +++ b/src/main/java/org/orcid/jaxb/model/message/CreditName.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Day.java b/src/main/java/org/orcid/jaxb/model/message/Day.java index 6900304..3f4bc2b 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Day.java +++ b/src/main/java/org/orcid/jaxb/model/message/Day.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/DeactivationDate.java b/src/main/java/org/orcid/jaxb/model/message/DeactivationDate.java index 157adb5..e655885 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DeactivationDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/DeactivationDate.java @@ -9,12 +9,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/DelegateSummary.java b/src/main/java/org/orcid/jaxb/model/message/DelegateSummary.java index ff58726..f99f96d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DelegateSummary.java +++ b/src/main/java/org/orcid/jaxb/model/message/DelegateSummary.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Delegation.java b/src/main/java/org/orcid/jaxb/model/message/Delegation.java index 699e08c..537d498 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Delegation.java +++ b/src/main/java/org/orcid/jaxb/model/message/Delegation.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/DelegationDetails.java b/src/main/java/org/orcid/jaxb/model/message/DelegationDetails.java index bf2f939..1cfde09 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DelegationDetails.java +++ b/src/main/java/org/orcid/jaxb/model/message/DelegationDetails.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/DepartmentName.java b/src/main/java/org/orcid/jaxb/model/message/DepartmentName.java index cf27e28..973e04d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DepartmentName.java +++ b/src/main/java/org/orcid/jaxb/model/message/DepartmentName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/DeprecatedDate.java b/src/main/java/org/orcid/jaxb/model/message/DeprecatedDate.java index 99c4082..4e0ca50 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DeprecatedDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/DeprecatedDate.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/DeveloperToolsEnabled.java b/src/main/java/org/orcid/jaxb/model/message/DeveloperToolsEnabled.java index e283ad7..edbc9b3 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DeveloperToolsEnabled.java +++ b/src/main/java/org/orcid/jaxb/model/message/DeveloperToolsEnabled.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/DisambiguatedOrganization.java b/src/main/java/org/orcid/jaxb/model/message/DisambiguatedOrganization.java index de1df77..6cce10f 100644 --- a/src/main/java/org/orcid/jaxb/model/message/DisambiguatedOrganization.java +++ b/src/main/java/org/orcid/jaxb/model/message/DisambiguatedOrganization.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for disambiguated-organization complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Email.java b/src/main/java/org/orcid/jaxb/model/message/Email.java index 49dd314..eab1376 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Email.java +++ b/src/main/java/org/orcid/jaxb/model/message/Email.java @@ -8,12 +8,12 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/EncryptedPassword.java b/src/main/java/org/orcid/jaxb/model/message/EncryptedPassword.java index ccf912d..60e2c4a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/EncryptedPassword.java +++ b/src/main/java/org/orcid/jaxb/model/message/EncryptedPassword.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ErrorDesc.java b/src/main/java/org/orcid/jaxb/model/message/ErrorDesc.java index 3e17719..29614e2 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ErrorDesc.java +++ b/src/main/java/org/orcid/jaxb/model/message/ErrorDesc.java @@ -1,9 +1,9 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ExternalIdCommonName.java b/src/main/java/org/orcid/jaxb/model/message/ExternalIdCommonName.java index 91536e4..8437c0a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ExternalIdCommonName.java +++ b/src/main/java/org/orcid/jaxb/model/message/ExternalIdCommonName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ExternalIdReference.java b/src/main/java/org/orcid/jaxb/model/message/ExternalIdReference.java index 204c3d6..0afa474 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ExternalIdReference.java +++ b/src/main/java/org/orcid/jaxb/model/message/ExternalIdReference.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ExternalIdSource.java b/src/main/java/org/orcid/jaxb/model/message/ExternalIdSource.java index 24678b2..2f983f0 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ExternalIdSource.java +++ b/src/main/java/org/orcid/jaxb/model/message/ExternalIdSource.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Deprecated @XmlRootElement(name = "external-id-source") diff --git a/src/main/java/org/orcid/jaxb/model/message/ExternalIdUrl.java b/src/main/java/org/orcid/jaxb/model/message/ExternalIdUrl.java index 5cb07e1..4f539b8 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ExternalIdUrl.java +++ b/src/main/java/org/orcid/jaxb/model/message/ExternalIdUrl.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifier.java b/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifier.java index 8b0268f..559e48f 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifier.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifiers.java b/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifiers.java index 5611524..cf12f78 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifiers.java +++ b/src/main/java/org/orcid/jaxb/model/message/ExternalIdentifiers.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; /** *

Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/FamilyName.java b/src/main/java/org/orcid/jaxb/model/message/FamilyName.java index 0d9fe70..3079a55 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FamilyName.java +++ b/src/main/java/org/orcid/jaxb/model/message/FamilyName.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Funding.java b/src/main/java/org/orcid/jaxb/model/message/Funding.java index 703ac4d..d543a99 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Funding.java +++ b/src/main/java/org/orcid/jaxb/model/message/Funding.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingAgency.java b/src/main/java/org/orcid/jaxb/model/message/FundingAgency.java index 2ae6712..a4742eb 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingAgency.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingAgency.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingContributor.java b/src/main/java/org/orcid/jaxb/model/message/FundingContributor.java index 4af0620..5da45d8 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingContributor.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingContributor.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingContributorAttributes.java b/src/main/java/org/orcid/jaxb/model/message/FundingContributorAttributes.java index 5d32ee1..9e95fda 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingContributorAttributes.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingContributorAttributes.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingContributorRole.java b/src/main/java/org/orcid/jaxb/model/message/FundingContributorRole.java index d7bf228..d9a1e65 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingContributorRole.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingContributorRole.java @@ -1,8 +1,8 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingContributors.java b/src/main/java/org/orcid/jaxb/model/message/FundingContributors.java index c217449..8f3ec57 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingContributors.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingContributors.java @@ -11,11 +11,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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifier.java b/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifier.java index bab2e99..c326f6e 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifier.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifierType.java b/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifierType.java index a7b8e4b..497468c 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifierType.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifierType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifiers.java b/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifiers.java index 53786bf..717d3e0 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifiers.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingExternalIdentifiers.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.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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingList.java b/src/main/java/org/orcid/jaxb/model/message/FundingList.java index 64e2d3f..c1433ac 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingList.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingList.java @@ -14,12 +14,12 @@ import java.util.List; import java.util.Map; -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; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingTitle.java b/src/main/java/org/orcid/jaxb/model/message/FundingTitle.java index 4316601..fae2267 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingTitle.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingTitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/FundingType.java b/src/main/java/org/orcid/jaxb/model/message/FundingType.java index a21c718..3fd0a32 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FundingType.java +++ b/src/main/java/org/orcid/jaxb/model/message/FundingType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/FuzzyDate.java b/src/main/java/org/orcid/jaxb/model/message/FuzzyDate.java index f4919ec..60ca352 100644 --- a/src/main/java/org/orcid/jaxb/model/message/FuzzyDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/FuzzyDate.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/src/main/java/org/orcid/jaxb/model/message/GivenNames.java b/src/main/java/org/orcid/jaxb/model/message/GivenNames.java index f7dc545..d149bea 100644 --- a/src/main/java/org/orcid/jaxb/model/message/GivenNames.java +++ b/src/main/java/org/orcid/jaxb/model/message/GivenNames.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/GivenPermissionBy.java b/src/main/java/org/orcid/jaxb/model/message/GivenPermissionBy.java index 577b78a..6c632c4 100644 --- a/src/main/java/org/orcid/jaxb/model/message/GivenPermissionBy.java +++ b/src/main/java/org/orcid/jaxb/model/message/GivenPermissionBy.java @@ -10,11 +10,11 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/GivenPermissionTo.java b/src/main/java/org/orcid/jaxb/model/message/GivenPermissionTo.java index 4b8f958..f2e5fad 100644 --- a/src/main/java/org/orcid/jaxb/model/message/GivenPermissionTo.java +++ b/src/main/java/org/orcid/jaxb/model/message/GivenPermissionTo.java @@ -10,11 +10,11 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/GrantDate.java b/src/main/java/org/orcid/jaxb/model/message/GrantDate.java index c25cbc1..bd1ce96 100644 --- a/src/main/java/org/orcid/jaxb/model/message/GrantDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/GrantDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/GrantExternalProgram.java b/src/main/java/org/orcid/jaxb/model/message/GrantExternalProgram.java index 8c171dd..d7a4067 100644 --- a/src/main/java/org/orcid/jaxb/model/message/GrantExternalProgram.java +++ b/src/main/java/org/orcid/jaxb/model/message/GrantExternalProgram.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/GrantSources.java b/src/main/java/org/orcid/jaxb/model/message/GrantSources.java index b9116e3..566e58a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/GrantSources.java +++ b/src/main/java/org/orcid/jaxb/model/message/GrantSources.java @@ -10,10 +10,10 @@ import java.io.Serializable; 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.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Iso3166Country.java b/src/main/java/org/orcid/jaxb/model/message/Iso3166Country.java index 99620ea..f67d3f2 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Iso3166Country.java +++ b/src/main/java/org/orcid/jaxb/model/message/Iso3166Country.java @@ -9,8 +9,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for country-type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Keyword.java b/src/main/java/org/orcid/jaxb/model/message/Keyword.java index 06f3d50..0aaba65 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Keyword.java +++ b/src/main/java/org/orcid/jaxb/model/message/Keyword.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/org/orcid/jaxb/model/message/Keywords.java b/src/main/java/org/orcid/jaxb/model/message/Keywords.java index bdb77ab..4f9d28e 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Keywords.java +++ b/src/main/java/org/orcid/jaxb/model/message/Keywords.java @@ -10,11 +10,11 @@ import java.io.Serializable; 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 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/LastModifiedDate.java b/src/main/java/org/orcid/jaxb/model/message/LastModifiedDate.java index 0c8fe28..5336f23 100644 --- a/src/main/java/org/orcid/jaxb/model/message/LastModifiedDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/LastModifiedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/Locale.java b/src/main/java/org/orcid/jaxb/model/message/Locale.java index 10d0f6d..45bf7bb 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Locale.java +++ b/src/main/java/org/orcid/jaxb/model/message/Locale.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/MediaType.java b/src/main/java/org/orcid/jaxb/model/message/MediaType.java index 45727f6..3192d70 100644 --- a/src/main/java/org/orcid/jaxb/model/message/MediaType.java +++ b/src/main/java/org/orcid/jaxb/model/message/MediaType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/Month.java b/src/main/java/org/orcid/jaxb/model/message/Month.java index e9ed487..46cf998 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Month.java +++ b/src/main/java/org/orcid/jaxb/model/message/Month.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/message/ObjectFactory.java index d00b5d2..abf8735 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/message/ObjectFactory.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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/src/main/java/org/orcid/jaxb/model/message/Orcid.java b/src/main/java/org/orcid/jaxb/model/message/Orcid.java index 040d246..77a216f 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Orcid.java +++ b/src/main/java/org/orcid/jaxb/model/message/Orcid.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidActivities.java b/src/main/java/org/orcid/jaxb/model/message/OrcidActivities.java index 5a01ba4..aa0fb28 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidActivities.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidActivities.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidBio.java b/src/main/java/org/orcid/jaxb/model/message/OrcidBio.java index fd48905..0fff61a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidBio.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidBio.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidDeprecated.java b/src/main/java/org/orcid/jaxb/model/message/OrcidDeprecated.java index 0250e0b..097c91d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidDeprecated.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidDeprecated.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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.XmlSchemaType; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType( propOrder = { "date", "primaryRecord"}) diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidHistory.java b/src/main/java/org/orcid/jaxb/model/message/OrcidHistory.java index 6f49baf..3bd72d5 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidHistory.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidHistory.java @@ -8,12 +8,12 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidIdBase.java b/src/main/java/org/orcid/jaxb/model/message/OrcidIdBase.java index 3d902cf..8b95ae9 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidIdBase.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidIdBase.java @@ -20,12 +20,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.XmlElement; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlTransient; -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.XmlMixed; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidIdentifier.java b/src/main/java/org/orcid/jaxb/model/message/OrcidIdentifier.java index 1f3794e..a3a0335 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidIdentifier.java @@ -16,7 +16,7 @@ * * ============================================================================= */ -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "orcid-identifier") public class OrcidIdentifier extends OrcidIdBase { diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidInternal.java b/src/main/java/org/orcid/jaxb/model/message/OrcidInternal.java index 010b622..43d9a70 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidInternal.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidInternal.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidMessage.java b/src/main/java/org/orcid/jaxb/model/message/OrcidMessage.java index 96b503b..95154a7 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidMessage.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidMessage.java @@ -12,16 +12,16 @@ import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.transform.Source; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidPreferences.java b/src/main/java/org/orcid/jaxb/model/message/OrcidPreferences.java index 98cf2be..47f1044 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidPreferences.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidPreferences.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidProfile.java b/src/main/java/org/orcid/jaxb/model/message/OrcidProfile.java index 5e583d2..5178d90 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidProfile.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidProfile.java @@ -4,13 +4,13 @@ import java.util.Date; 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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang.StringUtils; import org.orcid.jaxb.model.clientgroup.ClientType; diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResult.java b/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResult.java index 1d30921..8df485f 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResult.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResult.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResults.java b/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResults.java index def484b..5ba04d1 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResults.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidSearchResults.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidType.java b/src/main/java/org/orcid/jaxb/model/message/OrcidType.java index 7a6a724..2f5e9f8 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidType.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidWork.java b/src/main/java/org/orcid/jaxb/model/message/OrcidWork.java index d3a9354..103615d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidWork.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidWork.java @@ -10,13 +10,13 @@ import java.io.Serializable; 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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrcidWorks.java b/src/main/java/org/orcid/jaxb/model/message/OrcidWorks.java index bdfe366..3b2d546 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrcidWorks.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrcidWorks.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.Map; -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; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/Organization.java b/src/main/java/org/orcid/jaxb/model/message/Organization.java index c6a84b5..25fd370 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Organization.java +++ b/src/main/java/org/orcid/jaxb/model/message/Organization.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/OrganizationAddress.java b/src/main/java/org/orcid/jaxb/model/message/OrganizationAddress.java index 159336f..8922470 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrganizationAddress.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrganizationAddress.java @@ -8,10 +8,10 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; /** * Container for organization location information diff --git a/src/main/java/org/orcid/jaxb/model/message/OrganizationDefinedFundingSubType.java b/src/main/java/org/orcid/jaxb/model/message/OrganizationDefinedFundingSubType.java index 61558a6..f933662 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OrganizationDefinedFundingSubType.java +++ b/src/main/java/org/orcid/jaxb/model/message/OrganizationDefinedFundingSubType.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/OtherName.java b/src/main/java/org/orcid/jaxb/model/message/OtherName.java index 5ca0b06..19ee189 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OtherName.java +++ b/src/main/java/org/orcid/jaxb/model/message/OtherName.java @@ -9,12 +9,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/org/orcid/jaxb/model/message/OtherNames.java b/src/main/java/org/orcid/jaxb/model/message/OtherNames.java index bd2c678..4d904d6 100644 --- a/src/main/java/org/orcid/jaxb/model/message/OtherNames.java +++ b/src/main/java/org/orcid/jaxb/model/message/OtherNames.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/PersonalDetails.java b/src/main/java/org/orcid/jaxb/model/message/PersonalDetails.java index 9539a1a..eb6d492 100644 --- a/src/main/java/org/orcid/jaxb/model/message/PersonalDetails.java +++ b/src/main/java/org/orcid/jaxb/model/message/PersonalDetails.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Preferences.java b/src/main/java/org/orcid/jaxb/model/message/Preferences.java index d82e1f3..0869dd0 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Preferences.java +++ b/src/main/java/org/orcid/jaxb/model/message/Preferences.java @@ -9,12 +9,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/PrimaryRecord.java b/src/main/java/org/orcid/jaxb/model/message/PrimaryRecord.java index fd49481..7d3c5a1 100644 --- a/src/main/java/org/orcid/jaxb/model/message/PrimaryRecord.java +++ b/src/main/java/org/orcid/jaxb/model/message/PrimaryRecord.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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/src/main/java/org/orcid/jaxb/model/message/PublicationDate.java b/src/main/java/org/orcid/jaxb/model/message/PublicationDate.java index e1cc124..f235edd 100644 --- a/src/main/java/org/orcid/jaxb/model/message/PublicationDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/PublicationDate.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -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 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/ReferredBy.java b/src/main/java/org/orcid/jaxb/model/message/ReferredBy.java index ac83ac8..ee395ea 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ReferredBy.java +++ b/src/main/java/org/orcid/jaxb/model/message/ReferredBy.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "referred-by") public class ReferredBy extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/RelevancyScore.java b/src/main/java/org/orcid/jaxb/model/message/RelevancyScore.java index 50a2d6a..1e10773 100644 --- a/src/main/java/org/orcid/jaxb/model/message/RelevancyScore.java +++ b/src/main/java/org/orcid/jaxb/model/message/RelevancyScore.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ResearcherUrl.java b/src/main/java/org/orcid/jaxb/model/message/ResearcherUrl.java index 4838647..4eb80d5 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ResearcherUrl.java +++ b/src/main/java/org/orcid/jaxb/model/message/ResearcherUrl.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/ResearcherUrls.java b/src/main/java/org/orcid/jaxb/model/message/ResearcherUrls.java index eb27e59..7a3216a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ResearcherUrls.java +++ b/src/main/java/org/orcid/jaxb/model/message/ResearcherUrls.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/RoleTitle.java b/src/main/java/org/orcid/jaxb/model/message/RoleTitle.java index c1dcfd1..7ae11be 100644 --- a/src/main/java/org/orcid/jaxb/model/message/RoleTitle.java +++ b/src/main/java/org/orcid/jaxb/model/message/RoleTitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/SalesforceId.java b/src/main/java/org/orcid/jaxb/model/message/SalesforceId.java index bad4aaa..e172650 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SalesforceId.java +++ b/src/main/java/org/orcid/jaxb/model/message/SalesforceId.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Scope.java b/src/main/java/org/orcid/jaxb/model/message/Scope.java index 9dee0ec..55612ce 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Scope.java +++ b/src/main/java/org/orcid/jaxb/model/message/Scope.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/ScopePath.java b/src/main/java/org/orcid/jaxb/model/message/ScopePath.java index e3999cb..3ef7bd1 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ScopePath.java +++ b/src/main/java/org/orcid/jaxb/model/message/ScopePath.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/ScopePathType.java b/src/main/java/org/orcid/jaxb/model/message/ScopePathType.java index ead1202..b2c6c55 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ScopePathType.java +++ b/src/main/java/org/orcid/jaxb/model/message/ScopePathType.java @@ -15,9 +15,9 @@ import java.util.Map; import java.util.Set; -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; /** * Java class for scope-path-type. diff --git a/src/main/java/org/orcid/jaxb/model/message/ScopePaths.java b/src/main/java/org/orcid/jaxb/model/message/ScopePaths.java index 2067b65..5921fd2 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ScopePaths.java +++ b/src/main/java/org/orcid/jaxb/model/message/ScopePaths.java @@ -10,11 +10,11 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/SecurityDetails.java b/src/main/java/org/orcid/jaxb/model/message/SecurityDetails.java index d208925..3ad869e 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SecurityDetails.java +++ b/src/main/java/org/orcid/jaxb/model/message/SecurityDetails.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/SendAdministrativeChangeNotifications.java b/src/main/java/org/orcid/jaxb/model/message/SendAdministrativeChangeNotifications.java index 7e5a0c5..adc53cd 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SendAdministrativeChangeNotifications.java +++ b/src/main/java/org/orcid/jaxb/model/message/SendAdministrativeChangeNotifications.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/SendChangeNotifications.java b/src/main/java/org/orcid/jaxb/model/message/SendChangeNotifications.java index 6f8d202..9d5c23f 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SendChangeNotifications.java +++ b/src/main/java/org/orcid/jaxb/model/message/SendChangeNotifications.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/SendOrcidNews.java b/src/main/java/org/orcid/jaxb/model/message/SendOrcidNews.java index 6a4b3d2..eba9646 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SendOrcidNews.java +++ b/src/main/java/org/orcid/jaxb/model/message/SendOrcidNews.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/SequenceType.java b/src/main/java/org/orcid/jaxb/model/message/SequenceType.java index 50ac2cc..6b200c2 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SequenceType.java +++ b/src/main/java/org/orcid/jaxb/model/message/SequenceType.java @@ -1,8 +1,8 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/ShortDescription.java b/src/main/java/org/orcid/jaxb/model/message/ShortDescription.java index f963e64..6ec6f4b 100644 --- a/src/main/java/org/orcid/jaxb/model/message/ShortDescription.java +++ b/src/main/java/org/orcid/jaxb/model/message/ShortDescription.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Source.java b/src/main/java/org/orcid/jaxb/model/message/Source.java index f4bcb1e..9bbffcf 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Source.java +++ b/src/main/java/org/orcid/jaxb/model/message/Source.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/SourceClientId.java b/src/main/java/org/orcid/jaxb/model/message/SourceClientId.java index 021b6cd..4eac206 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SourceClientId.java +++ b/src/main/java/org/orcid/jaxb/model/message/SourceClientId.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "source-client-id") public class SourceClientId extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/SourceDate.java b/src/main/java/org/orcid/jaxb/model/message/SourceDate.java index c039ccd..1d24f1a 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SourceDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/SourceDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/SourceName.java b/src/main/java/org/orcid/jaxb/model/message/SourceName.java index 50ff017..61aae29 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SourceName.java +++ b/src/main/java/org/orcid/jaxb/model/message/SourceName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/SourceOrcid.java b/src/main/java/org/orcid/jaxb/model/message/SourceOrcid.java index 53c36e1..4ce1bd9 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SourceOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/message/SourceOrcid.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "source-orcid") public class SourceOrcid extends OrcidIdBase implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/message/SourceReference.java b/src/main/java/org/orcid/jaxb/model/message/SourceReference.java index eaa9ea8..a1e1f45 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SourceReference.java +++ b/src/main/java/org/orcid/jaxb/model/message/SourceReference.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/SubmissionDate.java b/src/main/java/org/orcid/jaxb/model/message/SubmissionDate.java index 6b6892b..8a3bcf3 100644 --- a/src/main/java/org/orcid/jaxb/model/message/SubmissionDate.java +++ b/src/main/java/org/orcid/jaxb/model/message/SubmissionDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; diff --git a/src/main/java/org/orcid/jaxb/model/message/Subtitle.java b/src/main/java/org/orcid/jaxb/model/message/Subtitle.java index 3d50666..2b8144c 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Subtitle.java +++ b/src/main/java/org/orcid/jaxb/model/message/Subtitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Title.java b/src/main/java/org/orcid/jaxb/model/message/Title.java index 1882a8f..595fc09 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Title.java +++ b/src/main/java/org/orcid/jaxb/model/message/Title.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/TranslatedTitle.java b/src/main/java/org/orcid/jaxb/model/message/TranslatedTitle.java index 5ae5132..c7e7481 100644 --- a/src/main/java/org/orcid/jaxb/model/message/TranslatedTitle.java +++ b/src/main/java/org/orcid/jaxb/model/message/TranslatedTitle.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/message/Url.java b/src/main/java/org/orcid/jaxb/model/message/Url.java index 0a9d44d..a55f765 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Url.java +++ b/src/main/java/org/orcid/jaxb/model/message/Url.java @@ -9,12 +9,12 @@ import org.apache.commons.lang.StringUtils; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/UrlName.java b/src/main/java/org/orcid/jaxb/model/message/UrlName.java index 4e3473e..36d03cb 100644 --- a/src/main/java/org/orcid/jaxb/model/message/UrlName.java +++ b/src/main/java/org/orcid/jaxb/model/message/UrlName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/VerifiedEmail.java b/src/main/java/org/orcid/jaxb/model/message/VerifiedEmail.java index 2917802..7385e7d 100644 --- a/src/main/java/org/orcid/jaxb/model/message/VerifiedEmail.java +++ b/src/main/java/org/orcid/jaxb/model/message/VerifiedEmail.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/VerifiedPrimaryEmail.java b/src/main/java/org/orcid/jaxb/model/message/VerifiedPrimaryEmail.java index 6bd11af..de41efd 100644 --- a/src/main/java/org/orcid/jaxb/model/message/VerifiedPrimaryEmail.java +++ b/src/main/java/org/orcid/jaxb/model/message/VerifiedPrimaryEmail.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/Visibility.java b/src/main/java/org/orcid/jaxb/model/message/Visibility.java index 9ea5fcb..bbfd809 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Visibility.java +++ b/src/main/java/org/orcid/jaxb/model/message/Visibility.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/Work.java b/src/main/java/org/orcid/jaxb/model/message/Work.java index c975fe6..7c42eb7 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Work.java +++ b/src/main/java/org/orcid/jaxb/model/message/Work.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkCategory.java b/src/main/java/org/orcid/jaxb/model/message/WorkCategory.java index c57cc73..e9b8955 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkCategory.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkCategory.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkContributors.java b/src/main/java/org/orcid/jaxb/model/message/WorkContributors.java index a87134a..1a6bd9c 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkContributors.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkContributors.java @@ -10,10 +10,10 @@ import java.io.Serializable; 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.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifier.java b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifier.java index 9c53b6a..f91bea0 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifier.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierId.java b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierId.java index 0ffcafd..62df619 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierId.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierId.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierType.java b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierType.java index 2867cb9..4ddc8d8 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierType.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifierType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.message; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifiers.java b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifiers.java index c982c00..cd994af 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifiers.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkExternalIdentifiers.java @@ -11,12 +11,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; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkSource.java b/src/main/java/org/orcid/jaxb/model/message/WorkSource.java index 10e23dd..be0d841 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkSource.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkSource.java @@ -9,8 +9,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; @Deprecated @XmlRootElement(name = "work-source") diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkTitle.java b/src/main/java/org/orcid/jaxb/model/message/WorkTitle.java index 9d114bc..85fd194 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkTitle.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkTitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -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; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkType.java b/src/main/java/org/orcid/jaxb/model/message/WorkType.java index f32b559..e23e608 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkType.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkType.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.Lists; diff --git a/src/main/java/org/orcid/jaxb/model/message/WorkVisibilityDefault.java b/src/main/java/org/orcid/jaxb/model/message/WorkVisibilityDefault.java index c16359c..8b33412 100644 --- a/src/main/java/org/orcid/jaxb/model/message/WorkVisibilityDefault.java +++ b/src/main/java/org/orcid/jaxb/model/message/WorkVisibilityDefault.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.message; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * Java class for anonymous complex type. diff --git a/src/main/java/org/orcid/jaxb/model/message/Year.java b/src/main/java/org/orcid/jaxb/model/message/Year.java index 4b2417b..6863ce2 100644 --- a/src/main/java/org/orcid/jaxb/model/message/Year.java +++ b/src/main/java/org/orcid/jaxb/model/message/Year.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.message; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/message/package-info.java b/src/main/java/org/orcid/jaxb/model/message/package-info.java index a203baf..071c62b 100644 --- a/src/main/java/org/orcid/jaxb/model/message/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/message/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2012.08.09 at 01:52:56 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/orcid", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/orcid", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.message; diff --git a/src/main/java/org/orcid/jaxb/model/notification/amended_v2/AmendedSection.java b/src/main/java/org/orcid/jaxb/model/notification/amended_v2/AmendedSection.java index 3f2aa3a..f6b2c29 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/amended_v2/AmendedSection.java +++ b/src/main/java/org/orcid/jaxb/model/notification/amended_v2/AmendedSection.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.notification.amended_v2; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; /** * diff --git a/src/main/java/org/orcid/jaxb/model/notification/amended_v2/NotificationAmended.java b/src/main/java/org/orcid/jaxb/model/notification/amended_v2/NotificationAmended.java index 341cee5..dd5d2a6 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/amended_v2/NotificationAmended.java +++ b/src/main/java/org/orcid/jaxb/model/notification/amended_v2/NotificationAmended.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.notification.amended_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.notification.permission_v2.Items; import org.orcid.jaxb.model.notification_v2.Notification; diff --git a/src/main/java/org/orcid/jaxb/model/notification/custom_v2/NotificationCustom.java b/src/main/java/org/orcid/jaxb/model/notification/custom_v2/NotificationCustom.java index c7cd53f..646a3b1 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/custom_v2/NotificationCustom.java +++ b/src/main/java/org/orcid/jaxb/model/notification/custom_v2/NotificationCustom.java @@ -9,13 +9,13 @@ import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.notification_v2.Notification; import org.orcid.jaxb.model.notification_v2.NotificationType; diff --git a/src/main/java/org/orcid/jaxb/model/notification/custom_v2/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/notification/custom_v2/ObjectFactory.java index ffa9b24..0b05f5c 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/custom_v2/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/notification/custom_v2/ObjectFactory.java @@ -7,7 +7,7 @@ package org.orcid.jaxb.model.notification.custom_v2; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each Java content interface and Java diff --git a/src/main/java/org/orcid/jaxb/model/notification/custom_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/notification/custom_v2/package-info.java index 05a371b..28fadb1 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/custom_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/notification/custom_v2/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @javax.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @jakarta.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}) package org.orcid.jaxb.model.notification.custom_v2; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/AuthorizationUrl.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/AuthorizationUrl.java index fccb565..4a37848 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/AuthorizationUrl.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/AuthorizationUrl.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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.XmlSchemaType; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Item.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Item.java index ea5825b..1f903c3 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Item.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Item.java @@ -11,13 +11,13 @@ import java.util.HashMap; import java.util.Map; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.common.ActionType; import org.orcid.jaxb.model.record_v2.ExternalID; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ItemType.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ItemType.java index e344e3e..7be23c5 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ItemType.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ItemType.java @@ -1,7 +1,7 @@ package org.orcid.jaxb.model.notification.permission_v2; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Items.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Items.java index 23ac630..4c48b72 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Items.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/Items.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermission.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermission.java index 454d6f3..3adcff4 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermission.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermission.java @@ -7,13 +7,13 @@ package org.orcid.jaxb.model.notification.permission_v2; -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.XmlSchemaType; -import javax.xml.bind.annotation.XmlTransient; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; import org.orcid.jaxb.model.notification_v2.Notification; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermissions.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermissions.java index 23ce19b..f7ed678 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermissions.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/NotificationPermissions.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.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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ObjectFactory.java index e952c6a..6bd29d4 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/ObjectFactory.java @@ -7,7 +7,7 @@ package org.orcid.jaxb.model.notification.permission_v2; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each Java content interface and Java diff --git a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/package-info.java index 52f7479..4d840e9 100644 --- a/src/main/java/org/orcid/jaxb/model/notification/permission_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/notification/permission_v2/package-info.java @@ -5,9 +5,9 @@ // Generated on: 2014.11.24 at 04:27:39 PM GMT // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), - @javax.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), }) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), }) package org.orcid.jaxb.model.notification.permission_v2; diff --git a/src/main/java/org/orcid/jaxb/model/notification_v2/Notification.java b/src/main/java/org/orcid/jaxb/model/notification_v2/Notification.java index 0a9eb63..4d3eecf 100644 --- a/src/main/java/org/orcid/jaxb/model/notification_v2/Notification.java +++ b/src/main/java/org/orcid/jaxb/model/notification_v2/Notification.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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.XmlTransient; +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.XmlTransient; import javax.xml.datatype.XMLGregorianCalendar; import org.orcid.jaxb.model.common_v2.Source; diff --git a/src/main/java/org/orcid/jaxb/model/notification_v2/NotificationType.java b/src/main/java/org/orcid/jaxb/model/notification_v2/NotificationType.java index 4a4b080..7ce9a82 100644 --- a/src/main/java/org/orcid/jaxb/model/notification_v2/NotificationType.java +++ b/src/main/java/org/orcid/jaxb/model/notification_v2/NotificationType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.notification_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/notification_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/notification_v2/package-info.java index 284e0b6..13d0649 100644 --- a/src/main/java/org/orcid/jaxb/model/notification_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/notification_v2/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), }) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), }) package org.orcid.jaxb.model.notification_v2; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/ActivitiesSummary.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/ActivitiesSummary.java index 2df58cd..f48b1fa 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/ActivitiesSummary.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/ActivitiesSummary.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.ActivitiesContainer; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/EducationSummary.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/EducationSummary.java index 08e467f..c53ec88 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/EducationSummary.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/EducationSummary.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Educations.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Educations.java index 9ff146e..3787f84 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Educations.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Educations.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record.summary_v2.EducationSummary; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/EmploymentSummary.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/EmploymentSummary.java index 1c0ad99..5fa85cd 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/EmploymentSummary.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/EmploymentSummary.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.FuzzyDate; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Employments.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Employments.java index 9020a68..64b8e2f 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Employments.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Employments.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record.summary_v2.EmploymentSummary; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingGroup.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingGroup.java index 7a9f608..b202425 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingGroup.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingGroup.java @@ -5,11 +5,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingSummary.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingSummary.java index 90ce35e..4450c78 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingSummary.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/FundingSummary.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.FuzzyDate; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Fundings.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Fundings.java index 4324b9d..5cb3d1d 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Fundings.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Fundings.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.Group; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewGroup.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewGroup.java index 451296a..3e93bec 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewGroup.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewGroup.java @@ -5,11 +5,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewSummary.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewSummary.java index e24a363..38ba827 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewSummary.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviewSummary.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviews.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviews.java index 91a28d7..458eda0 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviews.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/PeerReviews.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.Group; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkGroup.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkGroup.java index 94470dc..11abfd8 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkGroup.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkGroup.java @@ -12,11 +12,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkSummary.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkSummary.java index 6de7d1c..22b5909 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkSummary.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/WorkSummary.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Works.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Works.java index 56fa057..fa1ca3b 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/Works.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/Works.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record_v2.Group; diff --git a/src/main/java/org/orcid/jaxb/model/record/summary_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/record/summary_v2/package-info.java index 6e9f8b2..1d87d3c 100644 --- a/src/main/java/org/orcid/jaxb/model/record/summary_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/record/summary_v2/package-info.java @@ -5,14 +5,14 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/activities", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), - @javax.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), - @javax.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), - @javax.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), - @javax.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), - @javax.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/activities", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.record.summary_v2; diff --git a/src/main/java/org/orcid/jaxb/model/record/util/RecordUtil.java b/src/main/java/org/orcid/jaxb/model/record/util/RecordUtil.java index b9eac1e..7145981 100644 --- a/src/main/java/org/orcid/jaxb/model/record/util/RecordUtil.java +++ b/src/main/java/org/orcid/jaxb/model/record/util/RecordUtil.java @@ -2,9 +2,9 @@ import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; public class RecordUtil { diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Address.java b/src/main/java/org/orcid/jaxb/model/record_v2/Address.java index 7063ca0..ae1e2e4 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Address.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Address.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.Country; import org.orcid.jaxb.model.common_v2.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Addresses.java b/src/main/java/org/orcid/jaxb/model/record_v2/Addresses.java index a5cbabe..671b49d 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Addresses.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Addresses.java @@ -4,12 +4,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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/AffiliationType.java b/src/main/java/org/orcid/jaxb/model/record_v2/AffiliationType.java index 5768801..7d64882 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/AffiliationType.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/AffiliationType.java @@ -2,9 +2,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Biography.java b/src/main/java/org/orcid/jaxb/model/record_v2/Biography.java index 3eda383..b364b9f 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Biography.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Biography.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Citation.java b/src/main/java/org/orcid/jaxb/model/record_v2/Citation.java index 171bb3b..8bb24a4 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Citation.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Citation.java @@ -9,10 +9,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/CitationType.java b/src/main/java/org/orcid/jaxb/model/record_v2/CitationType.java index 24e532a..85de6b9 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/CitationType.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/CitationType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.record_v2; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/City.java b/src/main/java/org/orcid/jaxb/model/record_v2/City.java index 281b234..dec9452 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/City.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/City.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.Visibility; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/CompletionDate.java b/src/main/java/org/orcid/jaxb/model/record_v2/CompletionDate.java index 9490abc..97a8a71 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/CompletionDate.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/CompletionDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/CreditName.java b/src/main/java/org/orcid/jaxb/model/record_v2/CreditName.java index 64811ad..d1f6e29 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/CreditName.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/CreditName.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/DeactivationDate.java b/src/main/java/org/orcid/jaxb/model/record_v2/DeactivationDate.java index 66846be..8725f1e 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/DeactivationDate.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/DeactivationDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Deprecated.java b/src/main/java/org/orcid/jaxb/model/record_v2/Deprecated.java index 18b90ed..70a849b 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Deprecated.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Deprecated.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/DeprecatedDate.java b/src/main/java/org/orcid/jaxb/model/record_v2/DeprecatedDate.java index 0461b67..a57282a 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/DeprecatedDate.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/DeprecatedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Education.java b/src/main/java/org/orcid/jaxb/model/record_v2/Education.java index 4141ff4..1b2d6bd 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Education.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Education.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Educations.java b/src/main/java/org/orcid/jaxb/model/record_v2/Educations.java index 494067c..2640ab3 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Educations.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Educations.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Email.java b/src/main/java/org/orcid/jaxb/model/record_v2/Email.java index cc3757a..330de28 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Email.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Email.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Emails.java b/src/main/java/org/orcid/jaxb/model/record_v2/Emails.java index 157ab1e..e3ff39d 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Emails.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Emails.java @@ -4,12 +4,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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Employment.java b/src/main/java/org/orcid/jaxb/model/record_v2/Employment.java index 6f6b059..9f219c3 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Employment.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Employment.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Employments.java b/src/main/java/org/orcid/jaxb/model/record_v2/Employments.java index cb5c55d..704a239 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Employments.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Employments.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/ExternalID.java b/src/main/java/org/orcid/jaxb/model/record_v2/ExternalID.java index 1de68d9..a87892e 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/ExternalID.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/ExternalID.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import org.orcid.jaxb.model.common_v2.Url; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/ExternalIDs.java b/src/main/java/org/orcid/jaxb/model/record_v2/ExternalIDs.java index 53f068f..04dff1a 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/ExternalIDs.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/ExternalIDs.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.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; import org.orcid.jaxb.model.message.WorkExternalIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FamilyName.java b/src/main/java/org/orcid/jaxb/model/record_v2/FamilyName.java index beaa44f..4bd78a0 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FamilyName.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FamilyName.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Funding.java b/src/main/java/org/orcid/jaxb/model/record_v2/Funding.java index e230ef6..6aa1c19 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Funding.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Funding.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.Amount; import org.orcid.jaxb.model.common_v2.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributor.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributor.java index ae26412..ea34f46 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributor.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributor.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.record_v2; -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; import org.orcid.jaxb.model.common_v2.ContributorAttributes; import org.orcid.jaxb.model.common_v2.ContributorEmail; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorAttributes.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorAttributes.java index 211abe1..7a42783 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorAttributes.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorAttributes.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.record_v2; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorRole.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorRole.java index 23104e0..cf55231 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorRole.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributorRole.java @@ -2,9 +2,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributors.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributors.java index 160491e..8fce5b6 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributors.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingContributors.java @@ -11,11 +11,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; import org.orcid.jaxb.model.common_v2.Contributor; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingList.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingList.java index 138eba1..fc53c52 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingList.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingList.java @@ -14,11 +14,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingTitle.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingTitle.java index 2eb7416..811613d 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingTitle.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingTitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.record_v2; -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; import org.orcid.jaxb.model.common_v2.Title; import org.orcid.jaxb.model.common_v2.TranslatedTitle; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/FundingType.java b/src/main/java/org/orcid/jaxb/model/record_v2/FundingType.java index c9d541c..a5846ad 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/FundingType.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/FundingType.java @@ -9,9 +9,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/GivenNames.java b/src/main/java/org/orcid/jaxb/model/record_v2/GivenNames.java index e36934a..e0d8fd2 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/GivenNames.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/GivenNames.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/GroupOrcid.java b/src/main/java/org/orcid/jaxb/model/record_v2/GroupOrcid.java index 655bfac..59d93d7 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/GroupOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/GroupOrcid.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.orcid.jaxb.model.common_v2.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/History.java b/src/main/java/org/orcid/jaxb/model/record_v2/History.java index 146115b..c4650af 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/History.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/History.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.common_v2.Source; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Keyword.java b/src/main/java/org/orcid/jaxb/model/record_v2/Keyword.java index 7909ee1..89568c0 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Keyword.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Keyword.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Keywords.java b/src/main/java/org/orcid/jaxb/model/record_v2/Keywords.java index 3dacedd..8779aa9 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Keywords.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Keywords.java @@ -4,12 +4,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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Name.java b/src/main/java/org/orcid/jaxb/model/record_v2/Name.java index d674c99..c6f80e7 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Name.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Name.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.CreditName; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/OrcidId.java b/src/main/java/org/orcid/jaxb/model/record_v2/OrcidId.java index 6b1e45d..c0c14d7 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/OrcidId.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/OrcidId.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/OrcidIds.java b/src/main/java/org/orcid/jaxb/model/record_v2/OrcidIds.java index 73433e4..b3b2b91 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/OrcidIds.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/OrcidIds.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.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; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(propOrder = { "orcidIds" }) diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/OtherName.java b/src/main/java/org/orcid/jaxb/model/record_v2/OtherName.java index d5d8c44..3c4961d 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/OtherName.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/OtherName.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/OtherNames.java b/src/main/java/org/orcid/jaxb/model/record_v2/OtherNames.java index cd20b24..a13a255 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/OtherNames.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/OtherNames.java @@ -4,12 +4,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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/PeerReview.java b/src/main/java/org/orcid/jaxb/model/record_v2/PeerReview.java index 35cf73b..0a9d09a 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/PeerReview.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/PeerReview.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/PeerReviewType.java b/src/main/java/org/orcid/jaxb/model/record_v2/PeerReviewType.java index 16d3cd7..55b6f8f 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/PeerReviewType.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/PeerReviewType.java @@ -2,9 +2,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Person.java b/src/main/java/org/orcid/jaxb/model/record_v2/Person.java index 19ffc4b..a8e829c 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Person.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Person.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifier.java b/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifier.java index 8a47e15..dd918c1 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifier.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifiers.java b/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifiers.java index 2262830..b36695c 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifiers.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/PersonExternalIdentifiers.java @@ -4,12 +4,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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/PersonalDetails.java b/src/main/java/org/orcid/jaxb/model/record_v2/PersonalDetails.java index 4b55203..a987f11 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/PersonalDetails.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/PersonalDetails.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; import org.orcid.jaxb.model.record.util.RecordUtil; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Preferences.java b/src/main/java/org/orcid/jaxb/model/record_v2/Preferences.java index 19d5472..c8c0438 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Preferences.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Preferences.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.Locale; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/PrimaryRecord.java b/src/main/java/org/orcid/jaxb/model/record_v2/PrimaryRecord.java index 8d527f2..61b6e0f 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/PrimaryRecord.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/PrimaryRecord.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Record.java b/src/main/java/org/orcid/jaxb/model/record_v2/Record.java index acceaf5..feb534c 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Record.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Record.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.common_v2.OrcidIdentifier; import org.orcid.jaxb.model.common_v2.OrcidType; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Region.java b/src/main/java/org/orcid/jaxb/model/record_v2/Region.java index b99156c..43e5326 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Region.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Region.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.record_v2; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Relationship.java b/src/main/java/org/orcid/jaxb/model/record_v2/Relationship.java index 3d70588..e0a8c6c 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Relationship.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Relationship.java @@ -9,9 +9,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrl.java b/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrl.java index 613404e..9a2d26e 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrl.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrl.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.CreatedDate; import org.orcid.jaxb.model.common_v2.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrls.java b/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrls.java index a1f42c9..1a2d320 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrls.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/ResearcherUrls.java @@ -4,12 +4,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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Role.java b/src/main/java/org/orcid/jaxb/model/record_v2/Role.java index fbfcf47..890e267 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Role.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Role.java @@ -2,9 +2,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/SequenceType.java b/src/main/java/org/orcid/jaxb/model/record_v2/SequenceType.java index fdcdf85..f98ae37 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/SequenceType.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/SequenceType.java @@ -2,9 +2,9 @@ import java.io.Serializable; -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; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/SourceReference.java b/src/main/java/org/orcid/jaxb/model/record_v2/SourceReference.java index 50e1bb1..7618384 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/SourceReference.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/SourceReference.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Subject.java b/src/main/java/org/orcid/jaxb/model/record_v2/Subject.java index 572a94b..c1d3a32 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Subject.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Subject.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common_v2.Title; import org.orcid.jaxb.model.common_v2.Url; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/SubmissionDate.java b/src/main/java/org/orcid/jaxb/model/record_v2/SubmissionDate.java index fcf6377..6589d33 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/SubmissionDate.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/SubmissionDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.record_v2; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Work.java b/src/main/java/org/orcid/jaxb/model/record_v2/Work.java index fcad984..30a6e2a 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Work.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Work.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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; import org.orcid.jaxb.model.common_v2.Country; import org.orcid.jaxb.model.common_v2.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/WorkBulk.java b/src/main/java/org/orcid/jaxb/model/record_v2/WorkBulk.java index 2aeefde..2fc7778 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/WorkBulk.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/WorkBulk.java @@ -4,12 +4,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.XmlElement; -import javax.xml.bind.annotation.XmlElements; -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.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.error_v2.OrcidError; import org.orcid.jaxb.model.record.bulk.BulkElementContainer; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/WorkCategory.java b/src/main/java/org/orcid/jaxb/model/record_v2/WorkCategory.java index 896b028..4e4deec 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/WorkCategory.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/WorkCategory.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/WorkContributors.java b/src/main/java/org/orcid/jaxb/model/record_v2/WorkContributors.java index c63572a..97567bb 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/WorkContributors.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/WorkContributors.java @@ -11,11 +11,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; import org.orcid.jaxb.model.common_v2.Contributor; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/WorkSource.java b/src/main/java/org/orcid/jaxb/model/record_v2/WorkSource.java index 560c477..fa491f0 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/WorkSource.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/WorkSource.java @@ -3,8 +3,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.orcid.jaxb.model.common_v2.OrcidIdBase; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/WorkTitle.java b/src/main/java/org/orcid/jaxb/model/record_v2/WorkTitle.java index 9803bab..d0acd87 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/WorkTitle.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/WorkTitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.record_v2; -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; import org.orcid.jaxb.model.common_v2.Subtitle; import org.orcid.jaxb.model.common_v2.Title; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/WorkType.java b/src/main/java/org/orcid/jaxb/model/record_v2/WorkType.java index c9023f8..3b16565 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/WorkType.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/WorkType.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/Works.java b/src/main/java/org/orcid/jaxb/model/record_v2/Works.java index 9b78540..a94d995 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/Works.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/Works.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.common_v2.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/record_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/record_v2/package-info.java index 60c768d..b526178 100644 --- a/src/main/java/org/orcid/jaxb/model/record_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/record_v2/package-info.java @@ -5,29 +5,29 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/record", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), - @javax.xml.bind.annotation.XmlNs(prefix = "address", namespaceURI = "http://www.orcid.org/ns/address"), - @javax.xml.bind.annotation.XmlNs(prefix = "bulk", namespaceURI = "http://www.orcid.org/ns/bulk"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), - @javax.xml.bind.annotation.XmlNs(prefix = "deprecated", namespaceURI = "http://www.orcid.org/ns/deprecated"), - @javax.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), - @javax.xml.bind.annotation.XmlNs(prefix = "email", namespaceURI = "http://www.orcid.org/ns/email"), - @javax.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), - @javax.xml.bind.annotation.XmlNs(prefix = "error", namespaceURI = "http://www.orcid.org/ns/error"), - @javax.xml.bind.annotation.XmlNs(prefix = "external-identifier", namespaceURI = "http://www.orcid.org/ns/external-identifier"), - @javax.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), - @javax.xml.bind.annotation.XmlNs(prefix = "history", namespaceURI = "http://www.orcid.org/ns/history"), - @javax.xml.bind.annotation.XmlNs(prefix = "internal", namespaceURI = "http://www.orcid.org/ns/internal"), - @javax.xml.bind.annotation.XmlNs(prefix = "keyword", namespaceURI = "http://www.orcid.org/ns/keyword"), - @javax.xml.bind.annotation.XmlNs(prefix = "other-name", namespaceURI = "http://www.orcid.org/ns/other-name"), - @javax.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), - @javax.xml.bind.annotation.XmlNs(prefix = "person", namespaceURI = "http://www.orcid.org/ns/person"), - @javax.xml.bind.annotation.XmlNs(prefix = "personal-details", namespaceURI = "http://www.orcid.org/ns/personal-details"), - @javax.xml.bind.annotation.XmlNs(prefix = "preferences", namespaceURI = "http://www.orcid.org/ns/preferences"), - @javax.xml.bind.annotation.XmlNs(prefix = "record", namespaceURI = "http://www.orcid.org/ns/record"), - @javax.xml.bind.annotation.XmlNs(prefix = "researcher-url", namespaceURI = "http://www.orcid.org/ns/researcher-url"), - @javax.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/record", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "address", namespaceURI = "http://www.orcid.org/ns/address"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "bulk", namespaceURI = "http://www.orcid.org/ns/bulk"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "deprecated", namespaceURI = "http://www.orcid.org/ns/deprecated"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "email", namespaceURI = "http://www.orcid.org/ns/email"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "error", namespaceURI = "http://www.orcid.org/ns/error"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "external-identifier", namespaceURI = "http://www.orcid.org/ns/external-identifier"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "history", namespaceURI = "http://www.orcid.org/ns/history"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "internal", namespaceURI = "http://www.orcid.org/ns/internal"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "keyword", namespaceURI = "http://www.orcid.org/ns/keyword"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "other-name", namespaceURI = "http://www.orcid.org/ns/other-name"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "person", namespaceURI = "http://www.orcid.org/ns/person"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "personal-details", namespaceURI = "http://www.orcid.org/ns/personal-details"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "preferences", namespaceURI = "http://www.orcid.org/ns/preferences"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "record", namespaceURI = "http://www.orcid.org/ns/record"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "researcher-url", namespaceURI = "http://www.orcid.org/ns/researcher-url"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.record_v2; diff --git a/src/main/java/org/orcid/jaxb/model/search_v2/Result.java b/src/main/java/org/orcid/jaxb/model/search_v2/Result.java index c51051e..091ca5f 100644 --- a/src/main/java/org/orcid/jaxb/model/search_v2/Result.java +++ b/src/main/java/org/orcid/jaxb/model/search_v2/Result.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import org.orcid.jaxb.model.common_v2.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/search_v2/Search.java b/src/main/java/org/orcid/jaxb/model/search_v2/Search.java index 54eb7ca..05d64eb 100644 --- a/src/main/java/org/orcid/jaxb/model/search_v2/Search.java +++ b/src/main/java/org/orcid/jaxb/model/search_v2/Search.java @@ -4,12 +4,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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/search_v2/package-info.java b/src/main/java/org/orcid/jaxb/model/search_v2/package-info.java index f9b880d..15d0a5b 100644 --- a/src/main/java/org/orcid/jaxb/model/search_v2/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/search_v2/package-info.java @@ -5,9 +5,9 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/search", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), - @javax.xml.bind.annotation.XmlNs(prefix = "search", namespaceURI = "http://www.orcid.org/ns/search")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/search", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "search", namespaceURI = "http://www.orcid.org/ns/search")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.search_v2; diff --git a/src/main/java/org/orcid/jaxb/model/statistics/StatisticsSummary.java b/src/main/java/org/orcid/jaxb/model/statistics/StatisticsSummary.java index 38fc07f..24fdd2c 100644 --- a/src/main/java/org/orcid/jaxb/model/statistics/StatisticsSummary.java +++ b/src/main/java/org/orcid/jaxb/model/statistics/StatisticsSummary.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.Map; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/org/orcid/jaxb/model/statistics/StatisticsTimeline.java b/src/main/java/org/orcid/jaxb/model/statistics/StatisticsTimeline.java index 3dd5fd6..dd1f5e8 100644 --- a/src/main/java/org/orcid/jaxb/model/statistics/StatisticsTimeline.java +++ b/src/main/java/org/orcid/jaxb/model/statistics/StatisticsTimeline.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.util.Map; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Represents a timeline of statistics. diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/client/ClientSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/client/ClientSummary.java index af13f3b..5d93a47 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/client/ClientSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/client/ClientSummary.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(propOrder = { "name", "description" }) diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Amount.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Amount.java index bf940ec..e16fca1 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Amount.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Amount.java @@ -3,13 +3,13 @@ import java.io.Serializable; import java.util.Currency; -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 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.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.commons.lang.StringUtils; import org.orcid.jaxb.model.common.adapters.CurrencyAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Contributor.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Contributor.java index 98fe0da..2e7ba57 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Contributor.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Contributor.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorAttributes.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorAttributes.java index 8e9f989..eb147ed 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorAttributes.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorAttributes.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +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; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.SequenceType; import org.orcid.jaxb.model.common.adapters.SequenceTypeAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorEmail.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorEmail.java index 0529635..bca9d4d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorEmail.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorEmail.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorOrcid.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorOrcid.java index 5217382..1c788fe 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/ContributorOrcid.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Country.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Country.java index 72c06c0..4762b6e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Country.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Country.java @@ -9,12 +9,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.Iso3166Country; import org.orcid.jaxb.model.common.adapters.Iso3166CountryAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/CreatedDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/CreatedDate.java index 460bdd1..edee296 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/CreatedDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/CreatedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/CreditName.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/CreditName.java index e61dc70..c466367 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/CreditName.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/CreditName.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Day.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Day.java index d207bfa..ecf668b 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Day.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Day.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/DisambiguatedOrganization.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/DisambiguatedOrganization.java index 2a8df4b..df05246 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/DisambiguatedOrganization.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/DisambiguatedOrganization.java @@ -10,12 +10,12 @@ import java.io.Serializable; 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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.common_v2.DisambiguatedOrganizationExternalIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/FuzzyDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/FuzzyDate.java index cf47670..13231d5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/FuzzyDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/FuzzyDate.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/LastModifiedDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/LastModifiedDate.java index 7b5aa5d..333a0eb 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/LastModifiedDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/LastModifiedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Month.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Month.java index 74131a6..3e2232f 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Month.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Month.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdBase.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdBase.java index 48ae613..0990a96 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdBase.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdBase.java @@ -18,10 +18,10 @@ */ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdentifier.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdentifier.java index 2934d2d..f95a1f1 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrcidIdentifier.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Organization.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Organization.java index 17d13d6..a7dc59b 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Organization.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Organization.java @@ -8,11 +8,11 @@ package org.orcid.jaxb.model.v3.release.common; import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationAddress.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationAddress.java index e5dc67c..79d4a4b 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationAddress.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationAddress.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +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; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.Iso3166Country; import org.orcid.jaxb.model.common.adapters.Iso3166CountryAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationDefinedFundingSubType.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationDefinedFundingSubType.java index dbf5bad..5001922 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationDefinedFundingSubType.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/OrganizationDefinedFundingSubType.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/PublicationDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/PublicationDate.java index 98c96c4..5fd7516 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/PublicationDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/PublicationDate.java @@ -9,10 +9,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Source.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Source.java index a073087..252ee12 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Source.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Source.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceClientId.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceClientId.java index ba64275..360233d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceClientId.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceClientId.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceName.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceName.java index 1cc769f..50282a8 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceName.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceName.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceOrcid.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceOrcid.java index 48f048a..d92dd02 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/SourceOrcid.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Subtitle.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Subtitle.java index 544c493..b7df7dc 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Subtitle.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Subtitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Title.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Title.java index 54ecd2c..13b29b8 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Title.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Title.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientError.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientError.java index 931554c..0fe76cb 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientError.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientError.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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.XmlValue; +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.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(propOrder = { "errorCode", "errorMessage"}) diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientNonEmptyString.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientNonEmptyString.java index 9cc90f4..03d17f2 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientNonEmptyString.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/TransientNonEmptyString.java @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; @XmlType public class TransientNonEmptyString implements Serializable { diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/TranslatedTitle.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/TranslatedTitle.java index dffe0db..468b53b 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/TranslatedTitle.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/TranslatedTitle.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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 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.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.commons.lang.StringUtils; import org.orcid.jaxb.model.common.LanguageCode; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Url.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Url.java index edb7f72..6859c21 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Url.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Url.java @@ -11,12 +11,12 @@ import io.swagger.v3.oas.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 java.io.Serializable; /** diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Visibility.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Visibility.java index 8e7017f..5b8b3e8 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Visibility.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Visibility.java @@ -9,9 +9,9 @@ import java.io.Serializable; -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; /** * Java class for visibility. diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/Year.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/Year.java index 5393b38..b0689af 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/Year.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/Year.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.common; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/common/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/common/package-info.java index cb54f48..7114dab 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/common/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/common/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/common", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/common", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.common; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/error/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/v3/release/error/ObjectFactory.java index 1682a09..d5dc2b6 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/error/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/error/ObjectFactory.java @@ -8,7 +8,7 @@ package org.orcid.jaxb.model.v3.release.error; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/error/OrcidError.java b/src/main/java/org/orcid/jaxb/model/v3/release/error/OrcidError.java index 71b842b..3caf1f6 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/error/OrcidError.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/error/OrcidError.java @@ -10,12 +10,12 @@ import java.io.Serializable; -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.XmlSchemaType; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.record.bulk.BulkElement; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/error/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/error/package-info.java index 35f6612..c894507 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/error/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/error/package-info.java @@ -5,5 +5,5 @@ // Generated on: 2015.01.09 at 01:28:54 PM GMT // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/error", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/error", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.error; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecord.java b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecord.java index 83ec7b9..e6d0311 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecord.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecord.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecords.java b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecords.java index dd98171..bb6554e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecords.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/GroupIdRecords.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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/ObjectFactory.java index 2fbb6e3..e31a0d7 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/ObjectFactory.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.v3.release.groupid; -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/src/main/java/org/orcid/jaxb/model/v3/release/groupid/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/package-info.java index 096f571..0ebe8ed 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/groupid/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/groupid/package-info.java @@ -5,9 +5,9 @@ // Generated on: 2012.04.18 at 12:45:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/group-id", xmlns={ - @javax.xml.bind.annotation.XmlNs(prefix = "group-id", namespaceURI = "http://www.orcid.org/ns/group-id"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/group-id", xmlns={ + @jakarta.xml.bind.annotation.XmlNs(prefix = "group-id", namespaceURI = "http://www.orcid.org/ns/group-id"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.groupid; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/Notification.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/Notification.java index b304ea3..b226c78 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/Notification.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/Notification.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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.XmlTransient; +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.XmlTransient; import javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/NotificationType.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/NotificationType.java index 5048581..b590b27 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/NotificationType.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/NotificationType.java @@ -7,9 +7,9 @@ package org.orcid.jaxb.model.v3.release.notification; -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; /** * Java class for null. diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/AmendedSection.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/AmendedSection.java index b294355..55735f0 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/AmendedSection.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/AmendedSection.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.v3.release.notification.amended; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; /** * diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/NotificationAmended.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/NotificationAmended.java index c10806d..48340a4 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/NotificationAmended.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/amended/NotificationAmended.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.v3.release.notification.amended; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.v3.release.notification.Notification; import org.orcid.jaxb.model.v3.release.notification.NotificationType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/NotificationCustom.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/NotificationCustom.java index 63410a1..53a3b47 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/NotificationCustom.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/NotificationCustom.java @@ -9,13 +9,13 @@ import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.v3.release.notification.Notification; import org.orcid.jaxb.model.v3.release.notification.NotificationType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/ObjectFactory.java index c5f69f7..015ce92 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/ObjectFactory.java @@ -7,7 +7,7 @@ package org.orcid.jaxb.model.v3.release.notification.custom; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each Java content interface and Java diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/package-info.java index a1bbb66..fe1167d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/custom/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @javax.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @jakarta.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"),}) package org.orcid.jaxb.model.v3.release.notification.custom; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/package-info.java index ff54f5d..13cb860 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/package-info.java @@ -5,6 +5,6 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), }) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), }) package org.orcid.jaxb.model.v3.release.notification; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/AuthorizationUrl.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/AuthorizationUrl.java index 019ed2a..25d0a33 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/AuthorizationUrl.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/AuthorizationUrl.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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.XmlSchemaType; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Item.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Item.java index 69ba2ee..440b3bb 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Item.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Item.java @@ -11,13 +11,13 @@ import java.util.HashMap; import java.util.Map; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.common.ActionType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ItemType.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ItemType.java index 5a0b5c0..6d5853a 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ItemType.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ItemType.java @@ -1,7 +1,7 @@ package org.orcid.jaxb.model.v3.release.notification.permission; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Items.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Items.java index b055de7..7fb40a8 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Items.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/Items.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import 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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermission.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermission.java index e3fe23c..3d97070 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermission.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermission.java @@ -7,13 +7,13 @@ package org.orcid.jaxb.model.v3.release.notification.permission; -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.XmlSchemaType; -import javax.xml.bind.annotation.XmlTransient; -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.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; import org.orcid.jaxb.model.v3.release.notification.Notification; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermissions.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermissions.java index 687a48d..74d97c2 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermissions.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/NotificationPermissions.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.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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ObjectFactory.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ObjectFactory.java index 198272f..4278eeb 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ObjectFactory.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/ObjectFactory.java @@ -7,7 +7,7 @@ package org.orcid.jaxb.model.v3.release.notification.permission; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each Java content interface and Java diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/package-info.java index 88ceb1e..69f1e37 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/notification/permission/package-info.java @@ -5,9 +5,9 @@ // Generated on: 2014.11.24 at 04:27:39 PM GMT // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), - @javax.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), }) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/notification", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "notification", namespaceURI = "http://www.orcid.org/ns/notification"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), }) package org.orcid.jaxb.model.v3.release.notification.permission; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Address.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Address.java index a40c87a..9031e5e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Address.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Address.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.v3.release.common.Country; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Addresses.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Addresses.java index 707828c..0a4e177 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Addresses.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Addresses.java @@ -4,12 +4,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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Affiliation.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Affiliation.java index 8ad7ece..7e15139 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Affiliation.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Affiliation.java @@ -1,10 +1,10 @@ package org.orcid.jaxb.model.v3.release.record; -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 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 io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.v3.release.common.CreatedDate; @@ -397,4 +397,4 @@ public boolean equals(Object obj) { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/AffiliationType.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/AffiliationType.java index 29dc25f..0a3a350 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/AffiliationType.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/AffiliationType.java @@ -2,9 +2,9 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Biography.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Biography.java index 202df9e..55ceb11 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Biography.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Biography.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Citation.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Citation.java index b6b073c..8f34cc5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Citation.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Citation.java @@ -9,8 +9,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.common.CitationType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/City.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/City.java index 62ae606..beacce8 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/City.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/City.java @@ -9,12 +9,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.Visibility; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/CompletionDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/CompletionDate.java index 5ad6fe5..63c0111 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/CompletionDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/CompletionDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.v3.release.record; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/CreditName.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/CreditName.java index 9ae2486..58e9507 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/CreditName.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/CreditName.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/DeactivationDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/DeactivationDate.java index 98d0c83..cf35bb2 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/DeactivationDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/DeactivationDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.v3.release.record; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Deprecated.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Deprecated.java index c7d4710..83b7073 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Deprecated.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Deprecated.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/DeprecatedDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/DeprecatedDate.java index 4cca5fb..7dec2c4 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/DeprecatedDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/DeprecatedDate.java @@ -7,12 +7,12 @@ package org.orcid.jaxb.model.v3.release.record; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Distinction.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Distinction.java index 697334c..b6fbed9 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Distinction.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Distinction.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Education.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Education.java index 062ab12..3812957 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Education.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Education.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Educations.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Educations.java index b3d29b1..343aba1 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Educations.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Educations.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Email.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Email.java index 67aa1ec..a979c96 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Email.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Email.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.Filterable; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Emails.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Emails.java index c3850fb..d927124 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Emails.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Emails.java @@ -4,12 +4,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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Employment.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Employment.java index 216b5c0..6b6c4d6 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Employment.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Employment.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Employments.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Employments.java index f8b196f..73378e5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Employments.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Employments.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalID.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalID.java index 1288651..4668004 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalID.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalID.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import io.swagger.v3.oas.annotations.media.Schema; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalIDs.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalIDs.java index a98eaef..7c32d4d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalIDs.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ExternalIDs.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.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; import org.orcid.jaxb.model.message.WorkExternalIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/FamilyName.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/FamilyName.java index e34a938..2708b4f 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/FamilyName.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/FamilyName.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Funding.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Funding.java index 8f80337..d273f4f 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Funding.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Funding.java @@ -9,13 +9,13 @@ import java.io.Serializable; -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.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.XmlJavaTypeAdapter; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.common.FundingType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributor.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributor.java index 106977d..4a41d3d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributor.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributor.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.ContributorEmail; import org.orcid.jaxb.model.v3.release.common.ContributorOrcid; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributorAttributes.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributorAttributes.java index 4f5804a..a663268 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributorAttributes.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributorAttributes.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributors.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributors.java index a65ea13..615750a 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributors.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingContributors.java @@ -11,11 +11,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; import org.orcid.jaxb.model.v3.release.common.Contributor; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingList.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingList.java index 4dc0f8a..4fae614 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingList.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingList.java @@ -14,11 +14,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingTitle.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingTitle.java index 7d715b4..d9db5c5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingTitle.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/FundingTitle.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.record; -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; import org.orcid.jaxb.model.v3.release.common.Title; import org.orcid.jaxb.model.v3.release.common.TranslatedTitle; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/GivenNames.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/GivenNames.java index 76dd59d..a171a52 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/GivenNames.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/GivenNames.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/GroupOrcid.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/GroupOrcid.java index fe0fa71..54d6765 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/GroupOrcid.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/GroupOrcid.java @@ -1,6 +1,6 @@ package org.orcid.jaxb.model.v3.release.record; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.orcid.jaxb.model.v3.release.common.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/History.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/History.java index b194c0f..8b8f001 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/History.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/History.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.message.CreationMethod; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/InvitedPosition.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/InvitedPosition.java index 888ecfc..e02f584 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/InvitedPosition.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/InvitedPosition.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Keyword.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Keyword.java index 2afefce..4e2441d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Keyword.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Keyword.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.v3.release.common.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Keywords.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Keywords.java index b61a37a..1b774f5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Keywords.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Keywords.java @@ -4,12 +4,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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Membership.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Membership.java index 7a2fcbf..b841823 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Membership.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Membership.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Name.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Name.java index 9fe7b16..0d2fb8a 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Name.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Name.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.CreditName; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidId.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidId.java index 46d7467..594f9aa 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidId.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidId.java @@ -7,11 +7,11 @@ package org.orcid.jaxb.model.v3.release.record; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidIds.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidIds.java index 97f2a15..5231a0e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidIds.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/OrcidIds.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.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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherName.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherName.java index 7f22085..38c216e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherName.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherName.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.v3.release.common.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherNames.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherNames.java index bdf168a..56afead 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherNames.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/OtherNames.java @@ -4,12 +4,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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/PeerReview.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/PeerReview.java index c971af2..11d56ef 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/PeerReview.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/PeerReview.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.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.XmlJavaTypeAdapter; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.common.PeerReviewSubjectType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Person.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Person.java index 02e4c28..e7ce598 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Person.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Person.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifier.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifier.java index ce804be..6d92a4a 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifier.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifier.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.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.XmlJavaTypeAdapter; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.common.Relationship; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifiers.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifiers.java index 00cfebc..2c2723c 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifiers.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonExternalIdentifiers.java @@ -4,12 +4,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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonalDetails.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonalDetails.java index b147436..ea2cbe4 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonalDetails.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/PersonalDetails.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.record.util.RecordUtil; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Preferences.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Preferences.java index 0ed357d..eff29b3 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Preferences.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Preferences.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +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; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.AvailableLocales; import org.orcid.jaxb.model.common.adapters.AvailableLocalesAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/PrimaryRecord.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/PrimaryRecord.java index 888f725..b5e8612 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/PrimaryRecord.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/PrimaryRecord.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Qualification.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Qualification.java index 570c0c9..79dc734 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Qualification.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Qualification.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Record.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Record.java index f33b9bf..39766e3 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Record.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Record.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.common.OrcidType; import org.orcid.jaxb.model.v3.release.common.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Region.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Region.java index 464bf8d..fbd67ce 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Region.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Region.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResource.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResource.java index 227df8b..6b63d3b 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResource.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResource.java @@ -4,13 +4,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.XmlElementWrapper; -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.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.v3.release.common.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceHosts.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceHosts.java index b197bba..920edfc 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceHosts.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceHosts.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.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; import org.orcid.jaxb.model.v3.release.common.MultipleOrganizationHolder; import org.orcid.jaxb.model.v3.release.common.Organization; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItem.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItem.java index 879c2a0..5aa0166 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItem.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItem.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +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; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.ResourceType; import org.orcid.jaxb.model.common.adapters.ResourceTypeAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItems.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItems.java index a862e87..e5cab78 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItems.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceItems.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.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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceProposal.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceProposal.java index 3bd0211..2ca68a7 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceProposal.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceProposal.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.FuzzyDate; import org.orcid.jaxb.model.v3.release.common.Url; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceTitle.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceTitle.java index aa0ee6b..61f3a66 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceTitle.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearchResourceTitle.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.Title; import org.orcid.jaxb.model.v3.release.common.TranslatedTitle; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrl.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrl.java index ae72663..77885f6 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrl.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrl.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.v3.release.common.CreatedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrls.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrls.java index 18541fa..36d1c58 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrls.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/ResearcherUrls.java @@ -4,12 +4,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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Service.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Service.java index b70690c..f6a1424 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Service.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Service.java @@ -9,7 +9,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceReference.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceReference.java index e2137e7..854bbb6 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceReference.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceReference.java @@ -9,11 +9,11 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceType.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceType.java index e6baad4..e990c2a 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceType.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/SourceType.java @@ -1,7 +1,7 @@ package org.orcid.jaxb.model.v3.release.record; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Spam.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Spam.java index 6d19191..978b9f3 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Spam.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Spam.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Subject.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Subject.java index 4bb80f7..c280b5c 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Subject.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Subject.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.common.WorkType; import org.orcid.jaxb.model.v3.release.common.Title; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/SubjectName.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/SubjectName.java index 3c0d519..01b2ee0 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/SubjectName.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/SubjectName.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.Subtitle; import org.orcid.jaxb.model.v3.release.common.Title; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/SubmissionDate.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/SubmissionDate.java index 61253c6..fc01a04 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/SubmissionDate.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/SubmissionDate.java @@ -9,12 +9,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +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 javax.xml.datatype.XMLGregorianCalendar; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Work.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Work.java index baf86cd..52ef32e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Work.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Work.java @@ -10,13 +10,13 @@ import java.io.Serializable; 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.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.XmlJavaTypeAdapter; import io.swagger.v3.oas.annotations.media.Schema; import org.orcid.jaxb.model.common.LanguageCode; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkBulk.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkBulk.java index 18cb90e..b481cf7 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkBulk.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkBulk.java @@ -4,12 +4,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.XmlElement; -import javax.xml.bind.annotation.XmlElements; -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.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.orcid.jaxb.model.record.bulk.BulkElement; import org.orcid.jaxb.model.record.bulk.BulkElementContainer; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkCategory.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkCategory.java index afa5387..63122df 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkCategory.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkCategory.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; import org.orcid.jaxb.model.common.WorkType; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkContributors.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkContributors.java index 8b936b0..b5d07dd 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkContributors.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkContributors.java @@ -11,11 +11,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; import org.orcid.jaxb.model.v3.release.common.Contributor; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkSource.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkSource.java index 9da4622..c9089dd 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkSource.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkSource.java @@ -3,8 +3,8 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.orcid.jaxb.model.v3.release.common.OrcidIdBase; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkTitle.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkTitle.java index f0e7797..bacd203 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkTitle.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/WorkTitle.java @@ -9,11 +9,11 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.Subtitle; import org.orcid.jaxb.model.v3.release.common.Title; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/Works.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/Works.java index 3a8ba60..a693719 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/Works.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/Works.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/package-info.java index 7077349..cbac4e7 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/package-info.java @@ -5,35 +5,35 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/record", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), - @javax.xml.bind.annotation.XmlNs(prefix = "address", namespaceURI = "http://www.orcid.org/ns/address"), - @javax.xml.bind.annotation.XmlNs(prefix = "bulk", namespaceURI = "http://www.orcid.org/ns/bulk"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), - @javax.xml.bind.annotation.XmlNs(prefix = "deprecated", namespaceURI = "http://www.orcid.org/ns/deprecated"), - @javax.xml.bind.annotation.XmlNs(prefix = "distinction", namespaceURI = "http://www.orcid.org/ns/distinction"), - @javax.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), - @javax.xml.bind.annotation.XmlNs(prefix = "email", namespaceURI = "http://www.orcid.org/ns/email"), - @javax.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), - @javax.xml.bind.annotation.XmlNs(prefix = "error", namespaceURI = "http://www.orcid.org/ns/error"), - @javax.xml.bind.annotation.XmlNs(prefix = "external-identifier", namespaceURI = "http://www.orcid.org/ns/external-identifier"), - @javax.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), - @javax.xml.bind.annotation.XmlNs(prefix = "history", namespaceURI = "http://www.orcid.org/ns/history"), - @javax.xml.bind.annotation.XmlNs(prefix = "internal", namespaceURI = "http://www.orcid.org/ns/internal"), - @javax.xml.bind.annotation.XmlNs(prefix = "invited-position", namespaceURI = "http://www.orcid.org/ns/invited-position"), - @javax.xml.bind.annotation.XmlNs(prefix = "keyword", namespaceURI = "http://www.orcid.org/ns/keyword"), - @javax.xml.bind.annotation.XmlNs(prefix = "membership", namespaceURI = "http://www.orcid.org/ns/membership"), - @javax.xml.bind.annotation.XmlNs(prefix = "other-name", namespaceURI = "http://www.orcid.org/ns/other-name"), - @javax.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), - @javax.xml.bind.annotation.XmlNs(prefix = "person", namespaceURI = "http://www.orcid.org/ns/person"), - @javax.xml.bind.annotation.XmlNs(prefix = "personal-details", namespaceURI = "http://www.orcid.org/ns/personal-details"), - @javax.xml.bind.annotation.XmlNs(prefix = "preferences", namespaceURI = "http://www.orcid.org/ns/preferences"), - @javax.xml.bind.annotation.XmlNs(prefix = "qualification", namespaceURI = "http://www.orcid.org/ns/qualification"), - @javax.xml.bind.annotation.XmlNs(prefix = "record", namespaceURI = "http://www.orcid.org/ns/record"), - @javax.xml.bind.annotation.XmlNs(prefix = "research-resource", namespaceURI = "http://www.orcid.org/ns/research-resource"), - @javax.xml.bind.annotation.XmlNs(prefix = "researcher-url", namespaceURI = "http://www.orcid.org/ns/researcher-url"), - @javax.xml.bind.annotation.XmlNs(prefix = "service", namespaceURI = "http://www.orcid.org/ns/service"), - @javax.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/record", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "address", namespaceURI = "http://www.orcid.org/ns/address"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "bulk", namespaceURI = "http://www.orcid.org/ns/bulk"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "deprecated", namespaceURI = "http://www.orcid.org/ns/deprecated"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "distinction", namespaceURI = "http://www.orcid.org/ns/distinction"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "email", namespaceURI = "http://www.orcid.org/ns/email"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "error", namespaceURI = "http://www.orcid.org/ns/error"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "external-identifier", namespaceURI = "http://www.orcid.org/ns/external-identifier"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "history", namespaceURI = "http://www.orcid.org/ns/history"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "internal", namespaceURI = "http://www.orcid.org/ns/internal"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "invited-position", namespaceURI = "http://www.orcid.org/ns/invited-position"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "keyword", namespaceURI = "http://www.orcid.org/ns/keyword"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "membership", namespaceURI = "http://www.orcid.org/ns/membership"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "other-name", namespaceURI = "http://www.orcid.org/ns/other-name"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "person", namespaceURI = "http://www.orcid.org/ns/person"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "personal-details", namespaceURI = "http://www.orcid.org/ns/personal-details"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "preferences", namespaceURI = "http://www.orcid.org/ns/preferences"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "qualification", namespaceURI = "http://www.orcid.org/ns/qualification"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "record", namespaceURI = "http://www.orcid.org/ns/record"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "research-resource", namespaceURI = "http://www.orcid.org/ns/research-resource"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "researcher-url", namespaceURI = "http://www.orcid.org/ns/researcher-url"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "service", namespaceURI = "http://www.orcid.org/ns/service"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.record; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivitiesSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivitiesSummary.java index 3bb1c8c..0898112 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivitiesSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivitiesSummary.java @@ -14,12 +14,12 @@ import java.util.List; import java.util.Map; -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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.ActivitiesContainer; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivityGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivityGroup.java index 431a172..adab9f9 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivityGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ActivityGroup.java @@ -10,8 +10,8 @@ import java.io.Serializable; import java.util.Collection; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationGroup.java index 75780b1..76c7f45 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationGroup.java @@ -4,12 +4,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.XmlElement; -import javax.xml.bind.annotation.XmlElements; -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.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationSummary.java index 50c2918..04bb490 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/AffiliationSummary.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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 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 org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.FuzzyDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Affiliations.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Affiliations.java index d7bd48e..d75a28d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Affiliations.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Affiliations.java @@ -3,11 +3,11 @@ import java.io.Serializable; import java.util.Collection; -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 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 org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.GroupsContainer; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/DistinctionSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/DistinctionSummary.java index a384fe2..2c08887 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/DistinctionSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/DistinctionSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Distinctions.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Distinctions.java index 1af6fa2..d3dc54f 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Distinctions.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Distinctions.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EducationSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EducationSummary.java index a6bcf5f..cb0af51 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EducationSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EducationSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Educations.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Educations.java index 4d2ebfa..0585041 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Educations.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Educations.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EmploymentSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EmploymentSummary.java index fa0774b..09c40a9 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EmploymentSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/EmploymentSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Employments.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Employments.java index 3e4cd0d..fce2617 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Employments.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Employments.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingGroup.java index c3eedc0..479fc0c 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingGroup.java @@ -5,11 +5,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingSummary.java index b8bc0b8..71a559e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/FundingSummary.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.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.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.FundingType; import org.orcid.jaxb.model.common.adapters.FundingTypeAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Fundings.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Fundings.java index 3852f03..5ba8cb5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Fundings.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Fundings.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.Group; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositionSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositionSummary.java index 8c7f825..b5914b7 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositionSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositionSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositions.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositions.java index aaaaf04..0d2d018 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositions.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/InvitedPositions.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/MembershipSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/MembershipSummary.java index d4bd049..2f61db3 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/MembershipSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/MembershipSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Memberships.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Memberships.java index 161bcee..6e736dd 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Memberships.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Memberships.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewDuplicateGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewDuplicateGroup.java index 757a082..04413d9 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewDuplicateGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewDuplicateGroup.java @@ -5,11 +5,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewGroup.java index 3e36811..1514cc0 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewGroup.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.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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewSummary.java index 3dc0042..4b383d1 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviewSummary.java @@ -2,13 +2,13 @@ import java.io.Serializable; -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.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.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.PeerReviewType; import org.orcid.jaxb.model.common.Role; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviews.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviews.java index 2dab882..6fbd4b4 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviews.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/PeerReviews.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/QualificationSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/QualificationSummary.java index 9ade184..ae8339e 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/QualificationSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/QualificationSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Qualifications.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Qualifications.java index 82bec5a..6e7f9ee 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Qualifications.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Qualifications.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceGroup.java index 512e55d..76d7e19 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceGroup.java @@ -12,11 +12,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.ExternalIDs; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceSummary.java index c9101e3..9cbba52 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResourceSummary.java @@ -2,12 +2,12 @@ import java.io.Serializable; -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; import org.orcid.jaxb.model.v3.release.common.CreatedDate; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResources.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResources.java index cadc6a1..fd79e75 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResources.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ResearchResources.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.Group; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ServiceSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ServiceSummary.java index 910a356..34a7dc9 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ServiceSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/ServiceSummary.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Services.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Services.java index b0907c5..d3ca9b1 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Services.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Services.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkGroup.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkGroup.java index dd4a77d..d06bee8 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkGroup.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkGroup.java @@ -12,11 +12,11 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.record.GroupableActivity; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkSummary.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkSummary.java index 100d712..92544ea 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkSummary.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/WorkSummary.java @@ -9,13 +9,13 @@ import java.io.Serializable; -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.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.XmlJavaTypeAdapter; import org.orcid.jaxb.model.common.WorkType; import org.orcid.jaxb.model.common.adapters.WorkTypeAdapter; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Works.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Works.java index e4a178d..6a041b0 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Works.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/Works.java @@ -5,12 +5,12 @@ import java.util.Collection; 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; import org.orcid.jaxb.model.v3.release.common.LastModifiedDate; import org.orcid.jaxb.model.v3.release.record.Group; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/package-info.java index c5cd5ad..048e34b 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/record/summary/package-info.java @@ -5,19 +5,19 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/activities", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), - @javax.xml.bind.annotation.XmlNs(prefix = "distinction", namespaceURI = "http://www.orcid.org/ns/distinction"), - @javax.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), - @javax.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), - @javax.xml.bind.annotation.XmlNs(prefix = "invited-position", namespaceURI = "http://www.orcid.org/ns/invited-position"), - @javax.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), - @javax.xml.bind.annotation.XmlNs(prefix = "membership", namespaceURI = "http://www.orcid.org/ns/membership"), - @javax.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), - @javax.xml.bind.annotation.XmlNs(prefix = "qualification", namespaceURI = "http://www.orcid.org/ns/qualification"), - @javax.xml.bind.annotation.XmlNs(prefix = "service", namespaceURI = "http://www.orcid.org/ns/service"), - @javax.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work"), - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/activities", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "activities", namespaceURI = "http://www.orcid.org/ns/activities"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "distinction", namespaceURI = "http://www.orcid.org/ns/distinction"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "employment", namespaceURI = "http://www.orcid.org/ns/employment"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "education", namespaceURI = "http://www.orcid.org/ns/education"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "invited-position", namespaceURI = "http://www.orcid.org/ns/invited-position"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "funding", namespaceURI = "http://www.orcid.org/ns/funding"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "membership", namespaceURI = "http://www.orcid.org/ns/membership"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "peer-review", namespaceURI = "http://www.orcid.org/ns/peer-review"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "qualification", namespaceURI = "http://www.orcid.org/ns/qualification"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "service", namespaceURI = "http://www.orcid.org/ns/service"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "work", namespaceURI = "http://www.orcid.org/ns/work"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.record.summary; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/search/Result.java b/src/main/java/org/orcid/jaxb/model/v3/release/search/Result.java index 94e0726..af2c1b2 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/search/Result.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/search/Result.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import org.orcid.jaxb.model.v3.release.common.OrcidIdentifier; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/search/Search.java b/src/main/java/org/orcid/jaxb/model/v3/release/search/Search.java index c4b3abe..b4bcc0d 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/search/Search.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/search/Search.java @@ -4,12 +4,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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedResult.java b/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedResult.java index ed8dab0..b8681c5 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedResult.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedResult.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedSearch.java b/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedSearch.java index aa71066..2b0f000 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedSearch.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/ExpandedSearch.java @@ -4,12 +4,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; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/package-info.java index 26e8b9f..bd75e65 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/search/expanded/package-info.java @@ -5,8 +5,8 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/expanded-search", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "expanded-search", namespaceURI = "http://www.orcid.org/ns/expanded-search")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/expanded-search", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "expanded-search", namespaceURI = "http://www.orcid.org/ns/expanded-search")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.search.expanded; diff --git a/src/main/java/org/orcid/jaxb/model/v3/release/search/package-info.java b/src/main/java/org/orcid/jaxb/model/v3/release/search/package-info.java index 7ac8ad0..bb1daaa 100644 --- a/src/main/java/org/orcid/jaxb/model/v3/release/search/package-info.java +++ b/src/main/java/org/orcid/jaxb/model/v3/release/search/package-info.java @@ -5,9 +5,9 @@ // Generated on: 2014.07.22 at 06:46:00 PM BST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/search", xmlns = { - @javax.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), - @javax.xml.bind.annotation.XmlNs(prefix = "search", namespaceURI = "http://www.orcid.org/ns/search")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.orcid.org/ns/search", xmlns = { + @jakarta.xml.bind.annotation.XmlNs(prefix = "common", namespaceURI = "http://www.orcid.org/ns/common"), + @jakarta.xml.bind.annotation.XmlNs(prefix = "search", namespaceURI = "http://www.orcid.org/ns/search")}, + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.orcid.jaxb.model.v3.release.search; diff --git a/src/test/java/org/orcid/entities/MarshallingTest.java b/src/test/java/org/orcid/entities/MarshallingTest.java index 2bde17f..94f716f 100644 --- a/src/test/java/org/orcid/entities/MarshallingTest.java +++ b/src/test/java/org/orcid/entities/MarshallingTest.java @@ -6,9 +6,9 @@ import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.junit.Test; import org.orcid.jaxb.model.message.OrcidActivities; diff --git a/src/test/java/org/orcid/jaxb/model/notification/custom/MarshallingTest.java b/src/test/java/org/orcid/jaxb/model/notification/custom/MarshallingTest.java index 4b93037..8a49e6c 100644 --- a/src/test/java/org/orcid/jaxb/model/notification/custom/MarshallingTest.java +++ b/src/test/java/org/orcid/jaxb/model/notification/custom/MarshallingTest.java @@ -5,9 +5,9 @@ import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.junit.Test; /** diff --git a/src/test/java/org/orcid/jaxb/model/notification/permission/MarshallingTest.java b/src/test/java/org/orcid/jaxb/model/notification/permission/MarshallingTest.java index 7dd07b9..3712939 100644 --- a/src/test/java/org/orcid/jaxb/model/notification/permission/MarshallingTest.java +++ b/src/test/java/org/orcid/jaxb/model/notification/permission/MarshallingTest.java @@ -8,10 +8,10 @@ import java.net.URISyntaxException; import java.util.regex.Pattern; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.apache.commons.io.IOUtils; import org.custommonkey.xmlunit.Diff; diff --git a/src/test/java/org/orcid/jaxb/test/utils/OrcidTranslator.java b/src/test/java/org/orcid/jaxb/test/utils/OrcidTranslator.java index 8aa8b4f..d6e246e 100644 --- a/src/test/java/org/orcid/jaxb/test/utils/OrcidTranslator.java +++ b/src/test/java/org/orcid/jaxb/test/utils/OrcidTranslator.java @@ -1,5 +1,6 @@ package org.orcid.jaxb.test.utils; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; @@ -16,10 +17,10 @@ import java.util.Optional; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; @@ -31,7 +32,6 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; import com.google.common.io.Resources; @@ -113,7 +113,7 @@ public static OrcidTranslator forSchema(SchemaVersion v){ */ private OrcidTranslator(SchemaVersion location) { mapper = new ObjectMapper(); - JaxbAnnotationModule module = new JaxbAnnotationModule(); + JakartaXmlBindAnnotationModule module = new JakartaXmlBindAnnotationModule(); mapper.registerModule(module); mapper.configure(SerializationFeature.INDENT_OUTPUT, true); modelClass = location.modelClass; diff --git a/src/test/java/org/orcid/record/ValidateV2IdentifiersTest.java b/src/test/java/org/orcid/record/ValidateV2IdentifiersTest.java index 584dd07..ef8dae3 100644 --- a/src/test/java/org/orcid/record/ValidateV2IdentifiersTest.java +++ b/src/test/java/org/orcid/record/ValidateV2IdentifiersTest.java @@ -9,11 +9,11 @@ import java.io.InputStreamReader; import java.io.Reader; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/test/java/org/orcid/record/ValidateV2SamplesTest.java b/src/test/java/org/orcid/record/ValidateV2SamplesTest.java index 1d18eb1..83b0a3e 100644 --- a/src/test/java/org/orcid/record/ValidateV2SamplesTest.java +++ b/src/test/java/org/orcid/record/ValidateV2SamplesTest.java @@ -15,10 +15,10 @@ import java.net.URISyntaxException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; diff --git a/src/test/java/org/orcid/record/ValidateV2_1IdentifiersTest.java b/src/test/java/org/orcid/record/ValidateV2_1IdentifiersTest.java index 7ad062c..749124e 100644 --- a/src/test/java/org/orcid/record/ValidateV2_1IdentifiersTest.java +++ b/src/test/java/org/orcid/record/ValidateV2_1IdentifiersTest.java @@ -9,11 +9,11 @@ import java.io.InputStreamReader; import java.io.Reader; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/test/java/org/orcid/record/ValidateV2_1SamplesTest.java b/src/test/java/org/orcid/record/ValidateV2_1SamplesTest.java index b3d6c42..8c48cd0 100644 --- a/src/test/java/org/orcid/record/ValidateV2_1SamplesTest.java +++ b/src/test/java/org/orcid/record/ValidateV2_1SamplesTest.java @@ -15,10 +15,10 @@ import java.net.URISyntaxException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; diff --git a/src/test/java/org/orcid/record/v3/release/SchemaValidateTest.java b/src/test/java/org/orcid/record/v3/release/SchemaValidateTest.java index 55f08d6..ddfb5cb 100644 --- a/src/test/java/org/orcid/record/v3/release/SchemaValidateTest.java +++ b/src/test/java/org/orcid/record/v3/release/SchemaValidateTest.java @@ -6,7 +6,7 @@ import java.io.InputStreamReader; import java.io.Reader; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.junit.Test; import org.orcid.jaxb.model.v3.release.record.Funding; diff --git a/src/test/java/org/orcid/record/v3/release/TransientNonEmptyStringTest.java b/src/test/java/org/orcid/record/v3/release/TransientNonEmptyStringTest.java index 0ac4885..9c2dbe8 100644 --- a/src/test/java/org/orcid/record/v3/release/TransientNonEmptyStringTest.java +++ b/src/test/java/org/orcid/record/v3/release/TransientNonEmptyStringTest.java @@ -8,11 +8,11 @@ import java.io.Reader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; diff --git a/src/test/java/org/orcid/record/v3/release/V3RoundTripTest.java b/src/test/java/org/orcid/record/v3/release/V3RoundTripTest.java index 25892a3..5345abf 100644 --- a/src/test/java/org/orcid/record/v3/release/V3RoundTripTest.java +++ b/src/test/java/org/orcid/record/v3/release/V3RoundTripTest.java @@ -9,7 +9,7 @@ import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.junit.Test; import org.orcid.jaxb.test.utils.OrcidTranslator; diff --git a/src/test/java/org/orcid/record/v3/release/ValidateV3SamplesTest.java b/src/test/java/org/orcid/record/v3/release/ValidateV3SamplesTest.java index 5595c03..5ec4ad5 100644 --- a/src/test/java/org/orcid/record/v3/release/ValidateV3SamplesTest.java +++ b/src/test/java/org/orcid/record/v3/release/ValidateV3SamplesTest.java @@ -18,10 +18,10 @@ import java.net.URISyntaxException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; From b9f2b9f06b7ad882444ab7ec6f242ec061a1a0f6 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Tue, 2 May 2023 11:18:26 -0400 Subject: [PATCH 2/4] prepare for release on artifacts --- pom.xml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 3511a68..3f09de8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 org.orcid orcid-model-jakarta @@ -11,6 +9,7 @@ https://github.com/ORCID/orcid-model + scm:git:git@github.com:denis-yuen/orcid-model.git ${project.basedir} 2.2.7 3.6.0 @@ -35,10 +34,11 @@ - scm:git:git://github.com/ORCID/orcid-model.git - scm:git:ssh://github.com:ORCID/orcid-model.git - http://github.com/ORCID/orcid-model/tree/master - + ${github.url} + ${github.url} + ${github.url} + 3.3.0 + @@ -169,13 +169,10 @@ - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + artifacts.oicr.on.ca-releases + https://artifacts.oicr.on.ca/artifactory/collab-release From 0779139f407b7bb7752a46c9cca33181eadc1304 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Tue, 2 May 2023 11:19:00 -0400 Subject: [PATCH 3/4] [maven-release-plugin] prepare release orcid-model-jakarta-3.3.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3f09de8..f3d2bb8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.orcid orcid-model-jakarta - 3.3.0-SNAPSHOT + 3.3.0 ORCID - Model Container for all classes that will be used to marshal and unmarshal XML/JSON from the API @@ -37,7 +37,7 @@ ${github.url} ${github.url} ${github.url} - 3.3.0 + orcid-model-jakarta-3.3.0 From 3e73ad6e5fba192521aebee1b54238db035db698 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Tue, 2 May 2023 11:19:02 -0400 Subject: [PATCH 4/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f3d2bb8..2fc14b9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.orcid orcid-model-jakarta - 3.3.0 + 3.3.1-SNAPSHOT ORCID - Model Container for all classes that will be used to marshal and unmarshal XML/JSON from the API @@ -37,7 +37,7 @@ ${github.url} ${github.url} ${github.url} - orcid-model-jakarta-3.3.0 + 3.3.0