From ff43672f4e46657757741e8b289a482c3a7c47bc Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 11 Sep 2023 23:31:01 +1200 Subject: [PATCH] Move source to Jakarta (use ./jakarta-to-javax.sh) Moving the master branch to use jakarta based code and dependencies. Change to use ./jakarta-to-javax.sh to convert back to javax when releasing that. --- ebean-api/pom.xml | 10 +++---- .../java/io/ebean/AcquireLockException.java | 2 +- ebean-api/src/main/java/io/ebean/DB.java | 4 +-- .../java/io/ebean/DataIntegrityException.java | 2 +- .../src/main/java/io/ebean/Database.java | 4 +-- .../main/java/io/ebean/DatabaseFactory.java | 2 +- .../src/main/java/io/ebean/DbContext.java | 2 +- .../main/java/io/ebean/ExpressionList.java | 2 +- .../src/main/java/io/ebean/FutureList.java | 2 +- .../java/io/ebean/PersistenceIOException.java | 2 +- ebean-api/src/main/java/io/ebean/Query.java | 2 +- .../ebean/SerializableConflictException.java | 2 +- .../src/main/java/io/ebean/Transaction.java | 2 +- .../io/ebean/bean/InterceptReadWrite.java | 4 +-- .../config/AbstractNamingConvention.java | 6 ++-- .../java/io/ebean/config/DatabaseConfig.java | 2 +- .../io/ebean/config/ScalarTypeConverter.java | 2 +- .../config/dbplatform/DatabasePlatform.java | 2 +- .../dbplatform/SequenceIdGenerator.java | 2 +- .../dbplatform/SimpleSequenceIdGenerator.java | 2 +- .../config/dbplatform/SqlCodeTranslator.java | 2 +- .../dbplatform/SqlExceptionTranslator.java | 2 +- .../ebean/event/ServletContextListener.java | 4 +-- ebean-api/src/main/java/module-info.java | 4 +-- ebean-bom/pom.xml | 2 +- ebean-core/pom.xml | 8 +++--- .../ebeaninternal/api/ScopedTransaction.java | 2 +- .../ebeaninternal/api/SpiCancelableQuery.java | 2 +- .../io/ebeaninternal/api/SpiTransaction.java | 2 +- .../api/SpiTransactionProxy.java | 2 +- .../server/core/DScriptRunner.java | 2 +- .../server/core/DatabasePlatformFactory.java | 2 +- .../server/core/DefaultBeanLoader.java | 2 +- .../server/core/DefaultContainer.java | 2 +- .../server/core/DefaultServer.java | 8 +++--- .../server/core/InitDataSource.java | 2 +- .../server/core/OrmQueryEngine.java | 2 +- .../server/core/OrmQueryRequest.java | 2 +- .../server/core/PersistRequest.java | 2 +- .../server/core/PersistRequestBean.java | 6 ++-- .../server/core/bootup/BootupClasses.java | 8 +++--- .../server/deploy/BeanCascadeInfo.java | 2 +- .../server/deploy/BeanCollectionUtil.java | 2 +- .../server/deploy/BeanDescriptor.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 6 ++-- .../deploy/BeanEmbeddedMetaFactory.java | 2 +- .../deploy/BeanLifecycleAdapterFactory.java | 16 +++++------ .../server/deploy/BeanProperty.java | 2 +- .../server/deploy/BeanPropertyAssoc.java | 2 +- .../server/deploy/BeanPropertyAssocMany.java | 2 +- .../server/deploy/BeanPropertyAssocOne.java | 2 +- .../server/deploy/BeanPropertyJsonBasic.java | 2 +- .../server/deploy/BeanPropertyJsonMapper.java | 2 +- .../DynamicPropertyAggregationFormula.java | 2 +- .../server/deploy/InheritInfo.java | 2 +- .../server/deploy/PersistenceContextUtil.java | 2 +- .../generatedproperty/CounterFactory.java | 2 +- .../InsertTimestampFactory.java | 2 +- .../UpdateTimestampFactory.java | 2 +- .../server/deploy/id/ImportedIdEmbedded.java | 2 +- .../server/deploy/id/ImportedIdSimple.java | 2 +- .../deploy/meta/DeployBeanDescriptor.java | 4 +-- .../deploy/meta/DeployBeanEmbedded.java | 2 +- .../deploy/meta/DeployBeanProperty.java | 8 +++--- .../meta/DeployBeanPropertyAssocOne.java | 2 +- .../server/deploy/meta/DeployOrderColumn.java | 2 +- .../server/deploy/meta/DeployTableJoin.java | 2 +- .../deploy/parse/AnnotationAssocManys.java | 28 +++++++++---------- .../deploy/parse/AnnotationAssocOnes.java | 2 +- .../server/deploy/parse/AnnotationBase.java | 10 +++---- .../server/deploy/parse/AnnotationClass.java | 4 +-- .../server/deploy/parse/AnnotationFields.java | 2 +- .../server/deploy/parse/AnnotationFind.java | 8 +++--- .../server/deploy/parse/AnnotationParser.java | 6 ++-- .../deploy/parse/DeployCreateProperties.java | 2 +- .../server/deploy/parse/DeployInherit.java | 8 +++--- .../deploy/parse/DeployInheritInfo.java | 2 +- .../server/deploy/parse/DeployUtil.java | 6 ++-- .../deploy/parse/ReadAnnotationConfig.java | 2 +- .../expression/FilterExpressionList.java | 2 +- .../server/persist/BatchedPstmtHolder.java | 2 +- .../server/persist/BeanPersister.java | 2 +- .../ebeaninternal/server/persist/Binder.java | 2 +- .../server/persist/ExeOrmUpdate.java | 2 +- .../server/persist/ExeUpdateSql.java | 2 +- .../server/persist/MergeHandler.java | 2 +- .../server/persist/SaveManyBeans.java | 2 +- .../server/persist/dml/DeleteHandler.java | 2 +- .../server/persist/dml/DmlHandler.java | 2 +- .../persist/dml/DocStoreBeanPersister.java | 2 +- .../server/persist/dml/InsertHandler.java | 4 +-- .../server/persist/dml/UpdateHandler.java | 2 +- .../dmlbind/BindableDiscriminator.java | 2 +- .../persist/dmlbind/BindableIdEmbedded.java | 2 +- .../persist/dmlbind/BindableIdScalar.java | 2 +- .../dmlbind/BindableUnidirectional.java | 2 +- .../io/ebeaninternal/server/query/CQuery.java | 2 +- .../server/query/CQueryBuilder.java | 2 +- .../server/query/CQueryEngine.java | 2 +- .../server/query/CQueryRowCount.java | 2 +- .../server/query/DefaultOrmQueryEngine.java | 2 +- .../query/DefaultRelationalQueryEngine.java | 2 +- .../server/query/DtoQueryEngine.java | 2 +- .../server/query/DtoQueryIterator.java | 2 +- .../server/query/LimitOffsetPagedList.java | 2 +- .../server/query/QueryFutureList.java | 2 +- .../server/querydefn/AbstractQuery.java | 2 +- .../server/querydefn/DefaultOrmQuery.java | 2 +- .../server/querydefn/ONamedParam.java | 2 +- .../server/querydefn/OrmQueryDetail.java | 2 +- .../querydefn/OrmQueryDetailParser.java | 2 +- .../server/rawsql/DRawSqlColumnsParser.java | 2 +- .../DefaultTransactionScopeManager.java | 2 +- .../transaction/ExternalJdbcTransaction.java | 2 +- .../ImplicitReadOnlyTransaction.java | 2 +- .../server/transaction/JdbcTransaction.java | 4 +-- .../server/transaction/JtaTransaction.java | 6 ++-- .../transaction/JtaTransactionManager.java | 10 +++---- .../server/transaction/NoTransaction.java | 2 +- .../transaction/SavepointTransaction.java | 2 +- .../transaction/TransactionFactory.java | 2 +- .../transaction/TransactionFactoryBasic.java | 2 +- .../TransactionFactoryBasicWithRead.java | 2 +- .../transaction/TransactionFactoryTenant.java | 2 +- .../TransactionFactoryTenantWithRead.java | 2 +- .../transaction/TransactionManager.java | 2 +- .../type/AttributeConverterAdapter.java | 2 +- .../server/type/DefaultTypeManager.java | 4 +-- .../server/type/EnumToDbIntegerMap.java | 2 +- .../server/type/ScalarTypeArrayList.java | 2 +- .../server/type/ScalarTypeArraySet.java | 2 +- .../server/type/ScalarTypeClass.java | 2 +- .../server/type/ScalarTypeDayOfWeek.java | 2 +- .../server/type/ScalarTypeEnum.java | 2 +- .../server/type/ScalarTypeEnumStandard.java | 2 +- .../type/ScalarTypeEnumWithMapping.java | 2 +- .../server/type/ScalarTypeJsonList.java | 2 +- .../server/type/ScalarTypeJsonSet.java | 2 +- .../server/type/ScalarTypeMonth.java | 2 +- .../server/type/TypeManager.java | 2 +- .../server/util/BindParamsParser.java | 2 +- ebean-core/src/main/java/module-info.java | 2 +- .../ebeaninternal/server/deploy/BaseTest.java | 2 +- .../server/deploy/BeanCascadeInfoTest.java | 2 +- .../server/type/DefaultTypeManagerTest.java | 2 +- .../type/ScalarTypeWrapperAdapterTest.java | 2 +- .../server/type/TestTypeManager.java | 2 +- .../server/type/TypeReflectHelperTest.java | 2 +- .../inheritance/model/AbstractBaseClass.java | 2 +- .../inheritance/model/CalculationResult.java | 2 +- .../inheritance/model/Configuration.java | 2 +- .../inheritance/model/Configurations.java | 8 +++--- .../inheritance/model/GroupConfiguration.java | 6 ++-- .../model/ProductConfiguration.java | 6 ++-- .../java/org/tests/model/basic/Address.java | 2 +- .../java/org/tests/model/basic/Animal.java | 2 +- .../org/tests/model/basic/AnimalShelter.java | 10 +++---- .../java/org/tests/model/basic/Article.java | 6 ++-- .../org/tests/model/basic/BWithQIdent.java | 8 +++--- .../org/tests/model/basic/BasicDomain.java | 6 ++-- .../test/java/org/tests/model/basic/Car.java | 2 +- .../org/tests/model/basic/CarAccessory.java | 4 +-- .../java/org/tests/model/basic/CarFuse.java | 4 +-- .../test/java/org/tests/model/basic/Cat.java | 4 +-- .../java/org/tests/model/basic/Contact.java | 2 +- .../org/tests/model/basic/ContactGroup.java | 2 +- .../org/tests/model/basic/ContactNote.java | 6 ++-- .../java/org/tests/model/basic/Country.java | 6 ++-- .../java/org/tests/model/basic/Customer.java | 2 +- .../test/java/org/tests/model/basic/Dog.java | 4 +-- .../java/org/tests/model/basic/EBasic.java | 6 ++-- .../java/org/tests/model/basic/Order.java | 2 +- .../org/tests/model/basic/OrderAggregate.java | 4 +-- .../org/tests/model/basic/OrderDetail.java | 2 +- .../org/tests/model/basic/OrderShipment.java | 6 ++-- .../java/org/tests/model/basic/Product.java | 8 +++--- .../java/org/tests/model/basic/Section.java | 2 +- .../org/tests/model/basic/SubSection.java | 4 +-- .../org/tests/model/basic/TBytesOnly.java | 2 +- .../test/java/org/tests/model/basic/TOne.java | 6 ++-- .../java/org/tests/model/basic/Truck.java | 2 +- .../java/org/tests/model/basic/TruckRef.java | 4 +-- .../java/org/tests/model/basic/Vehicle.java | 8 +++--- .../org/tests/model/basic/VehicleDriver.java | 4 +-- .../org/tests/model/basic/VehicleLease.java | 8 +++--- .../tests/model/basic/VehicleLeaseLong.java | 6 ++-- .../tests/model/basic/VehicleLeaseShort.java | 6 ++-- .../java/org/tests/model/bridge/BSite.java | 6 ++-- .../java/org/tests/model/bridge/BUser.java | 4 +-- .../org/tests/model/composite/RCustomer.java | 4 +-- .../tests/model/composite/RCustomerKey.java | 2 +- .../org/tests/model/embedded/EAddress.java | 8 +++--- .../java/org/tests/model/embedded/EMain.java | 2 +- .../org/tests/model/embedded/EPerson.java | 2 +- .../org/tests/model/embedded/Eembeddable.java | 2 +- .../model/embedded/UserInterestLive.java | 4 +-- .../model/embedded/UserInterestLiveKey.java | 2 +- .../ivo/converter/MoneyTypeConverter.java | 2 +- ebean-ddl-generator/pom.xml | 8 +++--- .../dbmigration/DdlGenerator.java | 2 +- .../io/ebeaninternal/dbmigration/Detect.java | 2 +- .../dbmigration/migration/AddColumn.java | 2 +- .../migration/AddHistoryTable.java | 2 +- .../migration/AddTableComment.java | 2 +- .../migration/AddUniqueConstraint.java | 2 +- .../dbmigration/migration/AlterColumn.java | 2 +- .../migration/AlterForeignKey.java | 2 +- .../migration/AlterHistoryTable.java | 2 +- .../dbmigration/migration/AlterTable.java | 2 +- .../dbmigration/migration/Application.java | 2 +- .../dbmigration/migration/Applications.java | 8 +++--- .../dbmigration/migration/Apply.java | 2 +- .../dbmigration/migration/ChangeSet.java | 2 +- .../dbmigration/migration/ChangeSetType.java | 6 ++-- .../dbmigration/migration/Column.java | 2 +- .../dbmigration/migration/Configuration.java | 2 +- .../dbmigration/migration/CreateIndex.java | 2 +- .../dbmigration/migration/CreateSchema.java | 2 +- .../dbmigration/migration/CreateTable.java | 2 +- .../dbmigration/migration/DdlScript.java | 2 +- .../migration/DefaultTablespace.java | 2 +- .../dbmigration/migration/DropColumn.java | 2 +- .../migration/DropHistoryTable.java | 2 +- .../dbmigration/migration/DropIndex.java | 2 +- .../dbmigration/migration/DropTable.java | 2 +- .../dbmigration/migration/ForeignKey.java | 2 +- .../dbmigration/migration/IdentityType.java | 6 ++-- .../dbmigration/migration/Migration.java | 2 +- .../dbmigration/migration/ObjectFactory.java | 2 +- .../dbmigration/migration/RenameColumn.java | 2 +- .../dbmigration/migration/RenameTable.java | 2 +- .../dbmigration/migration/Rollback.java | 2 +- .../dbmigration/migration/Sql.java | 2 +- .../migration/UniqueConstraint.java | 2 +- .../dbmigration/migration/package-info.java | 2 +- .../migrationreader/MigrationXmlReader.java | 6 ++-- .../migrationreader/MigrationXmlWriter.java | 6 ++-- .../extraddl/model/DdlScript.java | 12 ++++---- .../extraddl/model/ExtraDdl.java | 10 +++---- .../extraddl/model/ExtraDdlXmlReader.java | 6 ++-- .../extraddl/model/ObjectFactory.java | 2 +- .../extraddl/model/package-info.java | 2 +- .../src/main/java/module-info.java | 2 +- .../company/domain/AbstractBar.java | 24 ++++++++-------- .../company/domain/ConcreteBar.java | 4 +-- .../tests/inheritance/company/domain/Foo.java | 10 +++---- .../inheritance/model/AbstractBaseClass.java | 2 +- .../inheritance/model/CalculationResult.java | 10 +++---- .../inheritance/model/Configuration.java | 16 +++++------ .../inheritance/model/Configurations.java | 8 +++--- .../inheritance/model/GroupConfiguration.java | 6 ++-- .../model/ProductConfiguration.java | 6 ++-- .../test/java/org/tests/model/BaseModel.java | 6 ++-- .../java/org/tests/model/basic/Address.java | 10 +++---- .../java/org/tests/model/basic/CKeyAssoc.java | 4 +-- .../org/tests/model/basic/CKeyDetail.java | 6 ++-- .../org/tests/model/basic/CKeyParent.java | 12 ++++---- .../org/tests/model/basic/CKeyParentId.java | 2 +- .../java/org/tests/model/basic/Person.java | 20 ++++++------- .../java/org/tests/model/basic/Phone.java | 20 ++++++------- .../java/org/tests/model/basic/Truck.java | 10 +++---- .../java/org/tests/model/basic/TruckRef.java | 4 +-- .../java/org/tests/model/basic/Vehicle.java | 8 +++--- .../org/tests/model/basic/VehicleDriver.java | 4 +-- .../org/tests/model/basic/VehicleLease.java | 8 +++--- .../tests/model/basic/VehicleLeaseLong.java | 6 ++-- .../tests/model/basic/VehicleLeaseShort.java | 6 ++-- .../tests/model/compositekeys/AuditInfo.java | 2 +- .../tests/model/compositekeys/CKEmbId.java | 2 +- .../tests/model/compositekeys/CKSiteUser.java | 8 +++--- .../org/tests/model/compositekeys/Item.java | 16 +++++------ .../tests/model/compositekeys/ItemKey.java | 4 +-- .../org/tests/model/compositekeys/Parcel.java | 6 ++-- .../model/compositekeys/ParcelLocation.java | 10 +++---- .../org/tests/model/compositekeys/Region.java | 12 ++++---- .../tests/model/compositekeys/RegionKey.java | 2 +- .../tests/model/compositekeys/SubType.java | 6 ++-- .../tests/model/compositekeys/SubTypeKey.java | 2 +- .../org/tests/model/compositekeys/Type.java | 16 +++++------ .../tests/model/compositekeys/TypeKey.java | 2 +- .../model/converstation/Conversation.java | 10 +++---- .../org/tests/model/converstation/Group.java | 6 ++-- .../tests/model/converstation/Message.java | 6 ++-- .../model/converstation/Participation.java | 6 ++-- .../org/tests/model/converstation/User.java | 6 ++-- .../mapper/ScalarJsonJacksonMapper.java | 2 +- .../java/org/example/domain/BaseEntity.java | 4 +-- .../java/org/example/domain/CachedBean.java | 4 +-- .../test/java/org/example/domain/MyBean.java | 6 ++-- .../org/example/domain/OtherBeanGeoLatte.java | 6 ++-- .../test/java/org/example/domain/ACat.java | 4 +-- .../test/java/org/example/domain/ADog.java | 6 ++-- .../java/org/example/domain/ASuperCat.java | 4 +-- .../java/org/example/domain/AWildCat.java | 6 ++-- .../test/java/org/example/domain/Address.java | 6 ++-- .../test/java/org/example/domain/Animal.java | 8 +++--- .../java/org/example/domain/AreaImpl.java | 8 +++--- .../java/org/example/domain/BaseModel.java | 6 ++-- .../test/java/org/example/domain/CaoBean.java | 2 +- .../test/java/org/example/domain/CaoKey.java | 2 +- .../java/org/example/domain/CityImpl.java | 6 ++-- .../test/java/org/example/domain/Contact.java | 2 +- .../java/org/example/domain/ContactNote.java | 6 ++-- .../java/org/example/domain/ContactOther.java | 4 +-- .../test/java/org/example/domain/Country.java | 6 ++-- .../java/org/example/domain/CountryImpl.java | 4 +-- .../java/org/example/domain/Customer.java | 14 +++++----- .../test/java/org/example/domain/MyInner.java | 8 +++--- .../test/java/org/example/domain/Order.java | 12 ++++---- .../java/org/example/domain/OrderDetail.java | 6 ++-- .../test/java/org/example/domain/Product.java | 4 +-- .../GenericTypeAttributeConverter.java | 4 +-- .../otherpackage/PhoneAttributeConverter.java | 4 +-- .../ValidEmailAttributeConverter.java | 4 +-- .../src/test/java/org/domain/EBase.java | 6 ++-- .../src/test/java/org/domain/Person.java | 2 +- .../src/test/java/org/domain/RCust.java | 2 +- .../src/test/java/org/domain/UChild.java | 6 ++-- .../src/test/java/org/domain/UParent.java | 8 +++--- .../txn/SpringJdbcTransactionManager.java | 2 +- .../src/test/java/org/example/Account.java | 8 +++--- .../src/test/java/org/example/Role.java | 8 +++--- .../src/test/java/org/example/User.java | 2 +- ebean-test/pom.xml | 8 +++--- ebean-test/src/main/java/module-info.java | 2 +- .../ebean/xtest/base/EbeanServer_eqlTest.java | 2 +- .../config/ServerConfigSqlServerTest.java | 2 +- .../xtest/internal/api/TDSpiEbeanServer.java | 4 +-- .../ebean/xtest/internal/api/TDSpiServer.java | 4 +-- .../migration/history/v1_0/EHistory7.java | 6 ++-- .../migration/history/v1_1/EHistory7.java | 6 ++-- .../java/misc/migration/v1_0/CKeyAssoc.java | 6 ++-- .../java/misc/migration/v1_0/CKeyDetail.java | 6 ++-- .../java/misc/migration/v1_0/CKeyParent.java | 8 +++--- .../misc/migration/v1_0/CKeyParentId.java | 2 +- .../java/misc/migration/v1_0/DfkCascade.java | 8 +++--- .../misc/migration/v1_0/DfkCascadeOne.java | 2 +- .../java/misc/migration/v1_0/DfkNone.java | 8 +++--- .../misc/migration/v1_0/DfkNoneViaJoin.java | 2 +- .../test/java/misc/migration/v1_0/DfkOne.java | 6 ++-- .../java/misc/migration/v1_0/DfkSetNull.java | 8 +++--- .../test/java/misc/migration/v1_0/EBasic.java | 2 +- .../test/java/misc/migration/v1_0/EEnum.java | 6 ++-- .../java/misc/migration/v1_0/EHistory.java | 6 ++-- .../java/misc/migration/v1_0/EHistory2.java | 6 ++-- .../java/misc/migration/v1_0/EHistory3.java | 6 ++-- .../java/misc/migration/v1_0/EHistory4.java | 6 ++-- .../java/misc/migration/v1_0/EHistory5.java | 6 ++-- .../java/misc/migration/v1_0/EHistory6.java | 6 ++-- .../java/misc/migration/v1_0/EQuoted.java | 6 ++-- .../test/java/misc/migration/v1_0/ERef.java | 8 +++--- .../java/misc/migration/v1_0/ESoftdelete.java | 6 ++-- .../test/java/misc/migration/v1_0/ETable.java | 2 +- .../java/misc/migration/v1_0/MtmChild.java | 6 ++-- .../java/misc/migration/v1_0/MtmMaster.java | 6 ++-- .../java/misc/migration/v1_0/OtoChild.java | 6 ++-- .../java/misc/migration/v1_0/OtoMaster.java | 6 ++-- .../java/misc/migration/v1_1/CKeyAssoc.java | 6 ++-- .../java/misc/migration/v1_1/CKeyDetail.java | 8 +++--- .../java/misc/migration/v1_1/CKeyParent.java | 2 +- .../misc/migration/v1_1/CKeyParentId.java | 2 +- .../java/misc/migration/v1_1/DfkCascade.java | 8 +++--- .../misc/migration/v1_1/DfkCascadeOne.java | 2 +- .../java/misc/migration/v1_1/DfkNone.java | 8 +++--- .../misc/migration/v1_1/DfkNoneViaJoin.java | 2 +- .../test/java/misc/migration/v1_1/DfkOne.java | 6 ++-- .../java/misc/migration/v1_1/DfkSetNull.java | 8 +++--- .../java/misc/migration/v1_1/DropMain.java | 2 +- .../java/misc/migration/v1_1/DropRefMany.java | 8 +++--- .../java/misc/migration/v1_1/DropRefOne.java | 8 +++--- .../misc/migration/v1_1/DropRefOneToOne.java | 2 +- .../test/java/misc/migration/v1_1/EBasic.java | 2 +- .../test/java/misc/migration/v1_1/EEnum.java | 6 ++-- .../java/misc/migration/v1_1/EHistory.java | 6 ++-- .../java/misc/migration/v1_1/EHistory2.java | 6 ++-- .../java/misc/migration/v1_1/EHistory3.java | 6 ++-- .../java/misc/migration/v1_1/EHistory4.java | 6 ++-- .../java/misc/migration/v1_1/EHistory5.java | 6 ++-- .../java/misc/migration/v1_1/EHistory6.java | 6 ++-- .../java/misc/migration/v1_1/ESoftdelete.java | 6 ++-- .../test/java/misc/migration/v1_1/ETable.java | 2 +- .../java/misc/migration/v1_1/ETestBinary.java | 6 ++-- .../java/misc/migration/v1_1/ETestJson.java | 6 ++-- .../java/misc/migration/v1_1/ETestLob.java | 8 +++--- .../misc/migration/v1_1/ETestVarchar.java | 8 +++--- .../test/java/misc/migration/v1_1/EUser.java | 6 ++-- .../java/misc/migration/v1_1/MtmChild.java | 8 +++--- .../java/misc/migration/v1_1/MtmMaster.java | 2 +- .../java/misc/migration/v1_1/OtoChild.java | 8 +++--- .../java/misc/migration/v1_1/OtoMaster.java | 2 +- .../java/misc/migration/v1_2/CKeyAssoc.java | 6 ++-- .../java/misc/migration/v1_2/CKeyDetail.java | 6 ++-- .../java/misc/migration/v1_2/CKeyParent.java | 8 +++--- .../misc/migration/v1_2/CKeyParentId.java | 2 +- .../java/misc/migration/v1_2/DfkCascade.java | 8 +++--- .../misc/migration/v1_2/DfkCascadeOne.java | 2 +- .../java/misc/migration/v1_2/DfkNone.java | 8 +++--- .../misc/migration/v1_2/DfkNoneViaJoin.java | 2 +- .../test/java/misc/migration/v1_2/DfkOne.java | 6 ++-- .../java/misc/migration/v1_2/DfkSetNull.java | 8 +++--- .../test/java/misc/migration/v1_2/EBasic.java | 2 +- .../test/java/misc/migration/v1_2/EEnum.java | 6 ++-- .../java/misc/migration/v1_2/EHistory.java | 6 ++-- .../java/misc/migration/v1_2/EHistory2.java | 6 ++-- .../java/misc/migration/v1_2/EHistory3.java | 6 ++-- .../java/misc/migration/v1_2/EHistory4.java | 6 ++-- .../java/misc/migration/v1_2/EHistory5.java | 6 ++-- .../java/misc/migration/v1_2/EHistory6.java | 6 ++-- .../java/misc/migration/v1_2/EQuoted.java | 6 ++-- .../test/java/misc/migration/v1_2/ERef.java | 8 +++--- .../java/misc/migration/v1_2/ESoftdelete.java | 6 ++-- .../test/java/misc/migration/v1_2/ETable.java | 2 +- .../java/misc/migration/v1_2/MtmChild.java | 6 ++-- .../java/misc/migration/v1_2/MtmMaster.java | 6 ++-- .../java/misc/migration/v1_2/OtoChild.java | 6 ++-- .../java/misc/migration/v1_2/OtoMaster.java | 6 ++-- .../src/test/java/org/etest/BSimpleFor.java | 8 +++--- .../multitenant/partition/MtBaseDomain.java | 6 ++-- .../org/multitenant/partition/MtContent.java | 2 +- .../org/multitenant/partition/MtNone.java | 6 ++-- .../org/multitenant/partition/MtTenant.java | 6 ++-- .../multitenant/partition/MtTenantAware.java | 4 +-- .../aggregateformula/IAFBaseSegment.java | 2 +- .../aggregateformula/IAFPartialSegment.java | 8 +++--- .../aggregateformula/IAFSegmentStatus.java | 6 ++-- .../org/tests/basic/TestAnnotationBase.java | 4 +-- .../org/tests/basic/TestErrorBindLog.java | 2 +- .../java/org/tests/basic/TestIUDVanilla.java | 2 +- .../org/tests/basic/TestMetaAnnotation.java | 2 +- .../tests/basic/TestPersistenceContext.java | 6 ++-- .../basic/TestPersistenceContextMany.java | 14 +++++----- .../java/org/tests/basic/one2one/Booking.java | 2 +- .../java/org/tests/basic/one2one/Invoice.java | 2 +- .../java/org/tests/basic/one2one/Tire.java | 2 +- .../java/org/tests/basic/one2one/Wheel.java | 2 +- .../org/tests/basic/type/BSimpleWithGen.java | 6 ++-- .../TestBatchOnCascadeExceptionHandling.java | 2 +- .../batchinsert/o2o/MeterAddressData.java | 4 +-- .../batchinsert/o2o/MeterContractData.java | 8 +++--- .../o2o/MeterSpecialNeedsClient.java | 8 +++--- .../o2o/MeterSpecialNeedsContact.java | 4 +-- .../tests/batchinsert/o2o/MeterVersion.java | 8 +++--- .../batchload/TestBatchLazyWithDeleted.java | 2 +- .../TestLazyLoadNonExistantBean.java | 2 +- .../TestLazyLoadNonExistentBean.java | 2 +- .../tests/cache/embeddedid/CEPCategory.java | 6 ++-- .../tests/cache/embeddedid/CEPProduct.java | 2 +- .../cache/embeddedid/CEPProductCategory.java | 8 +++--- .../embeddedid/CEPProductCategoryId.java | 2 +- .../org/tests/cache/embeddedid/Concept.java | 2 +- .../org/tests/cache/embeddedid/Concept2.java | 2 +- .../org/tests/cache/embeddedid/ConceptId.java | 2 +- .../tests/cache/embeddedid/Connection.java | 2 +- .../cache/personinfo/PersonCacheEmail.java | 6 ++-- .../cache/personinfo/PersonCacheInfo.java | 4 +-- .../tests/cache/personinfo/PersonOther.java | 6 ++-- .../test/java/org/tests/cascade/COOne.java | 8 +++--- .../java/org/tests/cascade/COOneMany.java | 4 +-- .../test/java/org/tests/cascade/CORoot.java | 8 +++--- .../tests/cascade/OmCacheOrderedDetail.java | 8 +++--- .../tests/cascade/OmCacheOrderedMaster.java | 2 +- .../org/tests/cascade/OmOrderedDetail.java | 8 +++--- .../org/tests/cascade/OmOrderedMaster.java | 2 +- .../java/org/tests/cascade/RelDetail.java | 2 +- .../java/org/tests/cascade/RelMaster.java | 2 +- ...TestPrivateOwnedIgnoreTransientOrphan.java | 2 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 2 +- .../org/tests/compositekeys/db/AuditInfo.java | 2 +- .../org/tests/compositekeys/db/CaoBean.java | 2 +- .../org/tests/compositekeys/db/CaoKey.java | 2 +- .../java/org/tests/compositekeys/db/Item.java | 2 +- .../org/tests/compositekeys/db/ItemKey.java | 4 +-- .../org/tests/compositekeys/db/Parcel.java | 6 ++-- .../compositekeys/db/ParcelLocation.java | 2 +- .../org/tests/compositekeys/db/Region.java | 2 +- .../org/tests/compositekeys/db/RegionKey.java | 2 +- .../org/tests/compositekeys/db/SubType.java | 6 ++-- .../tests/compositekeys/db/SubTypeKey.java | 2 +- .../java/org/tests/compositekeys/db/Type.java | 2 +- .../org/tests/compositekeys/db/TypeKey.java | 2 +- .../test/java/org/tests/ddl/DfkCascade.java | 6 ++-- .../java/org/tests/ddl/DfkCascadeOne.java | 8 +++--- .../src/test/java/org/tests/ddl/DfkNone.java | 6 ++-- .../java/org/tests/ddl/DfkNoneViaJoin.java | 2 +- .../java/org/tests/ddl/DfkNoneViaMtoM.java | 8 +++--- .../src/test/java/org/tests/ddl/DfkOne.java | 4 +-- .../test/java/org/tests/ddl/DfkSetNull.java | 6 ++-- .../tests/defaultvalues/DefaultsModel.java | 8 +++--- .../ReferencedDefaultsModel.java | 4 +-- .../test/java/org/tests/delete/DcDetail.java | 6 ++-- .../test/java/org/tests/delete/DcMaster.java | 2 +- .../java/org/tests/draftable/DocLinkTest.java | 2 +- .../org/tests/expression/bitwise/BwBean.java | 6 ++-- .../java/org/tests/idkeys/db/AuditLog.java | 4 +-- .../java/org/tests/idkeys/db/EaObject.java | 2 +- .../org/tests/idkeys/db/GenKeyIdentity.java | 8 +++--- .../java/org/tests/idkeys/db/GenKeySeqA.java | 8 +++--- .../java/org/tests/idkeys/db/GenKeySeqB.java | 2 +- .../test/java/org/tests/inherit/ChildA.java | 4 +-- .../test/java/org/tests/inherit/ChildB.java | 4 +-- .../java/org/tests/inherit/DIntChild1.java | 4 +-- .../java/org/tests/inherit/DIntChild2.java | 4 +-- .../java/org/tests/inherit/DIntChildBase.java | 2 +- .../java/org/tests/inherit/DIntParent.java | 2 +- .../src/test/java/org/tests/inherit/Data.java | 2 +- .../test/java/org/tests/inherit/EUncle.java | 2 +- .../test/java/org/tests/inherit/Parent.java | 2 +- .../org/tests/inherit/ParentAggregate.java | 4 +-- .../org/tests/inheritance/InnerReport.java | 2 +- .../tests/inheritance/OrganizationNode.java | 2 +- .../inheritance/OrganizationTreeNode.java | 10 +++---- .../tests/inheritance/OrganizationUnit.java | 4 +-- .../org/tests/inheritance/Stockforecast.java | 2 +- .../abstrakt/AbstractBaseBlock.java | 2 +- .../org/tests/inheritance/abstrakt/Block.java | 4 +-- .../tests/inheritance/bothsides/SourceA.java | 6 ++-- .../tests/inheritance/bothsides/SourceB.java | 6 ++-- .../inheritance/bothsides/SourceBase.java | 4 +-- .../tests/inheritance/bothsides/Target1.java | 2 +- .../tests/inheritance/bothsides/Target2.java | 2 +- .../inheritance/bothsides/TargetBase.java | 4 +-- .../bothsides/WithAutoGeneratedUUID.java | 4 +-- .../tests/inheritance/cache/CIAddress.java | 4 +-- .../tests/inheritance/cache/CIBaseModel.java | 4 +-- .../tests/inheritance/cache/CICustomer.java | 4 +-- .../inheritance/cache/CICustomerParent.java | 2 +- .../org/tests/inheritance/cache/CIStreet.java | 8 +++--- .../inheritance/cache/CIStreetParent.java | 2 +- .../cascadedelete/ComplexBean.java | 6 ++-- .../cascadedelete/ElementBean.java | 6 ++-- .../cascadedelete/ReferencingBean.java | 10 +++---- .../inheritance/cascadedelete/RootBean.java | 2 +- .../inheritance/cascadedelete/SimpleBean.java | 2 +- .../company/domain/AbstractBar.java | 2 +- .../company/domain/ConcreteBar.java | 4 +-- .../tests/inheritance/company/domain/Foo.java | 2 +- .../inheritance/model/AbstractBaseClass.java | 2 +- .../inheritance/model/CalculationResult.java | 2 +- .../inheritance/model/Configuration.java | 2 +- .../inheritance/model/Configurations.java | 8 +++--- .../inheritance/model/GroupConfiguration.java | 6 ++-- .../model/ProductConfiguration.java | 6 ++-- .../order/OrderMasterInheritance.java | 2 +- .../org/tests/inheritance/order/OrderedA.java | 2 +- .../org/tests/inheritance/order/OrderedB.java | 2 +- .../inheritance/order/OrderedParent.java | 6 ++-- .../java/org/tests/insert/EIdUidBean.java | 8 +++--- .../java/org/tests/insert/OnlyIdEntity.java | 4 +-- .../test/java/org/tests/iud/PcfCalendar.java | 6 ++-- .../src/test/java/org/tests/iud/PcfCity.java | 6 ++-- .../test/java/org/tests/iud/PcfCountry.java | 6 ++-- .../src/test/java/org/tests/iud/PcfEvent.java | 2 +- .../src/test/java/org/tests/iud/PcfModel.java | 6 ++-- .../test/java/org/tests/iud/PcfPerson.java | 6 ++-- .../java/org/tests/json/TestDbJson_List.java | 2 +- .../EJsonJacksonIgnore.java | 4 +-- .../EJsonTransientEntityList.java | 6 ++-- .../EJsonTransientList.java | 6 ++-- .../EJsonTransientObject.java | 6 ++-- .../json/transientproperties/ModelA.java | 6 ++-- .../json/transientproperties/ModelB.java | 2 +- .../org/tests/lazyforeignkeys/MainEntity.java | 6 ++-- .../lazyforeignkeys/MainEntityRelation.java | 2 +- .../org/tests/lazyloadconf/AppConfig.java | 2 +- .../tests/lazyloadconf/AppConfigControl.java | 2 +- .../org/tests/lazyloadconf/Relationship.java | 2 +- .../src/test/java/org/tests/level/Level1.java | 2 +- .../src/test/java/org/tests/level/Level2.java | 2 +- .../src/test/java/org/tests/level/Level3.java | 4 +-- .../src/test/java/org/tests/level/Level4.java | 4 +-- .../lifecycle/TestLifecycleExceptions.java | 2 +- .../org/tests/m2m/softdelete/MsManyA.java | 6 ++-- .../org/tests/m2m/softdelete/MsManyB.java | 6 ++-- .../test/java/org/tests/merge/MAddress.java | 2 +- .../src/test/java/org/tests/merge/MBase.java | 8 +++--- .../test/java/org/tests/merge/MContact.java | 8 +++--- .../java/org/tests/merge/MContactMessage.java | 4 +-- .../test/java/org/tests/merge/MCustomer.java | 8 +++--- .../src/test/java/org/tests/merge/MGroup.java | 4 +-- .../test/java/org/tests/merge/MMachine.java | 8 +++--- .../test/java/org/tests/model/BaseModel.java | 6 ++-- .../test/java/org/tests/model/EGenProps.java | 6 ++-- .../test/java/org/tests/model/EWhoProps.java | 2 +- .../java/org/tests/model/EWhoPropsSuper.java | 6 ++-- .../org/tests/model/aggregation/DMachine.java | 2 +- .../model/aggregation/DMachineAuxUse.java | 2 +- .../model/aggregation/DMachineAuxUseAgg.java | 6 ++-- .../model/aggregation/DMachineStats.java | 2 +- .../model/aggregation/DMachineStatsAgg.java | 6 ++-- .../tests/model/aggregation/DMachineUse.java | 2 +- .../org/tests/model/aggregation/DOrg.java | 6 ++-- .../tests/model/aggregation/Decimal93.java | 2 +- .../org/tests/model/array/EArrayBean.java | 6 ++-- .../org/tests/model/array/EArraySetBean.java | 6 ++-- .../java/org/tests/model/basic/Address.java | 2 +- .../java/org/tests/model/basic/Animal.java | 2 +- .../org/tests/model/basic/AnimalShelter.java | 10 +++---- .../java/org/tests/model/basic/Article.java | 6 ++-- .../java/org/tests/model/basic/Attribute.java | 2 +- .../tests/model/basic/AttributeHolder.java | 6 ++-- .../java/org/tests/model/basic/BBookmark.java | 2 +- .../org/tests/model/basic/BBookmarkOrg.java | 6 ++-- .../org/tests/model/basic/BBookmarkUser.java | 8 +++--- .../org/tests/model/basic/BWithQIdent.java | 8 +++--- .../org/tests/model/basic/BasicDomain.java | 6 ++-- .../tests/model/basic/BeanWithTimeZone.java | 4 +-- .../java/org/tests/model/basic/BigDog.java | 4 +-- .../java/org/tests/model/basic/CKeyAssoc.java | 4 +-- .../org/tests/model/basic/CKeyDetail.java | 6 ++-- .../org/tests/model/basic/CKeyParent.java | 2 +- .../org/tests/model/basic/CKeyParentId.java | 2 +- .../test/java/org/tests/model/basic/Car.java | 2 +- .../org/tests/model/basic/CarAccessory.java | 4 +-- .../java/org/tests/model/basic/CarFuse.java | 4 +-- .../test/java/org/tests/model/basic/Cat.java | 4 +-- .../java/org/tests/model/basic/Contact.java | 2 +- .../org/tests/model/basic/ContactGroup.java | 2 +- .../org/tests/model/basic/ContactNote.java | 6 ++-- .../java/org/tests/model/basic/Country.java | 6 ++-- .../java/org/tests/model/basic/Customer.java | 2 +- .../tests/model/basic/CustomerAggregate.java | 4 +-- .../test/java/org/tests/model/basic/Dog.java | 4 +-- .../java/org/tests/model/basic/EBasic.java | 6 ++-- .../tests/model/basic/EBasicChangeLog.java | 6 ++-- .../org/tests/model/basic/EBasicClob.java | 8 +++--- .../model/basic/EBasicClobFetchEager.java | 2 +- .../tests/model/basic/EBasicClobNoVer.java | 2 +- .../model/basic/EBasicClobNoVerChild.java | 6 ++-- .../org/tests/model/basic/EBasicEncrypt.java | 2 +- .../model/basic/EBasicEncryptBinary.java | 2 +- .../model/basic/EBasicEncryptClient.java | 2 +- .../model/basic/EBasicEncryptRelate.java | 8 +++--- .../org/tests/model/basic/EBasicEnumId.java | 6 ++-- .../org/tests/model/basic/EBasicEnumInt.java | 6 ++-- .../java/org/tests/model/basic/EBasicLog.java | 6 ++-- .../basic/EBasicNoDefaultConstructor.java | 6 ++-- .../org/tests/model/basic/EBasicTree.java | 12 ++++---- .../java/org/tests/model/basic/EBasicVer.java | 8 +++--- .../model/basic/EBasicWithLifecycle.java | 2 +- .../basic/EBasicWithLifecycleExceptions.java | 2 +- .../org/tests/model/basic/EBasicWithLog.java | 2 +- .../model/basic/EBasicWithUniqueCon.java | 2 +- .../java/org/tests/model/basic/ECustomId.java | 6 ++-- .../org/tests/model/basic/EDefaultProp.java | 8 +++--- .../tests/model/basic/ENullCollection.java | 8 +++--- .../model/basic/ENullCollectionDetail.java | 4 +-- .../java/org/tests/model/basic/EOptOneA.java | 4 +-- .../java/org/tests/model/basic/EOptOneB.java | 4 +-- .../java/org/tests/model/basic/EOptOneC.java | 2 +- .../java/org/tests/model/basic/ESimple.java | 2 +- .../java/org/tests/model/basic/ESomeType.java | 4 +-- .../org/tests/model/basic/ETransMany.java | 6 ++-- .../tests/model/basic/EVanillaCollection.java | 8 +++--- .../model/basic/EVanillaCollectionDetail.java | 4 +-- .../org/tests/model/basic/EWithInetAddr.java | 8 +++--- .../tests/model/basic/FeatureDescription.java | 8 +++--- .../basic/L2CachedLazyDirtFlagResetBean.java | 2 +- .../L2CachedLazyDirtFlagResetBeanChild.java | 2 +- .../org/tests/model/basic/ListAttribute.java | 8 +++--- .../tests/model/basic/ListAttributeValue.java | 6 ++-- .../tests/model/basic/MNonUpdPropEntity.java | 2 +- .../model/basic/MProtectedConstructBean.java | 4 +-- .../java/org/tests/model/basic/MRole.java | 2 +- .../java/org/tests/model/basic/MUser.java | 2 +- .../java/org/tests/model/basic/MUserType.java | 6 ++-- .../java/org/tests/model/basic/MnocRole.java | 6 ++-- .../java/org/tests/model/basic/MnocUser.java | 2 +- .../java/org/tests/model/basic/MyAdHoc.java | 4 +-- .../java/org/tests/model/basic/MyLobSize.java | 2 +- .../tests/model/basic/MyLobSizeJoinMany.java | 2 +- .../org/tests/model/basic/OBeanChild.java | 8 +++--- .../org/tests/model/basic/OCachedBean.java | 2 +- .../tests/model/basic/OCachedBeanChild.java | 8 +++--- .../tests/model/basic/OCachedInhChildA.java | 4 +-- .../tests/model/basic/OCachedInhChildB.java | 4 +-- .../org/tests/model/basic/OCachedInhRoot.java | 8 +++--- .../test/java/org/tests/model/basic/OCar.java | 6 ++-- .../java/org/tests/model/basic/OEngine.java | 8 +++--- .../java/org/tests/model/basic/OGearBox.java | 2 +- .../java/org/tests/model/basic/Order.java | 2 +- .../org/tests/model/basic/OrderAggregate.java | 4 +-- .../org/tests/model/basic/OrderDetail.java | 2 +- .../org/tests/model/basic/OrderShipment.java | 6 ++-- .../java/org/tests/model/basic/PFile.java | 6 ++-- .../org/tests/model/basic/PFileContent.java | 4 +-- .../org/tests/model/basic/PersistentFile.java | 6 ++-- .../model/basic/PersistentFileContent.java | 8 +++--- .../java/org/tests/model/basic/Person.java | 4 +-- .../java/org/tests/model/basic/Phone.java | 4 +-- .../java/org/tests/model/basic/Product.java | 8 +++--- .../java/org/tests/model/basic/Section.java | 2 +- .../org/tests/model/basic/SomeEnumBean.java | 6 ++-- .../org/tests/model/basic/SubSection.java | 4 +-- .../org/tests/model/basic/TBytesOnly.java | 2 +- .../java/org/tests/model/basic/TIntChild.java | 6 ++-- .../java/org/tests/model/basic/TIntRoot.java | 2 +- .../org/tests/model/basic/TJodaEntity.java | 4 +-- .../tests/model/basic/TMapSuperEntity.java | 6 ++-- .../org/tests/model/basic/TMappedSuper2.java | 6 ++-- .../test/java/org/tests/model/basic/TOne.java | 6 ++-- .../java/org/tests/model/basic/TSDetail.java | 2 +- .../java/org/tests/model/basic/TSMaster.java | 2 +- .../org/tests/model/basic/TUuidEntity.java | 4 +-- .../org/tests/model/basic/TWithPreInsert.java | 8 +++--- .../model/basic/TWithPreInsertChild.java | 4 +-- .../java/org/tests/model/basic/TreeNode.java | 8 +++--- .../test/java/org/tests/model/basic/Trip.java | 4 +-- .../java/org/tests/model/basic/Truck.java | 2 +- .../java/org/tests/model/basic/TruckRef.java | 4 +-- .../java/org/tests/model/basic/UTDetail.java | 8 +++--- .../java/org/tests/model/basic/UTMaster.java | 2 +- .../java/org/tests/model/basic/UUOne.java | 2 +- .../java/org/tests/model/basic/UUTwo.java | 2 +- .../java/org/tests/model/basic/Vehicle.java | 8 +++--- .../org/tests/model/basic/VehicleDriver.java | 4 +-- .../org/tests/model/basic/VehicleLease.java | 8 +++--- .../tests/model/basic/VehicleLeaseLong.java | 6 ++-- .../tests/model/basic/VehicleLeaseShort.java | 6 ++-- .../org/tests/model/basic/VwCustomer.java | 2 +- .../org/tests/model/basic/cache/CInhOne.java | 6 ++-- .../org/tests/model/basic/cache/CInhRef.java | 4 +-- .../org/tests/model/basic/cache/CInhRoot.java | 6 ++-- .../org/tests/model/basic/cache/CInhTwo.java | 6 ++-- .../tests/model/basic/cache/ECacheChild.java | 8 +++--- .../tests/model/basic/cache/ECacheRoot.java | 6 ++-- .../model/basic/cache/ESoftWithCache.java | 8 +++--- .../tests/model/basic/cache/OCacheBase.java | 6 ++-- .../tests/model/basic/cache/OCachedApp.java | 4 +-- .../model/basic/cache/OCachedAppDetail.java | 6 ++-- .../model/basic/cache/OCachedNatKeyBean.java | 6 ++-- .../model/basic/cache/OCachedNatKeyBean3.java | 6 ++-- .../model/basic/cache/OCachedNkeyUid.java | 2 +- .../org/tests/model/basic/first/First.java | 2 +- .../org/tests/model/basic/first/Second.java | 2 +- .../tests/model/basic/first/SuperSecond.java | 8 +++--- .../model/basic/mapsuper/MapSuperActual.java | 4 +-- .../model/basic/mapsuper/MapSuperNoId.java | 4 +-- .../tests/model/basic/relates/Relation1.java | 8 +++--- .../tests/model/basic/relates/Relation2.java | 8 +++--- .../tests/model/basic/relates/Relation3.java | 4 +-- .../tests/model/basic/relates/Relation4.java | 4 +-- .../org/tests/model/basic/xtra/EdChild.java | 2 +- .../model/basic/xtra/EdExtendedParent.java | 4 +-- .../org/tests/model/basic/xtra/EdParent.java | 2 +- .../OptimisticLockExceptionThrowingDao.java | 2 +- .../java/org/tests/model/bridge/BDManyId.java | 2 +- .../java/org/tests/model/bridge/BEmbId.java | 2 +- .../java/org/tests/model/bridge/BSite.java | 6 ++-- .../org/tests/model/bridge/BSiteUserA.java | 2 +- .../org/tests/model/bridge/BSiteUserB.java | 2 +- .../org/tests/model/bridge/BSiteUserC.java | 2 +- .../org/tests/model/bridge/BSiteUserD.java | 2 +- .../tests/model/bridge/BSiteUserDMany.java | 8 +++--- .../org/tests/model/bridge/BSiteUserE.java | 8 +++--- .../java/org/tests/model/bridge/BUser.java | 4 +-- .../java/org/tests/model/cache/EColAB.java | 6 ++-- .../org/tests/model/cache/M2MCacheChild.java | 4 +-- .../org/tests/model/cache/M2MCacheMaster.java | 2 +- .../java/org/tests/model/carwheel/Car.java | 2 +- .../java/org/tests/model/carwheel/Tire.java | 2 +- .../java/org/tests/model/carwheel/Wheel.java | 2 +- .../org/tests/model/carwheeltruck/TCar.java | 2 +- .../org/tests/model/carwheeltruck/TTruck.java | 2 +- .../model/carwheeltruck/TTruckHolder.java | 4 +-- .../model/carwheeltruck/TTruckHolderItem.java | 6 ++-- .../org/tests/model/carwheeltruck/TWheel.java | 6 ++-- .../org/tests/model/composite/CkeClient.java | 2 +- .../tests/model/composite/CkeClientKey.java | 6 ++-- .../org/tests/model/composite/CkeUser.java | 4 +-- .../org/tests/model/composite/CkeUserKey.java | 6 ++-- .../org/tests/model/composite/RCustomer.java | 4 +-- .../tests/model/composite/RCustomerKey.java | 2 +- .../org/tests/model/composite/ROrder.java | 2 +- .../org/tests/model/composite/ROrderPK.java | 2 +- .../model/controller/FindControllerMain.java | 6 ++-- .../org/tests/model/controller/SoftRefA.java | 4 +-- .../org/tests/model/controller/SoftRefB.java | 4 +-- .../model/converstation/Conversation.java | 2 +- .../org/tests/model/converstation/Group.java | 6 ++-- .../tests/model/converstation/Message.java | 6 ++-- .../model/converstation/Participation.java | 6 ++-- .../org/tests/model/converstation/User.java | 6 ++-- .../java/org/tests/model/ddd/DExhEntity.java | 6 ++-- .../java/org/tests/model/ddd/DPerson.java | 4 +-- .../tests/model/docstore/CustomerReport.java | 6 ++-- .../tests/model/docstore/ProductReport.java | 4 +-- .../java/org/tests/model/docstore/Report.java | 4 +-- .../org/tests/model/draftable/BaseDomain.java | 6 ++-- .../model/draftable/BasicDraftableBean.java | 2 +- .../java/org/tests/model/draftable/Doc.java | 6 ++-- .../org/tests/model/draftable/Document.java | 8 +++--- .../tests/model/draftable/DocumentMedia.java | 4 +-- .../java/org/tests/model/draftable/Link.java | 6 ++-- .../tests/model/draftable/Organisation.java | 2 +- .../model/elementcollection/EcEnumPerson.java | 8 +++--- .../model/elementcollection/EcPerson.java | 2 +- .../model/elementcollection/EcPhone.java | 4 +-- .../tests/model/elementcollection/EcTop.java | 4 +-- .../model/elementcollection/EcblPerson.java | 2 +- .../model/elementcollection/EcblPerson2.java | 2 +- .../model/elementcollection/EcbmPerson.java | 2 +- .../model/elementcollection/EcmPerson.java | 2 +- .../model/elementcollection/EcmcPerson.java | 2 +- .../model/elementcollection/EcsPerson.java | 2 +- .../model/elementcollection/EcsmChild.java | 2 +- .../model/elementcollection/EcsmOne.java | 2 +- .../model/elementcollection/EcsmParent.java | 10 +++---- .../model/elementcollection/EcsmTwo.java | 2 +- .../java/org/tests/model/embedded/EAddr.java | 4 +-- .../org/tests/model/embedded/EAddress.java | 8 +++--- .../tests/model/embedded/EEmbDatePeriod.java | 2 +- .../org/tests/model/embedded/EEmbInner.java | 2 +- .../org/tests/model/embedded/EEmbOuter.java | 2 +- .../org/tests/model/embedded/EInvoice.java | 2 +- .../java/org/tests/model/embedded/EMain.java | 2 +- .../org/tests/model/embedded/EPerAddr.java | 8 +++--- .../org/tests/model/embedded/EPerson.java | 2 +- .../org/tests/model/embedded/EPerson2.java | 2 +- .../org/tests/model/embedded/EPerson3.java | 2 +- .../org/tests/model/embedded/Eembeddable.java | 2 +- .../tests/model/embedded/EmbArrayMaster.java | 2 +- .../tests/model/embedded/PrimaryRevision.java | 2 +- .../org/tests/model/embedded/RevisionId.java | 2 +- .../model/embedded/UserInterestLive.java | 4 +-- .../model/embedded/UserInterestLiveKey.java | 2 +- .../org/tests/model/family/ChildPerson.java | 6 ++-- .../tests/model/family/GrandParentPerson.java | 2 +- .../tests/model/family/InheritablePerson.java | 6 ++-- .../org/tests/model/family/ParentPerson.java | 2 +- .../org/tests/model/generated/MyPart.java | 8 +++--- .../java/org/tests/model/generated/User.java | 2 +- .../model/generated/WhoPropsOneToMany.java | 2 +- .../org/tests/model/history/HEmbiBean.java | 6 ++-- .../java/org/tests/model/history/HEmbiId.java | 2 +- .../java/org/tests/model/history/HeDoc.java | 4 +-- .../java/org/tests/model/history/HeLink.java | 6 ++-- .../java/org/tests/model/history/HiDoc.java | 4 +-- .../java/org/tests/model/history/HiLink.java | 4 +-- .../java/org/tests/model/history/HiTOne.java | 6 ++-- .../org/tests/model/history/HiTThree.java | 2 +- .../java/org/tests/model/history/HiTTwo.java | 6 ++-- .../tests/model/history/HistoryOneToOne.java | 6 ++-- .../model/history/HistorylessOneToOne.java | 6 ++-- .../org/tests/model/history/HsdSetting.java | 4 +-- .../java/org/tests/model/history/HsdUser.java | 8 +++--- .../org/tests/model/info/InfoCompany.java | 2 +- .../org/tests/model/info/InfoContact.java | 8 +++--- .../org/tests/model/info/InfoCustomer.java | 2 +- .../model/inheritexposedtype/IXPhoto.java | 4 +-- .../model/inheritexposedtype/IXResource.java | 2 +- .../tests/model/inheritmany/IMRelated.java | 6 ++-- .../org/tests/model/inheritmany/IMRoot.java | 2 +- .../tests/model/inheritmany/IMRootOne.java | 4 +-- .../tests/model/inheritmany/IMRootTwo.java | 4 +-- .../org/tests/model/inheritmany/MBase.java | 4 +-- .../org/tests/model/inheritmany/MMedia.java | 2 +- .../org/tests/model/inheritmany/MPicture.java | 4 +-- .../org/tests/model/inheritmany/MProfile.java | 6 ++-- .../org/tests/model/interfaces/Address.java | 8 +++--- .../org/tests/model/interfaces/Person.java | 2 +- .../org/tests/model/interfaces/Persona.java | 2 +- .../tests/model/interfaces/SelfManyMany.java | 2 +- .../org/tests/model/ivo/ESomeConvertType.java | 4 +-- .../ivo/converter/MoneyTypeConverter.java | 2 +- .../org/tests/model/joda/BasicJodaEntity.java | 6 ++-- .../org/tests/model/join/AccountAccess.java | 4 +-- .../org/tests/model/join/BankAccount.java | 4 +-- .../org/tests/model/join/CustomerAccess.java | 4 +-- .../java/org/tests/model/join/HAccess.java | 2 +- .../java/org/tests/model/join/HAccount.java | 2 +- .../java/org/tests/model/join/HCustomer.java | 4 +-- .../org/tests/model/json/EBasicHstore.java | 6 ++-- .../tests/model/json/EBasicJsonBString.java | 6 ++-- .../tests/model/json/EBasicJsonJackson.java | 6 ++-- .../tests/model/json/EBasicJsonJackson2.java | 6 ++-- .../tests/model/json/EBasicJsonJackson3.java | 6 ++-- .../org/tests/model/json/EBasicJsonList.java | 6 ++-- .../org/tests/model/json/EBasicJsonMap.java | 2 +- .../tests/model/json/EBasicJsonMapBlob.java | 6 ++-- .../tests/model/json/EBasicJsonMapClob.java | 6 ++-- .../tests/model/json/EBasicJsonMapDetail.java | 8 +++--- .../tests/model/json/EBasicJsonMapJsonB.java | 6 ++-- .../model/json/EBasicJsonMapVarchar.java | 6 ++-- .../org/tests/model/json/EBasicJsonMulti.java | 6 ++-- .../org/tests/model/json/EBasicJsonNode.java | 6 ++-- .../tests/model/json/EBasicJsonNodeBlob.java | 6 ++-- .../tests/model/json/EBasicJsonNodeJsonB.java | 6 ++-- .../model/json/EBasicJsonNodeVarchar.java | 6 ++-- .../tests/model/json/EBasicJsonString.java | 6 ++-- .../tests/model/json/EBasicJsonUnmapped.java | 6 ++-- .../org/tests/model/json/EBasicOldValue.java | 4 +-- .../org/tests/model/json/EBasicPlain.java | 6 ++-- .../model/lazywithcache/ChildWithCache.java | 8 +++--- .../tests/model/lazywithcache/ParentA.java | 6 ++-- .../tests/model/lazywithcache/ParentB.java | 6 ++-- .../org/tests/model/lazywithid/Looney.java | 6 ++-- .../java/org/tests/model/lazywithid/Tune.java | 2 +- .../java/org/tests/model/m2m/DCredit.java | 8 +++--- .../test/java/org/tests/model/m2m/DRol.java | 8 +++--- .../test/java/org/tests/model/m2m/DRot.java | 8 +++--- .../java/org/tests/model/m2m/MailBox.java | 6 ++-- .../java/org/tests/model/m2m/MailUser.java | 2 +- .../test/java/org/tests/model/m2m/MnyA.java | 6 ++-- .../test/java/org/tests/model/m2m/MnyB.java | 8 +++--- .../test/java/org/tests/model/m2m/MnyC.java | 4 +-- .../java/org/tests/model/m2m/MnyEdge.java | 6 ++-- .../java/org/tests/model/m2m/MnyNode.java | 2 +- .../java/org/tests/model/m2m/MnyTopic.java | 2 +- .../java/org/tests/model/m2m/Permission.java | 2 +- .../test/java/org/tests/model/m2m/Role.java | 2 +- .../test/java/org/tests/model/m2m/Tenant.java | 2 +- .../test/java/org/tests/model/m2o/Addr.java | 8 +++--- .../test/java/org/tests/model/m2o/Empl.java | 2 +- .../test/java/org/tests/model/map/MpRole.java | 4 +-- .../test/java/org/tests/model/map/MpUser.java | 2 +- .../tests/model/mappedsuper/ASimpleBean.java | 4 +-- .../mappedsuper/NotEnhancedMappedSuper.java | 4 +-- .../java/org/tests/model/nofk/EFile2NoFk.java | 6 ++-- .../java/org/tests/model/nofk/EFileNoFk.java | 8 +++--- .../java/org/tests/model/nofk/EUserNoFk.java | 6 ++-- .../tests/model/nofk/EUserNoFkSoftDel.java | 6 ++-- .../java/org/tests/model/nofk/Test2NoFk.java | 2 +- .../java/org/tests/model/nofk/TestNoFk.java | 2 +- .../java/org/tests/model/noid/NoIdBean.java | 4 +-- .../org/tests/model/onetoone/Account.java | 6 ++-- .../org/tests/model/onetoone/OCompany.java | 4 +-- .../tests/model/onetoone/ORoadShowMsg.java | 8 +++--- .../org/tests/model/onetoone/OtoAone.java | 4 +-- .../org/tests/model/onetoone/OtoAtwo.java | 8 +++--- .../org/tests/model/onetoone/OtoBChild.java | 2 +- .../org/tests/model/onetoone/OtoBMaster.java | 2 +- .../org/tests/model/onetoone/OtoChild.java | 6 ++-- .../tests/model/onetoone/OtoChildVersion.java | 2 +- .../org/tests/model/onetoone/OtoCust.java | 2 +- .../tests/model/onetoone/OtoCustAddress.java | 8 +++--- .../org/tests/model/onetoone/OtoMaster.java | 8 +++--- .../model/onetoone/OtoMasterVersion.java | 2 +- .../tests/model/onetoone/OtoNotification.java | 4 +-- .../org/tests/model/onetoone/OtoPrime.java | 2 +- .../tests/model/onetoone/OtoPrimeExtra.java | 6 ++-- .../org/tests/model/onetoone/OtoSdChild.java | 8 +++--- .../org/tests/model/onetoone/OtoSdMaster.java | 2 +- .../org/tests/model/onetoone/OtoThMany.java | 6 ++-- .../org/tests/model/onetoone/OtoThOne.java | 4 +-- .../org/tests/model/onetoone/OtoThTop.java | 6 ++-- .../org/tests/model/onetoone/OtoUBPrime.java | 8 +++--- .../tests/model/onetoone/OtoUBPrimeExtra.java | 2 +- .../org/tests/model/onetoone/OtoUPrime.java | 2 +- .../tests/model/onetoone/OtoUPrimeExtra.java | 6 ++-- .../org/tests/model/onetoone/OtoUser.java | 8 +++--- .../tests/model/onetoone/OtoUserOptional.java | 4 +-- .../java/org/tests/model/onetoone/User.java | 6 ++-- .../org/tests/model/onetoone/album/Album.java | 8 +++--- .../tests/model/onetoone/album/BaseModel.java | 4 +-- .../org/tests/model/onetoone/album/Cover.java | 6 ++-- .../tests/model/onetoone/calcd/CalcDData.java | 2 +- .../model/onetoone/calcd/CalcDInput.java | 2 +- .../tests/model/orderentity/OrderEntity.java | 2 +- .../model/orderentity/OrderItemEntity.java | 2 +- .../model/orphanremoval/OmBeanListChild.java | 8 +++--- .../model/orphanremoval/OmBeanListParent.java | 10 +++---- .../tests/model/orphanremoval/OrpDetail.java | 8 +++--- .../tests/model/orphanremoval/OrpDetail2.java | 6 ++-- .../tests/model/orphanremoval/OrpMaster.java | 2 +- .../tests/model/orphanremoval/OrpMaster2.java | 2 +- .../java/org/tests/model/prnt/MPrinter.java | 2 +- .../org/tests/model/prnt/MPrinterState.java | 2 +- .../java/org/tests/model/prnt/MSomeOther.java | 4 +-- .../java/org/tests/model/pview/Paggview.java | 8 +++--- .../java/org/tests/model/pview/Pview.java | 2 +- .../java/org/tests/model/pview/Wview.java | 2 +- .../tests/model/rawsql/ERawSqlAggBean.java | 2 +- .../tests/model/selfref/BaseResourceFile.java | 6 ++-- .../org/tests/model/selfref/ResourceFile.java | 2 +- .../org/tests/model/selfref/SelfParent.java | 2 +- .../tests/model/selfref/SelfRefCustomer.java | 2 +- .../tests/model/selfref/SelfRefExample.java | 2 +- .../model/selfref/TestSelfRefExample.java | 2 +- .../org/tests/model/site/DataContainer.java | 4 +-- .../test/java/org/tests/model/site/Site.java | 2 +- .../org/tests/model/site/SiteAddress.java | 4 +-- .../java/org/tests/model/site/TreeEntity.java | 10 +++---- .../model/softdelete/BaseSoftDelete.java | 6 ++-- .../model/softdelete/EBasicNoSDChild.java | 8 +++--- .../tests/model/softdelete/EBasicSDChild.java | 4 +-- .../model/softdelete/EBasicSoftDelete.java | 6 ++-- .../tests/model/softdelete/ESoftDelBook.java | 2 +- .../tests/model/softdelete/ESoftDelDown.java | 2 +- .../tests/model/softdelete/ESoftDelMid.java | 8 +++--- .../tests/model/softdelete/ESoftDelOneA.java | 2 +- .../tests/model/softdelete/ESoftDelOneB.java | 8 +++--- .../tests/model/softdelete/ESoftDelRole.java | 6 ++-- .../tests/model/softdelete/ESoftDelTop.java | 6 ++-- .../tests/model/softdelete/ESoftDelUp.java | 2 +- .../tests/model/softdelete/ESoftDelUser.java | 6 ++-- .../org/tests/model/softdelete/ESoftDelX.java | 8 +++--- .../org/tests/model/softdelete/ESoftDelY.java | 8 +++--- .../org/tests/model/softdelete/ESoftDelZ.java | 4 +-- .../org/tests/model/softdelete/EsdDetail.java | 4 +-- .../org/tests/model/softdelete/EsdMaster.java | 6 ++-- .../java/org/tests/model/survey/Category.java | 2 +- .../java/org/tests/model/survey/Group.java | 2 +- .../java/org/tests/model/survey/Question.java | 8 +++--- .../java/org/tests/model/survey/Survey.java | 2 +- .../java/org/tests/model/tevent/TEvent.java | 8 +++--- .../org/tests/model/tevent/TEventMany.java | 8 +++--- .../org/tests/model/tevent/TEventOne.java | 2 +- .../org/tests/model/types/SomeFileBean.java | 8 +++--- .../tests/model/types/SomeNewTypesBean.java | 8 +++--- .../org/tests/model/types/SomePeriodBean.java | 6 ++-- .../tests/model/uuidsibling/USibChild.java | 2 +- .../model/uuidsibling/USibChildSibling.java | 6 ++-- .../tests/model/uuidsibling/USibParent.java | 8 +++--- .../org/tests/model/version/VersionChild.java | 2 +- .../tests/model/version/VersionParent.java | 2 +- .../org/tests/model/version/VersionToy.java | 8 +++--- .../java/org/tests/model/view/EOrderAgg.java | 2 +- .../java/org/tests/model/zero/WithZero.java | 2 +- .../org/tests/model/zero/WithZeroParent.java | 2 +- .../src/test/java/org/tests/o2m/OMVertex.java | 8 +++--- .../java/org/tests/o2m/OMVertexOther.java | 4 +-- .../java/org/tests/o2m/OmAccountChildDBO.java | 6 ++-- .../test/java/org/tests/o2m/OmAccountDBO.java | 8 +++--- .../test/java/org/tests/o2m/OmBasicChild.java | 8 +++--- .../java/org/tests/o2m/OmBasicParent.java | 10 +++---- .../java/org/tests/o2m/dm/Attachment.java | 2 +- .../java/org/tests/o2m/dm/GoodsEntity.java | 2 +- .../java/org/tests/o2m/dm/HistoryColumns.java | 8 +++--- .../java/org/tests/o2m/dm/PersonEntity.java | 2 +- .../java/org/tests/o2m/dm/WorkflowEntity.java | 8 +++--- .../tests/o2m/dm/WorkflowOperationEntity.java | 6 ++-- .../org/tests/o2m/jointable/JtMonkey.java | 8 +++--- .../tests/o2m/jointable/JtMonkeyGroup.java | 2 +- .../org/tests/o2m/jointable/JtTrainer.java | 2 +- .../java/org/tests/o2m/jointable/JtTroop.java | 2 +- .../o2m/jointable/inheritance/ClassA.java | 2 +- .../o2m/jointable/inheritance/ClassB.java | 2 +- .../o2m/jointable/inheritance/ClassSuper.java | 2 +- .../test/java/org/tests/o2m/lazy/OmlBar.java | 2 +- .../test/java/org/tests/o2m/lazy/OmlBaz.java | 8 +++--- .../test/java/org/tests/o2m/lazy/OmlFoo.java | 2 +- .../java/org/tests/o2m/recurse/RMItem.java | 2 +- .../org/tests/o2m/recurse/RMItemHolder.java | 8 +++--- .../test/java/org/tests/o2o/OtoLevelA.java | 8 +++--- .../test/java/org/tests/o2o/OtoLevelB.java | 8 +++--- .../test/java/org/tests/o2o/OtoLevelC.java | 4 +-- .../java/org/tests/order/OrderMaster.java | 8 +++--- .../org/tests/order/OrderReferencedChild.java | 2 +- .../tests/order/OrderReferencedParent.java | 2 +- .../test/java/org/tests/order/OrderToy.java | 6 ++-- .../org/tests/query/TestInvalidFetchPath.java | 2 +- .../org/tests/query/TestQueryFindIterate.java | 2 +- .../tests/query/TestQueryFindPagedList.java | 2 +- .../test/java/org/tests/query/cache/Acl.java | 6 ++-- .../query/cache/AclContainerRelation.java | 2 +- .../java/org/tests/query/cache/Contract.java | 2 +- .../org/tests/query/cache/ContractCosts.java | 8 +++--- .../java/org/tests/query/cache/Position.java | 2 +- .../query/cancel/SqlQueryCancelTest.java | 2 +- .../java/org/tests/rawsql/A2Customer.java | 2 +- .../test/java/org/tests/rawsql/ACustomer.java | 4 +-- .../tests/rawsql/transport/SampleReport.java | 2 +- .../test/java/org/tests/sets/M2MDepart.java | 6 ++-- .../src/test/java/org/tests/sets/M2MEmp.java | 2 +- .../test/java/org/tests/sets/MapDepart.java | 2 +- .../test/java/org/tests/sets/MapDepart2.java | 2 +- .../src/test/java/org/tests/sets/MapEmp.java | 6 ++-- .../src/test/java/org/tests/sets/MapEmp2.java | 6 ++-- .../test/java/org/tests/sets/O2MDepart.java | 2 +- .../src/test/java/org/tests/sets/O2MEmp.java | 2 +- .../model/PalletLocation.java | 2 +- .../model/PalletLocationExternal.java | 4 +-- .../model/Warehouse.java | 2 +- .../singleTableInheritance/model/Zone.java | 2 +- .../model/ZoneExternal.java | 4 +-- .../model/ZoneInternal.java | 4 +-- .../java/org/tests/sp/model/IdEntity.java | 2 +- .../test/java/org/tests/sp/model/car/Car.java | 2 +- .../java/org/tests/sp/model/car/Door.java | 4 +-- .../java/org/tests/sp/model/car/Wheel.java | 4 +-- .../java/org/tests/timezone/MLocalTime.java | 4 +-- .../test/java/org/tests/timezone/TzBean.java | 8 +++--- .../tests/transaction/TestBeanStateReset.java | 2 +- .../TestBeginTransactionWithExisting.java | 2 +- .../org/tests/transaction/TestNested.java | 2 +- .../transaction/TestTransactionCallback.java | 2 +- .../transaction/TestTransactionalNever.java | 2 +- ...TransactionNotTerminatedAfterRollback.java | 8 +++--- .../org/tests/types/PasswordStoreModel.java | 6 ++-- .../TestTxTypeOnTransactional.java | 2 +- .../java/org/tests/update/EPersonOnline.java | 6 ++-- .../org/tests/update/TestStatelessUpdate.java | 4 +-- .../java/org/tests/update/objects/Child.java | 2 +- .../java/org/tests/update/objects/Parent.java | 2 +- .../org/tests/update/objects/SiblingA.java | 2 +- .../org/tests/update/objects/SiblingB.java | 2 +- .../ebean/querybean/generator/Constants.java | 12 ++++---- .../generator/ProcessingContext.java | 2 +- .../postgres/PostgresPlatformProvider.java | 2 +- .../ebean/querybean/generator/Constants.java | 12 ++++---- .../generator/ProcessingContext.java | 2 +- tests/test-java16/pom.xml | 2 +- .../java/org/example/records/Address.java | 2 +- .../java/org/example/records/BaseModel.java | 6 ++-- .../java/org/example/records/Contact.java | 8 +++--- .../main/java/org/example/records/Course.java | 6 ++-- .../example/records/CourseRecordEntity.java | 6 ++-- .../org/example/records/CustomAccessors.java | 2 +- .../example/records/CustomConstructor.java | 2 +- .../org/example/records/CustomEquals.java | 2 +- .../org/example/records/CustomToString.java | 2 +- .../java/org/example/records/UserRole.java | 6 ++-- .../java/org/example/records/UserRoleId.java | 2 +- .../java/org/example/records/UserSite.java | 2 +- .../java/org/example/records/UserSiteId.java | 2 +- .../main/kotlin/org/example/domain/Address.kt | 4 +-- .../kotlin/org/example/domain/BaseModel.kt | 6 ++-- .../kotlin/org/example/domain/MyKotInner.kt | 2 +- .../GenericTypeAttributeConverter.kt | 4 +-- .../otherpackage/PhoneAttributeConverter.kt | 4 +-- .../ValidEmailAttributeConverter.kt | 4 +-- .../test/kotlin/org/example/order/Customer.kt | 6 ++-- .../test/kotlin/org/example/order/Order.kt | 14 +++++----- .../kotlin/org/example/order/OrderItem.kt | 6 ++-- 1124 files changed, 2459 insertions(+), 2459 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 3367793e5..127bcd1aa 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -44,7 +44,7 @@ io.ebean - persistence-api + jakarta-persistence-api ${ebean-persistence-api.version} @@ -90,22 +90,22 @@ true - + - + jakarta.servlet jakarta.servlet-api 6.0.0 true - ____ JAKARTA-DEPENDENCY-END --> + io.avaje diff --git a/ebean-api/src/main/java/io/ebean/AcquireLockException.java b/ebean-api/src/main/java/io/ebean/AcquireLockException.java index bc6e638ff..807fb346c 100644 --- a/ebean-api/src/main/java/io/ebean/AcquireLockException.java +++ b/ebean-api/src/main/java/io/ebean/AcquireLockException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PessimisticLockException; +import jakarta.persistence.PessimisticLockException; /** * Thrown when failing to acquire a pessimistic lock. diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index b2490232b..0e421971b 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -7,8 +7,8 @@ import io.ebean.cache.ServerCacheManager; import io.ebean.plugin.Property; import io.ebean.text.json.JsonContext; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/ebean-api/src/main/java/io/ebean/DataIntegrityException.java b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java index 0d622313c..495bdd349 100644 --- a/ebean-api/src/main/java/io/ebean/DataIntegrityException.java +++ b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Thrown when a foreign key constraint is enforced. diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 7c394c396..9d329cd31 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -11,8 +11,8 @@ import io.ebean.plugin.Property; import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.Collection; import java.util.List; diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java index 9696954f7..d8d10f13a 100644 --- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java +++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java @@ -5,7 +5,7 @@ import io.ebean.config.DatabaseConfig; import io.ebean.service.SpiContainer; import io.ebean.service.SpiContainerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Iterator; import java.util.Properties; import java.util.ServiceLoader; diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java index 31ff823c7..a7694182f 100644 --- a/ebean-api/src/main/java/io/ebean/DbContext.java +++ b/ebean-api/src/main/java/io/ebean/DbContext.java @@ -3,7 +3,7 @@ package io.ebean; import io.ebean.config.BeanNotEnhancedException; import io.ebean.datasource.DataSourceConfigurationException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index 9db4faecf..794b0dd69 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -4,7 +4,7 @@ import io.avaje.lang.NonNullApi; import io.avaje.lang.Nullable; import io.ebean.search.*; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.NonUniqueResultException; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; diff --git a/ebean-api/src/main/java/io/ebean/FutureList.java b/ebean-api/src/main/java/io/ebean/FutureList.java index ad7c70485..e7c4b67b7 100644 --- a/ebean-api/src/main/java/io/ebean/FutureList.java +++ b/ebean-api/src/main/java/io/ebean/FutureList.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/ebean-api/src/main/java/io/ebean/PersistenceIOException.java b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java index f70563252..0b13630cd 100644 --- a/ebean-api/src/main/java/io/ebean/PersistenceIOException.java +++ b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Captures and wraps IOException's occurring during ElasticSearch processing etc. diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index f6d7bda47..fb4d0c1f1 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -3,7 +3,7 @@ package io.ebean; import io.avaje.lang.NonNullApi; import io.avaje.lang.Nullable; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.NonUniqueResultException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.Timestamp; diff --git a/ebean-api/src/main/java/io/ebean/SerializableConflictException.java b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java index a1ee9fee4..78a82acf5 100644 --- a/ebean-api/src/main/java/io/ebean/SerializableConflictException.java +++ b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; /** * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict. diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index 065396a92..4f7c14818 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -5,7 +5,7 @@ import io.ebean.annotation.PersistBatch; import io.ebean.config.DatabaseConfig; import io.ebean.config.DocStoreConfig; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; /** diff --git a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java index c760ca10b..3649e7029 100644 --- a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java +++ b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java @@ -4,8 +4,8 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.ValuePair; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java index 532cb1be5..d3516a9c3 100644 --- a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java +++ b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java @@ -3,9 +3,9 @@ package io.ebean.config; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.util.AnnotationUtil; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; import static io.ebean.util.StringHelper.isNull; diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index de7d20ba5..6b3840abf 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -19,7 +19,7 @@ import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.meta.MetricNamingMatch; import io.ebean.util.StringHelper; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import javax.sql.DataSource; import java.time.Clock; import java.time.ZonedDateTime; diff --git a/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java index b0f50fb16..894017718 100644 --- a/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java +++ b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java @@ -1,7 +1,7 @@ package io.ebean.config; /** - * Matches the functionality of javax.persistence.AttributeConverter + * Matches the functionality of jakarta.persistence.AttributeConverter *

* In general AttributeConverter should be used in preference to this * ScalarTypeConverter as it is JPA standard and offers the same functionality. diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index 740814701..5c4f33cc1 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -9,7 +9,7 @@ import io.ebean.config.CustomDbTypeMapping; import io.ebean.config.PlatformConfig; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.*; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java index 246e8f1c0..8c2bc7f52 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java @@ -5,7 +5,7 @@ import io.ebean.BackgroundExecutor; import io.ebean.Transaction; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java index 221bc669a..0cf27edf6 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java @@ -3,7 +3,7 @@ package io.ebean.config.dbplatform; import io.ebean.Transaction; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java index 49fb32682..6116122fd 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java @@ -5,7 +5,7 @@ import io.ebean.DataIntegrityException; import io.ebean.DuplicateKeyException; import io.ebean.SerializableConflictException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collections; import java.util.Map; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java index 061bccfb8..d74182ddf 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java index 7f89fccaa..ed18bd413 100644 --- a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java +++ b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java @@ -1,6 +1,6 @@ package io.ebean.event; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; /** * Listens for webserver server starting and stopping events. @@ -15,7 +15,7 @@ import javax.servlet.ServletContextEvent; * hook that Ebean registers. *

*/ -public class ServletContextListener implements javax.servlet.ServletContextListener { +public class ServletContextListener implements jakarta.servlet.ServletContextListener { /** * The servlet container is stopping. diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java index a8fb4ea38..be58361b4 100644 --- a/ebean-api/src/main/java/module-info.java +++ b/ebean-api/src/main/java/module-info.java @@ -12,7 +12,7 @@ module io.ebean.api { requires transitive java.sql; requires transitive io.avaje.config; requires transitive io.avaje.lang; - requires transitive persistence.api; + requires transitive jakarta.persistence.api; requires transitive io.ebean.annotation; requires transitive io.ebean.datasource.api; requires transitive io.avaje.applog; @@ -21,7 +21,7 @@ module io.ebean.api { requires static io.ebean.types; requires static com.fasterxml.jackson.core; requires static com.fasterxml.jackson.databind; - requires static javax.servlet.api; + requires static jakarta.servlet; exports io.ebean; exports io.ebean.bean; diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 3928b490e..cc39738cc 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -20,7 +20,7 @@ io.ebean - persistence-api + jakarta-persistence-api ${ebean-persistence-api.version} diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index f54422ae0..10ba23215 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -81,15 +81,15 @@ provided - + - + jakarta.transaction jakarta.transaction-api @@ -102,7 +102,7 @@ 4.0.1 provided - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index c078fa55c..ca2cf7dde 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -3,7 +3,7 @@ package io.ebeaninternal.api; import io.ebeaninternal.server.transaction.TransactionScopeManager; import io.ebeaninternal.server.util.ArrayStack; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Manage scoped (typically thread local) transactions. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java index 10a53b9a7..1bdadede1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java @@ -1,6 +1,6 @@ package io.ebeaninternal.api; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.ebean.CancelableQuery; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java index e15b51298..fef9853c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.transaction.ProfileStream; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index bb738cb5a..28a29cb59 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.transaction.ProfileStream; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index 06916912c..77dfcc3f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -7,7 +7,7 @@ import io.ebean.util.IOUtils; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.util.UrlHelper; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.*; import java.net.URL; import java.nio.file.Path; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index 8fa1093be..a0e56dd12 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -6,7 +6,7 @@ import io.ebean.config.dbplatform.DatabasePlatformProvider; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.DbOffline; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 563a68274..320083f27 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static java.lang.System.Logger.Level.DEBUG; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index d90cb0f08..61ea94bf7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.core.bootup.BootupClassPathSearch; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 50a1d5b5d..cf34addef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -45,10 +45,10 @@ import io.ebeaninternal.util.ParamTypeHelper; import io.ebeaninternal.util.ParamTypeHelper.TypeInfo; import io.ebeanservice.docstore.api.DocStoreIntegration; -import javax.persistence.EntityNotFoundException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java index 7dddf0d12..9d788dfec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java @@ -7,7 +7,7 @@ import io.ebean.datasource.DataSourceConfig; import io.ebean.datasource.DataSourceFactory; import io.ebean.datasource.DataSourcePoolListener; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java index d29beebe0..68a8aa140 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java @@ -4,7 +4,7 @@ import io.ebean.QueryIterator; import io.ebean.Version; import io.ebean.bean.BeanCollection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 125785a68..3dfca446b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -18,7 +18,7 @@ import io.ebeaninternal.server.loadcontext.DLoadContext; import io.ebeaninternal.server.query.CQueryPlan; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.*; import java.util.function.Consumer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java index 315fb5484..afba654a3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.persist.BatchPostExecute; import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeaninternal.server.persist.PersistExecute; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 32da95dab..2d3a30bb5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -20,9 +20,9 @@ import io.ebeanservice.docstore.api.DocStoreUpdate; import io.ebeanservice.docstore.api.DocStoreUpdateContext; import io.ebeanservice.docstore.api.DocStoreUpdates; -import javax.persistence.EntityNotFoundException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.Statement; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 9ab9ae4b5..c5a2c4134 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -14,10 +14,10 @@ import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.util.AnnotationUtil; import io.ebeaninternal.api.CoreLog; -import javax.persistence.AttributeConverter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java index 4c0672a35..e12ba14c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; /** * Persist info for determining if save or delete should be performed. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index 6532df7f1..e21ab53f6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.bean.BeanCollection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index f1a47a02f..f6f927a64 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -55,7 +55,7 @@ import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.io.StringWriter; import java.lang.reflect.Modifier; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 14fb1af7d..c6f50d9dd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -42,9 +42,9 @@ import io.ebeaninternal.xmapping.api.XmapRawSql; import io.ebeanservice.docstore.api.DocStoreBeanAdapter; import io.ebeanservice.docstore.api.DocStoreFactory; -import javax.persistence.MappedSuperclass; -import javax.persistence.PersistenceException; -import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Transient; import javax.sql.DataSource; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index d5c303dcb..a7c50c85e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.config.BeanNotRegisteredException; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.Map; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java index e9d9c5372..7676814f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java @@ -10,14 +10,14 @@ import io.ebean.event.BeanPostLoad; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import javax.annotation.PostConstruct; -import javax.persistence.PersistenceException; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index a439e7379..4cac21ef2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -41,7 +41,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; import io.ebeanservice.docstore.api.support.DocStructure; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index b7434b0c1..a2e15e5cd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -28,7 +28,7 @@ import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.support.DocStructure; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index c9899888c..1c2f3aa9b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -23,7 +23,7 @@ import io.ebeaninternal.server.el.ElPropertyValue; import io.ebeaninternal.server.query.STreePropertyAssocMany; import io.ebeaninternal.server.query.SqlBeanLoad; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.io.StringWriter; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 780178fef..9bed5d98b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -27,7 +27,7 @@ import io.ebeaninternal.server.query.STreePropertyAssocOne; import io.ebeaninternal.server.query.SqlBeanLoad; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java index 6593186a6..fa91c7874 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java @@ -5,7 +5,7 @@ import io.ebean.core.type.DataReader; import io.ebean.text.TextException; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java index bb234664f..26a0de2c8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java @@ -12,7 +12,7 @@ import io.ebean.text.TextException; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.util.Checksum; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Objects; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java index 3634123e2..8931819a8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java @@ -4,7 +4,7 @@ import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.query.SqlBeanLoad; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Dynamic property based on aggregation (max, min, avg, count). diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index e72d7463d..65e0a0675 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.id.IdBinder; import io.ebeaninternal.server.deploy.parse.DeployInheritInfo; import io.ebeaninternal.server.query.SqlTreeProperties; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.lang.reflect.Modifier; import java.sql.SQLException; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java index 1a1c5651f..fd92e1349 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Utility to find the root bean type. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java index e08582257..c4da8e680 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java index bb9dbc5f9..8ff0320bc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java index f8dc413b9..c99e5bb74 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index ee64f86af..637e7af92 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.IntersectionRow; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 2c844c4a2..1a05fe422 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.IntersectionRow; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Arrays; import java.util.Comparator; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 58a85be87..6aa5186b7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -22,8 +22,8 @@ import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator; import io.ebeaninternal.server.idgen.UuidV4IdGenerator; import io.ebeaninternal.server.rawsql.SpiRawSql; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import java.util.*; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java index ad70b8d30..fc0ef67fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy.meta; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashMap; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 4f927043c..190e0b220 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -18,10 +18,10 @@ import io.ebeaninternal.server.properties.BeanPropertySetter; import io.ebeaninternal.server.type.ScalarTypeWrapper; import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; -import javax.persistence.EmbeddedId; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Type; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java index 7f41c028c..495671115 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.meta; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; /** * Property mapped to a joined bean. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java index 4a8943a8e..02684b79d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy.meta; -import javax.persistence.OrderColumn; +import jakarta.persistence.OrderColumn; public final class DeployOrderColumn { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java index 0f3ed54c1..0b23db56c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.parse.DeployUtil; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; import java.util.ArrayList; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 5bcd077c1..e1a065a2e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -22,20 +22,20 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.EnumType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EnumType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; import java.util.Set; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 97e3c3c8f..ad454afd0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.*; +import jakarta.persistence.*; import static java.lang.System.Logger.Level.INFO; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java index 35179b876..dc2be4f70 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -9,11 +9,11 @@ import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.util.AnnotationUtil; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.AttributeOverride; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java index fe45a72d8..a1087c402 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.PartitionMeta; import io.ebeaninternal.server.deploy.TablespaceMeta; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.*; +import jakarta.persistence.*; import static io.ebean.util.AnnotationUtil.typeGet; import static java.lang.System.Logger.Level.ERROR; @@ -129,7 +129,7 @@ final class AnnotationClass extends AnnotationParser { for (UniqueConstraint c : uniqueConstraints) { descriptor.addIndex(new IndexDefinition(c.name(), convertColumnNames(c.columnNames()))); } - for (javax.persistence.Index index : table.indexes()) { + for (jakarta.persistence.Index index : table.indexes()) { final String[] cols = index.columnList().split(","); descriptor.addIndex(new IndexDefinition(index.name(), convertColumnNames(cols), index.unique())); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index 60ef0ddf7..c5c24bab7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -20,7 +20,7 @@ import io.ebeaninternal.server.type.ScalarTypeBytesBase; import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted; import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Types; import java.util.Set; import java.util.UUID; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java index 386e08e64..80a0e87ce 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java @@ -4,10 +4,10 @@ import io.ebean.annotation.DbMigration; import io.ebean.annotation.Index; import io.ebean.annotation.Indices; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; import java.lang.reflect.Field; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java index 3e11d738e..c3589b36f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java @@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index 5fc138109..4e887bbbc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.ManyType; import io.ebeaninternal.server.deploy.meta.*; import io.ebeaninternal.server.type.TypeManager; -import javax.persistence.*; +import jakarta.persistence.*; import java.lang.reflect.*; import static java.lang.System.Logger.Level.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java index 4eb2fa640..8cebff679 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java @@ -5,10 +5,10 @@ import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Inheritance; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index 1e75c98f2..3c3f0058b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.parse; import io.ebeaninternal.server.deploy.InheritInfo; import java.lang.reflect.Modifier; -import javax.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorType; import java.sql.Types; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index ba7937dc6..b05d1933f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -18,9 +18,9 @@ import io.ebeaninternal.server.type.ScalarTypeWrapper; import io.ebeaninternal.server.type.SimpleAesEncryptor; import io.ebeaninternal.server.type.TypeManager; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.PersistenceException; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.PersistenceException; import java.sql.Types; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java index 7e5a09782..6335cace8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java @@ -8,7 +8,7 @@ import io.ebean.config.DatabaseConfig; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashSet; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java index f9956f106..34bdb7544 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java @@ -6,7 +6,7 @@ import io.ebean.*; import io.ebeaninternal.api.SpiExpressionList; import io.ebeaninternal.api.SpiQuery; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; @NonNullApi diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java index 00b12ea2c..46b6673f7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.persist; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java index d4cab2a17..ecde091f8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Defines bean insert update and delete implementation. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java index 7edcc3f22..0021c9a12 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler; import io.ebeaninternal.server.persist.platform.MultiValueBind; import io.ebeaninternal.server.type.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.sql.*; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java index fb166d49d..2eb6c102a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestOrmUpdate; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java index cd1aad8a2..9275b6ff4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestUpdateSql; import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index 9687f1d03..27fc5a6aa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 00805a892..e3ccabbff 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiSqlUpdate; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.HashSet; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java index ae53b3fb1..37f4ef721 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index 27e7084a0..f7f2f669f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.persist.BatchedPstmtHolder; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; import io.ebeaninternal.server.bind.DataBind; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java index b805da26e..e6a18233b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BeanPersister; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Document store based BeanPersister. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index 121ee7f87..d734d1a51 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -6,8 +6,8 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java index 01d9eb5f5..73018cb44 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiUpdatePlan; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 4c72c73c1..6b0dcc8fb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 06e6ee1a8..856d03584 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 58934a710..62c5392cf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index 5f5c7490e..dc7f27d93 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.deploy.id.ImportedId; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index 36d35c659..d3804e141 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -17,7 +17,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.SpiOrmQueryRequest; import io.ebeaninternal.server.deploy.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 81fe86eb8..2b6664367 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -25,7 +25,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 8e4a9a1f0..82eb66453 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -19,7 +19,7 @@ import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index 30641f85a..56cce175e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index a884a2d06..48eb512a8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 3ffb1ae6b..3d5dab14e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.core.RelationalQueryRequest; import io.ebeaninternal.server.core.RowReader; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java index 39588b733..d21239444 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java @@ -5,7 +5,7 @@ import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.DtoQueryRequest; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java index 47676c525..319a9453e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.query; import io.ebean.QueryIterator; import io.ebeaninternal.server.core.DtoQueryRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; final class DtoQueryIterator implements QueryIterator { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java index ab441906a..fd461427d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -4,7 +4,7 @@ import io.ebean.PagedList; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java index bd232c91f..e334cf7be 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java @@ -4,7 +4,7 @@ import io.ebean.FutureList; import io.ebean.Query; import io.ebean.Transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java index 26baf4f17..5905adc3b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.querydefn; import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.ebean.CancelableQuery; import io.ebeaninternal.api.SpiCancelableQuery; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 0b4b94723..cdd9de3f3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -22,7 +22,7 @@ import io.ebeaninternal.server.query.NativeSqlQueryPlanKey; import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.transaction.ExternalJdbcTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java index f2585a708..ed83f4b29 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.querydefn; import io.ebeaninternal.api.SpiNamedParam; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Named parameter used as placeholder in expressions created by EQL language parsing. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index c570254a0..49d03cd33 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import io.ebeaninternal.server.el.ElPropertyDeploy; import io.ebeaninternal.server.el.ElPropertyValue; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.Serializable; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java index 744f70ebf..c58fc5403 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Parses a Object relational query statement into a OrmQueryDetail and OrmQueryAttributes. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java index 9968c426a..6912390d6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.rawsql; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.util.DSelectColumnsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java index 9cc68f129..0208581ae 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.transaction; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Manages the transaction scoping using a Ebean thread local. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java index c40a83a12..f01009b9f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index fd721e6c2..1fd2cd22c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index aa8a3b357..9aac861c2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -13,8 +13,8 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.RollbackException; import java.sql.Connection; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java index 66f1a1c78..4629f0871 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 37b8827c2..afa032abe 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -7,12 +7,12 @@ import io.ebeaninternal.api.SpiTransaction; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; import static java.lang.System.Logger.Level.DEBUG; import static java.lang.System.Logger.Level.WARNING; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 76228f1f1..886a091bb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java index 85ef1e8a9..cb0ff45b4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java @@ -5,7 +5,7 @@ import io.ebeaninternal.api.SpiTransactionProxy; import io.ebeaninternal.api.TransactionEvent; import io.ebeaninternal.server.util.Str; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; import java.sql.Savepoint; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index 7225a2c00..23075fa9f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java index d97d85d0c..26a13c353 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java index 9835f7204..063f139d7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java index cfc51370a..2b842141d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java @@ -4,7 +4,7 @@ import io.ebean.config.CurrentTenantProvider; import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java index cf3992c9e..dd5ca90c2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java @@ -4,7 +4,7 @@ import io.ebean.config.CurrentTenantProvider; import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index c0b0610fa..c30bfcb22 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -29,7 +29,7 @@ import io.ebeanservice.docstore.api.DocStoreTransaction; import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; import io.ebeanservice.docstore.api.DocStoreUpdates; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java index 242b657f3..0dc55668b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.ScalarTypeConverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * Adapter from ScalarTypeConverter to AttributeConverter. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index fd50c145b..f79245e54 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -19,8 +19,8 @@ import io.ebeaninternal.server.core.ServiceUtil; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.AttributeConverter; -import javax.persistence.EnumType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EnumType; import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java index 93860f047..6559458ce 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 84fdab9fe..b2be8d63c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -10,7 +10,7 @@ import io.ebean.text.TextException; import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareList; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java index 2929391cb..d1034be93 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java @@ -10,7 +10,7 @@ import io.ebean.text.TextException; import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.lang.reflect.Type; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java index 3fae086ec..2e636fd4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.ScalarTypeBaseVarchar; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * ScalarType for Class that persists it to VARCHAR column. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java index b0c8b3e7f..b890df7a0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.time.DayOfWeek; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java index 3d8227efd..1430212f6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.ScalarType; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.util.Set; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index 2596b68f0..227520fbf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -7,7 +7,7 @@ import io.ebean.core.type.DataReader; import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarTypeBase; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index 9054a4546..399912843 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -4,7 +4,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java index e37ff8cb6..8d43c7d38 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -8,7 +8,7 @@ import io.ebean.text.TextException; import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareList; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index 0ae3248a4..3997c374a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -8,7 +8,7 @@ import io.ebean.text.TextException; import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java index 1b1403230..73e6b056e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.time.Month; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java index e683b43e6..a8b8e0ff2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.lang.reflect.Type; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java index bda557746..d97e98220 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.BindParams.OrderedList; import io.ebeaninternal.api.BindParams.Param; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; /** diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java index d09920dd5..d12bd3482 100644 --- a/ebean-core/src/main/java/module-info.java +++ b/ebean-core/src/main/java/module-info.java @@ -35,7 +35,7 @@ module io.ebean.core { requires static com.fasterxml.jackson.core; requires static com.fasterxml.jackson.databind; requires static jakarta.validation; - requires static java.transaction; + requires static jakarta.transaction; requires static java.naming; requires static java.validation; requires static org.postgresql.jdbc; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java index 3dc9d7018..56ebe4c67 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java @@ -6,7 +6,7 @@ import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Animal; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; public class BaseTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index 190588605..95bd8e0f9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy; import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 2fd51c0d3..2a89f0f38 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Car; import org.tests.model.basic.IntEnum; import org.tests.model.basic.VarcharEnum; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.time.DayOfWeek; import java.time.Month; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java index bd085d73a..f5cf34e91 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import org.junit.jupiter.api.Test; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index ac94509cc..9a357fe01 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -13,7 +13,7 @@ import org.tests.model.basic.enums.MySex; import org.tests.model.ivo.Money; import org.tests.model.ivo.converter.MoneyTypeConverter; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.util.GregorianCalendar; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java index 20da9cf98..0f60d5b78 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java @@ -10,7 +10,7 @@ import org.tests.model.ivo.converter.MoneyTypeConverter; import org.tests.model.ivo.converter.OidTypeConverter; import org.tests.model.ivo.converter.SysTimeConverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7..c8843ccee 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java index 6d315b65a..2ac44823e 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java index c58afe6c1..cea72d545 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,7 +3,7 @@ package org.tests.inheritance.model; import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.*; +import jakarta.persistence.*; @ChangeLog @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a6..fa3f577ec 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef4..9e40cab92 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bb..d39f7bb09 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Address.java b/ebean-core/src/test/java/org/tests/model/basic/Address.java index 632cb4efc..5e1ff9f7f 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Address.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.InvalidateQueryCache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Animal.java b/ebean-core/src/test/java/org/tests/model/basic/Animal.java index 069b1e4cf..ba68c99d5 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Animal.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java index 761a8d4c7..ae3c9a160 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java +++ b/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,12 +1,12 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; @Entity public class AnimalShelter { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Article.java b/ebean-core/src/test/java/org/tests/model/basic/Article.java index 797366edd..4cc6f020b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Article.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Article.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java index 4ba4c5def..97dfc8998 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java index 86c39f5b4..da618902e 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java +++ b/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Car.java b/ebean-core/src/test/java/org/tests/model/basic/Car.java index 268920a34..c55fe81bf 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Car.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java index 37ee5720e..b134230a0 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java +++ b/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CarAccessory extends BasicDomain { diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java index df2aef5bf..7c2dd390c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java +++ b/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CarFuse { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Cat.java b/ebean-core/src/test/java/org/tests/model/basic/Cat.java index d3df201b6..a9d0581af 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Cat.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Cat.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Formula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-core/src/test/java/org/tests/model/basic/Contact.java index a4d670071..97a48bf10 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Contact.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java index 1b2963624..a0e4fcb7b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ContactGroup extends BasicDomain { diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java index ffe0b2e56..f1fbc8075 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Country.java b/ebean-core/src/test/java/org/tests/model/basic/Country.java index bde38fc78..73f976421 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Country.java @@ -2,9 +2,9 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-core/src/test/java/org/tests/model/basic/Customer.java index 8e209631e..17fab4ba3 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Customer.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Dog.java b/ebean-core/src/test/java/org/tests/model/basic/Dog.java index 7b2fad546..be7e4f475 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Dog.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Dog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java b/ebean-core/src/test/java/org/tests/model/basic/EBasic.java index 603102032..42cae8c93 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-core/src/test/java/org/tests/model/basic/EBasic.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-core/src/test/java/org/tests/model/basic/Order.java index dfb9f2aef..1d9744868 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Order.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java index 364d94f2f..8da916a41 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java index 393837296..b7318d968 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java index a587538a1..944867100 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Product.java b/ebean-core/src/test/java/org/tests/model/basic/Product.java index b0fde6d07..df57dadd0 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Product.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Section.java b/ebean-core/src/test/java/org/tests/model/basic/Section.java index 039541188..9856a09e5 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Section.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java b/ebean-core/src/test/java/org/tests/model/basic/SubSection.java index b5e8888f2..d45f49ed3 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java +++ b/ebean-core/src/test/java/org/tests/model/basic/SubSection.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java index 80c0f8d36..07f614d65 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-core/src/test/java/org/tests/model/basic/TOne.java b/ebean-core/src/test/java/org/tests/model/basic/TOne.java index 13ae7e7e2..09ac64845 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TOne.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TOne.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A basic entity to test simple things. diff --git a/ebean-core/src/test/java/org/tests/model/basic/Truck.java b/ebean-core/src/test/java/org/tests/model/basic/Truck.java index c32d70777..35785d85f 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Truck.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171b..b766599c7 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java index cab8c4dde..9ba869704 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java index 00119e5ec..c4b03be79 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d..13b4ee34e 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f..2f635062e 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5..2b1df858e 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java b/ebean-core/src/test/java/org/tests/model/bridge/BSite.java index 2023a8c4b..036af85e5 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/BSite.java @@ -1,8 +1,8 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java b/ebean-core/src/test/java/org/tests/model/bridge/BUser.java index 7a87fe864..9573f85b7 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/BUser.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java index d44cf8052..be6109e19 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java +++ b/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author rnentjes diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java index a871d49aa..ae879544e 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java index 6ba9d4c41..122261b60 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java @@ -2,10 +2,10 @@ package org.tests.model.embedded; import io.ebean.annotation.DbJson; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.util.Map; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java b/ebean-core/src/test/java/org/tests/model/embedded/EMain.java index edb13ac1b..cb0cfb0af 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EMain.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java index ef5e82a80..ee6ad5d63 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java index 574a557a6..d7108f062 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Eembeddable { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java index 341f0670e..183643e70 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -3,8 +3,8 @@ package org.tests.model.embedded; import io.ebean.Model; import io.ebean.annotation.WhenCreated; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java index 52b6583cd..e9fd6d49e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index bd3979651..18a440b1b 100644 --- a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -2,7 +2,7 @@ package org.tests.model.ivo.converter; import org.tests.model.ivo.Money; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.math.BigDecimal; /** diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index edac9dfdb..0bf3e1939 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -39,15 +39,15 @@ provided - + - + jakarta.xml.bind jakarta.xml.bind-api @@ -59,7 +59,7 @@ 4.0.0 runtime - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index 6e5fd23e5..87a811648 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -13,7 +13,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.*; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java index 8a002f513..f7d326c13 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java @@ -11,6 +11,6 @@ public class Detect { * Return true if JAXB is present. */ public static boolean isJAXBPresent(DatabaseConfig config) { - return config.getClassLoadConfig().isPresent("javax.xml.bind.JAXBException"); + return config.getClassLoadConfig().isPresent("jakarta.xml.bind.JAXBException"); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java index 2586acf89..fdf57a999 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java index e8e6b9420..b4d12ede5 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java index 630ccbce9..20326eb5b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java index a53b6cb65..578fbf172 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java index 7082c03e2..256ed1d64 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java index 95996d71c..9a394b531 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java index 0f6d43dc0..7f38df0fa 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java index fc37c8e63..895b51c29 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.math.BigInteger; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java index 424c48a16..7240b5223 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java index ae24ce457..62b185d73 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java @@ -1,9 +1,9 @@ package io.ebeaninternal.dbmigration.migration; -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 java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java index a469e331a..2bcafcae5 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java index edc22f380..2526468b1 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java index 8f15e8496..cdad503a7 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java index 995c01fb9..aa9e7f814 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java index 62c0deb46..d065a09ab 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java index f0ec659d7..0380942a6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java index cc45c3b44..a1bb5a44b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java index 4c303d97d..13187d594 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java index e85add7c2..758a0f28c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java index 25b63ad80..36bb0f2b3 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java index 7c9906d83..473560549 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java index 65b15e979..1ccdcaf8a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java index 1104b31d1..e37065ad6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java index 640c53ed1..48a241819 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java index 7673fa881..05bcbcd55 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java index 50eba9dad..be5b2aa25 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java index 78bc2ef99..9b455358e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java index 85e04f4a7..0266a5a50 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java index 4535c5eec..052b72be1 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java index 6e45cbba8..423e00618 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java index 893356679..bb0cf2838 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java index 954ac5a02..8702ec7fe 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java index 47b22f02e..08bd1ed7d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java index f52bba831..8f7b350c2 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.ebeaninternal.dbmigration.migration; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java index e93260ba9..bac25a508 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java @@ -3,9 +3,9 @@ package io.ebeaninternal.dbmigration.migrationreader; import io.ebeaninternal.dbmigration.migration.Migration; -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 java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java index c887fc2b0..12c50e9cf 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java @@ -4,9 +4,9 @@ package io.ebeaninternal.dbmigration.migrationreader; import io.ebean.util.IOUtils; import io.ebeaninternal.dbmigration.migration.Migration; -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; import java.io.File; import java.io.IOException; import java.io.Writer; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java index 53819461f..7fbcbd2d6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java @@ -1,11 +1,11 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java index 2255ee88d..bdd2f45c2 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java @@ -1,10 +1,10 @@ package io.ebeaninternal.extraddl.model; -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.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java index a83653494..69a87cf1a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java @@ -3,9 +3,9 @@ package io.ebeaninternal.extraddl.model; import io.avaje.applog.AppLog; import io.ebean.annotation.Platform; -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 java.io.IOException; import java.io.InputStream; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java index 20cf3cd46..320fced06 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java @@ -1,6 +1,6 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java index c8e18d1dc..b4f69f462 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.ebeaninternal.extraddl.model; diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java index 1a7ef332e..d3a8affe5 100644 --- a/ebean-ddl-generator/src/main/java/module-info.java +++ b/ebean-ddl-generator/src/main/java/module-info.java @@ -7,7 +7,7 @@ module io.ebean.ddl.generator { requires transitive io.ebean.ddl.runner; requires transitive io.ebean.core; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires io.ebean.core.type; requires io.ebean.migration; diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 0f580744a..ef6a0538f 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,17 +1,17 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index b192290cf..61285db0f 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java index 8bc2dbf1a..75699b975 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,10 +1,10 @@ package org.tests.inheritance.company.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7..c8843ccee 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java index 9cde2d7f3..e11e14347 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,10 +1,10 @@ package org.tests.inheritance.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CalculationResult { diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java index b0363976d..741337dd6 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,14 +3,14 @@ package org.tests.inheritance.model; import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; @ChangeLog @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a6..fa3f577ec 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef4..9e40cab92 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bb..d39f7bb09 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java index da67d0375..525f6f25a 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java index c1119456a..7feb4da8e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java @@ -3,11 +3,11 @@ package org.tests.model.basic; import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.metaannotation.SizeMedium; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java index 4a71909a8..ac0a629f7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CKeyAssoc { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java index aed4a10b9..4a353ac3d 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CKeyDetail { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java index 36ef22ab8..fcf7dd639 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,12 +2,12 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java index a0d8c828c..139b448f7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java index 39496a703..da5511ef1 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java @@ -1,14 +1,14 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.List; @@ -19,7 +19,7 @@ public class Person implements Serializable { private static final long serialVersionUID = 495045977245770183L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40) @Column(name = "ID", unique = true, nullable = false) private Long id; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java index 3ba7b3ebe..b33a46c7a 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java @@ -1,14 +1,14 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -19,7 +19,7 @@ public class Phone implements Serializable { private static final long serialVersionUID = -326610269092956952L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java index 1c7778734..a813f20a3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java @@ -2,11 +2,11 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; @Entity @Inheritance diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171b..b766599c7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java index ae99a871a..6b6447643 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import org.tests.model.BaseModel; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java index cb28ad959..940c299dd 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d..13b4ee34e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f..2f635062e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5..2b1df858e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java index 4d3403519..f7d859286 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java index 40610428e..25f467fbc 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java index 50d7baf14..750c50e84 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java @@ -1,9 +1,9 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java index 30873ff54..f0e7c2c19 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java @@ -1,13 +1,13 @@ package org.tests.model.compositekeys; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Item { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java index 99b7c1018..1771e0c3a 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java @@ -1,7 +1,7 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java index 070c353aa..6aa82273b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java @@ -1,8 +1,8 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Parcel { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java index 3ee5c1d48..4c5645757 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java @@ -1,10 +1,10 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class ParcelLocation { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java index ad6e7270f..a3e8b3247 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java @@ -1,11 +1,11 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java index dc92408aa..dec7c74ee 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RegionKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java index 22d6b1253..78448b72c 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java @@ -2,9 +2,9 @@ package org.tests.model.compositekeys; import io.ebean.annotation.Identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java index 6de6159ad..e9a87dbd3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SubTypeKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java index a650c5c0e..04b806f01 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java @@ -1,13 +1,13 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java index a5b8f07d0..17a7c0bb3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TypeKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java index 7fe9bcfdf..f27ce5498 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,11 +3,11 @@ package org.tests.model.converstation; import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java index eee84f8a7..0bc0f845b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java @@ -2,9 +2,9 @@ package org.tests.model.converstation; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java index 51379a940..45cda714e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java @@ -2,9 +2,9 @@ package org.tests.model.converstation; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_message") diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java index dae00e2d5..a979ea9fa 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java @@ -2,9 +2,9 @@ package org.tests.model.converstation; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_participation") diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java index f921fd85e..6c0a2a240 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @History @Entity diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java index a4dfbac9a..dad6d8bca 100644 --- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java @@ -12,7 +12,7 @@ import io.ebean.annotation.MutationDetection; import io.ebean.core.type.*; import io.ebean.text.TextException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java index 410fe38f9..6dc59d1e2 100644 --- a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java +++ b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass abstract class BaseEntity { diff --git a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java b/ebean-postgis/src/test/java/org/example/domain/CachedBean.java index 02835c4b8..a67a74488 100644 --- a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java +++ b/ebean-postgis/src/test/java/org/example/domain/CachedBean.java @@ -4,8 +4,8 @@ import io.ebean.annotation.Cache; import org.postgis.Point; import org.postgis.Polygon; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean_cached") diff --git a/ebean-postgis/src/test/java/org/example/domain/MyBean.java b/ebean-postgis/src/test/java/org/example/domain/MyBean.java index 5ff0bd1b4..6ad51f8a9 100644 --- a/ebean-postgis/src/test/java/org/example/domain/MyBean.java +++ b/ebean-postgis/src/test/java/org/example/domain/MyBean.java @@ -7,9 +7,9 @@ import org.postgis.MultiPolygon; import org.postgis.Point; import org.postgis.Polygon; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean") diff --git a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java index 99c6cf44c..9a3a8c4a6 100644 --- a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java +++ b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java @@ -9,9 +9,9 @@ import org.geolatte.geom.MultiPolygon; import org.geolatte.geom.Point; import org.geolatte.geom.Polygon; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean") diff --git a/ebean-querybean/src/test/java/org/example/domain/ACat.java b/ebean-querybean/src/test/java/org/example/domain/ACat.java index 3537437b7..33333f8f6 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ACat.java +++ b/ebean-querybean/src/test/java/org/example/domain/ACat.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("CAT") @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/ADog.java b/ebean-querybean/src/test/java/org/example/domain/ADog.java index 81646476b..8d5a5837e 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ADog.java +++ b/ebean-querybean/src/test/java/org/example/domain/ADog.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Inheritance @DiscriminatorValue("DOG") diff --git a/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java b/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java index 30187d6fc..38415ba3a 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java +++ b/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("SCAT") @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/AWildCat.java b/ebean-querybean/src/test/java/org/example/domain/AWildCat.java index 85e2e3205..443c73c31 100644 --- a/ebean-querybean/src/test/java/org/example/domain/AWildCat.java +++ b/ebean-querybean/src/test/java/org/example/domain/AWildCat.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Inheritance @DiscriminatorValue("WC") diff --git a/ebean-querybean/src/test/java/org/example/domain/Address.java b/ebean-querybean/src/test/java/org/example/domain/Address.java index f3b161dc8..87909f39f 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Address.java +++ b/ebean-querybean/src/test/java/org/example/domain/Address.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import org.example.domain.otherpackage.GenericType; diff --git a/ebean-querybean/src/test/java/org/example/domain/Animal.java b/ebean-querybean/src/test/java/org/example/domain/Animal.java index 2a4196c06..e3c33492b 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Animal.java +++ b/ebean-querybean/src/test/java/org/example/domain/Animal.java @@ -2,10 +2,10 @@ package org.example.domain; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; @Entity @Inheritance diff --git a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java index 2ae8785d2..e1da4e42d 100644 --- a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java @@ -2,10 +2,10 @@ package org.example.domain; import org.example.domain.api.ACity; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java index 211d3141c..938baee97 100644 --- a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java +++ b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; /** diff --git a/ebean-querybean/src/test/java/org/example/domain/CaoBean.java b/ebean-querybean/src/test/java/org/example/domain/CaoBean.java index 23ca4eb73..9916e8b48 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CaoBean.java +++ b/ebean-querybean/src/test/java/org/example/domain/CaoBean.java @@ -1,6 +1,6 @@ package org.example.domain; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CaoBean { diff --git a/ebean-querybean/src/test/java/org/example/domain/CaoKey.java b/ebean-querybean/src/test/java/org/example/domain/CaoKey.java index 5b25b5337..f4069cd3f 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CaoKey.java +++ b/ebean-querybean/src/test/java/org/example/domain/CaoKey.java @@ -1,6 +1,6 @@ package org.example.domain; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class CaoKey { diff --git a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java index 643914429..111c9b30b 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java @@ -3,9 +3,9 @@ package org.example.domain; import org.example.domain.api.ACity; import org.example.domain.api.ACountry; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CityImpl implements ACity { diff --git a/ebean-querybean/src/test/java/org/example/domain/Contact.java b/ebean-querybean/src/test/java/org/example/domain/Contact.java index 44e7dbf31..7d2554f57 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Contact.java +++ b/ebean-querybean/src/test/java/org/example/domain/Contact.java @@ -2,7 +2,7 @@ package org.example.domain; import io.ebean.annotation.DbArray; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.time.ZonedDateTime; diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactNote.java b/ebean-querybean/src/test/java/org/example/domain/ContactNote.java index 9f684b81c..6ac6f4036 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ContactNote.java +++ b/ebean-querybean/src/test/java/org/example/domain/ContactNote.java @@ -2,9 +2,9 @@ package org.example.domain; import io.ebean.Finder; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; @Entity public class ContactNote extends BaseModel { diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java index 731def6d6..ec2e734a0 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java +++ b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Contact entity bean. diff --git a/ebean-querybean/src/test/java/org/example/domain/Country.java b/ebean-querybean/src/test/java/org/example/domain/Country.java index 07b5dace5..322d1466c 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Country.java +++ b/ebean-querybean/src/test/java/org/example/domain/Country.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.Instant; import java.time.OffsetDateTime; diff --git a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java index 6f8797df8..d85b4c426 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java @@ -2,8 +2,8 @@ package org.example.domain; import org.example.domain.api.ACountry; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CountryImpl implements ACountry { diff --git a/ebean-querybean/src/test/java/org/example/domain/Customer.java b/ebean-querybean/src/test/java/org/example/domain/Customer.java index 4f843ffb7..2b1264aba 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Customer.java +++ b/ebean-querybean/src/test/java/org/example/domain/Customer.java @@ -7,13 +7,13 @@ import org.example.domain.finder.CustomerFinder; import org.example.domain.otherpackage.PhoneNumber; import org.example.domain.otherpackage.ValidEmail; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Lob; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Lob; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/example/domain/MyInner.java b/ebean-querybean/src/test/java/org/example/domain/MyInner.java index e37dadaba..ec9c8f9f5 100644 --- a/ebean-querybean/src/test/java/org/example/domain/MyInner.java +++ b/ebean-querybean/src/test/java/org/example/domain/MyInner.java @@ -1,9 +1,9 @@ package org.example.domain; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.util.Objects; @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/Order.java b/ebean-querybean/src/test/java/org/example/domain/Order.java index 7b63725fe..39b392cfe 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Order.java +++ b/ebean-querybean/src/test/java/org/example/domain/Order.java @@ -3,12 +3,12 @@ package org.example.domain; import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import javax.validation.constraints.NotNull; import java.sql.Date; import java.util.ArrayList; diff --git a/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java b/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java index d16682b18..e3456ec2c 100644 --- a/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java +++ b/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Order Detail entity bean. diff --git a/ebean-querybean/src/test/java/org/example/domain/Product.java b/ebean-querybean/src/test/java/org/example/domain/Product.java index ed58daa05..75e59e86b 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Product.java +++ b/ebean-querybean/src/test/java/org/example/domain/Product.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java index c5e574f62..776def428 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class GenericTypeAttributeConverter implements AttributeConverter, String> { diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java index 9500b9924..0bb36aa01 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class PhoneAttributeConverter implements AttributeConverter { diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java index 6864366ff..3688d03bb 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class ValidEmailAttributeConverter implements AttributeConverter { diff --git a/ebean-redis/src/test/java/org/domain/EBase.java b/ebean-redis/src/test/java/org/domain/EBase.java index 84143f8e3..e9d409b42 100644 --- a/ebean-redis/src/test/java/org/domain/EBase.java +++ b/ebean-redis/src/test/java/org/domain/EBase.java @@ -4,9 +4,9 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.time.Instant; @MappedSuperclass diff --git a/ebean-redis/src/test/java/org/domain/Person.java b/ebean-redis/src/test/java/org/domain/Person.java index d5a883391..edc212740 100644 --- a/ebean-redis/src/test/java/org/domain/Person.java +++ b/ebean-redis/src/test/java/org/domain/Person.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; import io.ebean.annotation.Index; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Cache(enableQueryCache = true, nearCache = true, naturalKey = "name") diff --git a/ebean-redis/src/test/java/org/domain/RCust.java b/ebean-redis/src/test/java/org/domain/RCust.java index 8c1d01538..9f439d8d6 100644 --- a/ebean-redis/src/test/java/org/domain/RCust.java +++ b/ebean-redis/src/test/java/org/domain/RCust.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; import io.ebean.annotation.Index; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Cache(naturalKey = "name") diff --git a/ebean-redis/src/test/java/org/domain/UChild.java b/ebean-redis/src/test/java/org/domain/UChild.java index 64a0641aa..0f6fccf90 100644 --- a/ebean-redis/src/test/java/org/domain/UChild.java +++ b/ebean-redis/src/test/java/org/domain/UChild.java @@ -3,9 +3,9 @@ package org.domain; import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-redis/src/test/java/org/domain/UParent.java b/ebean-redis/src/test/java/org/domain/UParent.java index 25b42f12e..dede6ba17 100644 --- a/ebean-redis/src/test/java/org/domain/UParent.java +++ b/ebean-redis/src/test/java/org/domain/UParent.java @@ -4,10 +4,10 @@ import io.ebean.Model; import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index 482222ab5..e51566b7a 100644 --- a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -9,7 +9,7 @@ import org.springframework.jdbc.datasource.ConnectionHolder; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.List; diff --git a/ebean-spring-txn/src/test/java/org/example/Account.java b/ebean-spring-txn/src/test/java/org/example/Account.java index dea4c103d..9ee1855bb 100644 --- a/ebean-spring-txn/src/test/java/org/example/Account.java +++ b/ebean-spring-txn/src/test/java/org/example/Account.java @@ -1,9 +1,9 @@ package org.example; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Table(name="o_account") @Entity diff --git a/ebean-spring-txn/src/test/java/org/example/Role.java b/ebean-spring-txn/src/test/java/org/example/Role.java index 6fcee501e..305635fb1 100644 --- a/ebean-spring-txn/src/test/java/org/example/Role.java +++ b/ebean-spring-txn/src/test/java/org/example/Role.java @@ -1,10 +1,10 @@ package org.example; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Table(name="o_role") @Entity diff --git a/ebean-spring-txn/src/test/java/org/example/User.java b/ebean-spring-txn/src/test/java/org/example/User.java index 337796f06..4d985ed98 100644 --- a/ebean-spring-txn/src/test/java/org/example/User.java +++ b/ebean-spring-txn/src/test/java/org/example/User.java @@ -2,7 +2,7 @@ package org.example; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Table(name="o_user") diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 2f41e3efb..6eb14a399 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -71,7 +71,7 @@ - + - + jakarta.xml.bind jakarta.xml.bind-api @@ -96,7 +96,7 @@ 4.0.0 runtime - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java index 428c3b3f4..ae6e0e00a 100644 --- a/ebean-test/src/main/java/module-info.java +++ b/ebean-test/src/main/java/module-info.java @@ -19,7 +19,7 @@ module io.ebean.test { requires transitive io.ebean.test.containers; requires transitive org.assertj.core; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires transitive com.h2database; // support testing diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index e41d914b9..f6c3ff936 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index b0819c559..47e2fd94d 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -43,7 +43,7 @@ public class ServerConfigSqlServerTest { assertThat(sqlServer).isNotNull(); sqlServer.shutdown(); -// javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details +// jakarta.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details // // at io.ebeaninternal.server.core.DatabasePlatformFactory.create(DatabasePlatformFactory.java:62) // at io.ebeaninternal.server.core.DefaultContainer.setDatabasePlatform(DefaultContainer.java:266) diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java index 0537d38fe..1e0610335 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java @@ -24,8 +24,8 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.query.CQuery; import io.ebeaninternal.server.transaction.RemoteTransactionEvent; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.time.Clock; import java.util.*; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 3fa7f84b8..4229e5e42 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -16,8 +16,8 @@ import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; import javax.annotation.Nullable; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.Collection; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java index 0148551a6..81b62296d 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java @@ -3,9 +3,9 @@ package misc.migration.history.v1_0; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * detects a bug where dropHistoryTable is not applied correctly diff --git a/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java index 7b658368c..c7fea43ce 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java @@ -1,9 +1,9 @@ package misc.migration.history.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * detects a bug where dropHistoryTable is not applied correctly diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java index 75f0c7013..ba1725ac6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java index 2d8c7f956..83c9d2a5c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java index dacf6febe..9b8284038 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "migtest_ckey_parent") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java index d61d29e7d..6d85f0b73 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java index f7b14f321..8599eacde 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java @@ -3,10 +3,10 @@ package misc.migration.v1_0; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java index b05ccab94..7f8df1472 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java index 1c44c06d6..f35aa2fb2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java @@ -2,10 +2,10 @@ package misc.migration.v1_0; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java index 96e588017..4251108eb 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java index 28e2da229..0762022f8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java index 6c46d7529..396ec48ab 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java @@ -3,10 +3,10 @@ package misc.migration.v1_0; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index 9bc8ee032..d53398aa1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -3,7 +3,7 @@ package misc.migration.v1_0; import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.io.File; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java index 834099a10..9125a42ef 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java @@ -3,9 +3,9 @@ package misc.migration.v1_0; import io.ebean.annotation.EnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_enum") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java index fc659f270..05125e47d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java @@ -3,9 +3,9 @@ package misc.migration.v1_0; import io.ebean.annotation.Tablespace; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java index d29a2c45b..ca1c23032 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java @@ -4,9 +4,9 @@ package misc.migration.v1_0; import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history2") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java index 1224581a7..9e964c776 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java @@ -3,9 +3,9 @@ package misc.migration.v1_0; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java index ce1b464e1..592760ceb 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java @@ -3,9 +3,9 @@ package misc.migration.v1_0; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java index a6e5f5ee6..924b2fddb 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java @@ -3,9 +3,9 @@ package misc.migration.v1_0; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java index 9a1fd23b7..3033d1b47 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java @@ -4,9 +4,9 @@ package misc.migration.v1_0; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java index 964f76605..dec74391f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java @@ -3,9 +3,9 @@ package misc.migration.v1_0; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; // table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java index 46103c173..7ed1990a1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java @@ -3,10 +3,10 @@ package misc.migration.v1_0; import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java index 58d9a0af0..475864711 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java index 0a593993f..34edeae82 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java @@ -5,7 +5,7 @@ import io.ebean.annotation.History; import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java index c0f9f5918..56fe39d6e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_c") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java index 87b23387c..603e09b3b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_m") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java index 23bc8f569..2f9b3f7ed 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java @@ -2,9 +2,9 @@ package misc.migration.v1_0; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java index 770c3e754..520b99228 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java index 847ddc32c..9af912c4d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java index 2b8655c0b..b9286eb4b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java index 5c039bb06..891cd2c77 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java index 4d2723166..386926d0c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java index 22f1c88f8..963d407ef 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java @@ -3,10 +3,10 @@ package misc.migration.v1_1; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java index deed36868..97705b0a4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java index 16129121f..177504b66 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java @@ -2,10 +2,10 @@ package misc.migration.v1_1; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java index 5cac1da05..6422f556e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java index eb04c6d64..0c8254e63 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java index be199b097..521ffb1bd 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java @@ -3,10 +3,10 @@ package misc.migration.v1_1; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java b/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java index 67bffc1a7..16bb80734 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; /** diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java index 76b8a2b42..268d386cd 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java index 3de28d1ac..8fdf79d87 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "drop_ref_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java index de8a012e7..23ec35b71 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "drop_ref_one_to_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java index 3ed011c12..6be3b314a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java @@ -3,7 +3,7 @@ package misc.migration.v1_1; import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java index 577ede01d..2adc703b0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index d7f1829c5..e266f3c35 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -3,9 +3,9 @@ package misc.migration.v1_1; import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java index 89cf970a7..a47e62445 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java @@ -6,9 +6,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java index e8ab4ecc8..2dc55632e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java @@ -4,9 +4,9 @@ package misc.migration.v1_1; import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java index 1ac4d4508..67a877ee6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java @@ -3,9 +3,9 @@ package misc.migration.v1_1; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java index f10731489..a8b0cde88 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java @@ -5,9 +5,9 @@ import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java index 171772b0d..cfde2a19f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java @@ -5,9 +5,9 @@ import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java index 7c23cc540..9b63ab148 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java @@ -3,9 +3,9 @@ package misc.migration.v1_1; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java index 20926d60f..2411fa6bc 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java @@ -4,7 +4,7 @@ import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java index 215b0890f..9675a1d8a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java index 7405b2f01..dcee36fe8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java @@ -2,9 +2,9 @@ package misc.migration.v1_1; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java index c73428254..91a637389 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java index 2ec1cc61d..6ef702dee 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EUser.java b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java index 42b901033..505b7ae31 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EUser.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_user") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 344ebb4df..fb0801e03 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -2,10 +2,10 @@ package misc.migration.v1_1; import io.ebean.annotation.Tablespace; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 4507821be..1a21d67ff 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -2,7 +2,7 @@ package misc.migration.v1_1; import io.ebean.annotation.Tablespace; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java index dd42d0771..2f89d9367 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java @@ -2,10 +2,10 @@ package misc.migration.v1_1; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java index 80de9b999..46c934ca7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java index 351bb3ca7..bd42eb774 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java index c02288f0a..906febe96 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java index 7c44a42dc..0c56f793e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "migtest_ckey_parent") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java index a2f42926b..12b1dba4a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java index 31f91eb2a..5ed826b29 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java @@ -3,10 +3,10 @@ package misc.migration.v1_2; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java index de1e43003..86db49985 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java index 4bc65eb4d..c3e3868ff 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java @@ -2,10 +2,10 @@ package misc.migration.v1_2; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java index 38b64fee7..e3b12ddb7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java index f1141d186..3db7fe695 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java index 01b643c99..b4be7b601 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java @@ -3,10 +3,10 @@ package misc.migration.v1_2; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index 191dc5215..34d985ff2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -3,7 +3,7 @@ package misc.migration.v1_2; import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.io.File; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java index b77161f21..857ab92f8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java @@ -3,9 +3,9 @@ package misc.migration.v1_2; import io.ebean.annotation.EnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_enum") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java index e4d0e9506..f2eaec57a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java @@ -3,9 +3,9 @@ package misc.migration.v1_2; import io.ebean.annotation.Tablespace; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java index 2647b7af4..8d1d1d13b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java @@ -4,9 +4,9 @@ package misc.migration.v1_2; import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history2") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java index 2e31ad85c..e9cc60167 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java @@ -3,9 +3,9 @@ package misc.migration.v1_2; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java index c556f2c47..d4590ed7a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java @@ -3,9 +3,9 @@ package misc.migration.v1_2; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java index 957ba43f4..052143c94 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java @@ -3,9 +3,9 @@ package misc.migration.v1_2; import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java index 284b706b8..af2f0ce2f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java @@ -5,9 +5,9 @@ import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java index 38ae02730..513431b48 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java @@ -3,9 +3,9 @@ package misc.migration.v1_2; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java index 66ef3e373..f233265d8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java @@ -3,10 +3,10 @@ package misc.migration.v1_2; import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java index 5987135e3..d7289d6b9 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java index edfe5b309..afa5171e0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java @@ -4,7 +4,7 @@ import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java index de83d8194..d5cdd76a6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_c") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java index a1e5e41cf..b30b01f5b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_m") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java index 39b298d8b..ad957efa0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java @@ -2,9 +2,9 @@ package misc.migration.v1_2; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.MYSQL; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java index ef7f78cba..e6e69bea6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java @@ -2,9 +2,9 @@ package misc.migration.v1_2; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.MYSQL; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/org/etest/BSimpleFor.java b/ebean-test/src/test/java/org/etest/BSimpleFor.java index 2da204412..25829b430 100644 --- a/ebean-test/src/test/java/org/etest/BSimpleFor.java +++ b/ebean-test/src/test/java/org/etest/BSimpleFor.java @@ -2,10 +2,10 @@ package org.etest; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import java.time.Instant; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java index 41a23d20f..ea1c203be 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java @@ -3,9 +3,9 @@ package org.multitenant.partition; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.time.Instant; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtContent.java b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java index 9489c1342..8dbeb5a54 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtContent.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java @@ -1,6 +1,6 @@ package org.multitenant.partition; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MtContent extends MtTenantAware { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtNone.java b/ebean-test/src/test/java/org/multitenant/partition/MtNone.java index 83968e172..1ca74e625 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtNone.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtNone.java @@ -1,8 +1,8 @@ package org.multitenant.partition; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MtNone { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java index 9c21a14e0..1a2d5a81e 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java @@ -2,9 +2,9 @@ package org.multitenant.partition; import io.ebean.annotation.Length; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MtTenant { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java index ea6337a89..2fdc98bd5 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java @@ -2,8 +2,8 @@ package org.multitenant.partition; import io.ebean.annotation.TenantId; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class MtTenantAware extends MtBaseDomain { diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java index 32b65492a..f3f120d53 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java @@ -1,6 +1,6 @@ package org.tests.aggregateformula; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java index c1e2d1d44..4593b3bd7 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java @@ -1,9 +1,9 @@ package org.tests.aggregateformula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java index f0c4ac9b5..2ad3e1d3b 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java @@ -1,8 +1,8 @@ package org.tests.aggregateformula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "iaf_segment_status") diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 034088063..bf02301ab 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -11,8 +11,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import org.junit.jupiter.api.Test; import org.tests.model.basic.ValidationGroupSomething; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.lang.annotation.ElementType; diff --git a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java index 43af42479..7613edef3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index eb1ce3daf..1867a694c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTMaster; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index e7c84da15..a3783adf8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 2f338368b..4a36fb268 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -15,9 +15,9 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import javax.validation.constraints.Size; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java index d1ef2bc7c..6a2d78454 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java @@ -8,13 +8,13 @@ import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java index fb5369233..6126630d2 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java index 7687f56d8..3b86cde62 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "drel_invoice") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java index a26f18257..459431e00 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "tire") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java index 01b617d0d..84fffb43f 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "wheel") diff --git a/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java index 5de7ef9f2..75326d3b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java +++ b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java @@ -1,8 +1,8 @@ package org.tests.basic.type; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 5750e30a1..bb38df92b 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -14,7 +14,7 @@ import org.tests.model.basic.EBasicWithUniqueCon; import org.tests.model.basic.EOptOneB; import org.tests.model.basic.EOptOneC; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Savepoint; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java index 9357a2668..cb287cc8a 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java @@ -2,8 +2,8 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java index f4112c746..03d896a11 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java @@ -2,10 +2,10 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java index c2c6375c2..b4331bf22 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java @@ -1,9 +1,9 @@ package org.tests.batchinsert.o2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java index e75f24aeb..137e01d01 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java @@ -1,7 +1,7 @@ package org.tests.batchinsert.o2o; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java index 8339ca353..0030ce7e0 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java @@ -2,10 +2,10 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 5648911aa..d323c7e70 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 5783e0fb9..8f5f71c4d 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 28001fb8a..c84de0a75 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java index 80a543a11..7ba23c22f 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java @@ -2,9 +2,9 @@ package org.tests.cache.embeddedid; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java index fd58c7d5c..822f5588a 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java @@ -2,7 +2,7 @@ package org.tests.cache.embeddedid; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java index 3c18bbc1a..f20ccc7dd 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java @@ -1,9 +1,9 @@ package org.tests.cache.embeddedid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; @IdClass(CEPProductCategoryId.class) @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java index 0cd33f4a4..1cd3e815d 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java index a61aeadf5..06fa970ed 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java index 70a7c4909..927638fde 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept2.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @IdClass(ConceptId.class) diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java index fec049815..40c66184b 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class ConceptId { diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java index 2716ec70f..5c15ad022 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @IdClass(ConceptId.class) diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java index 144253edf..1d58df458 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java @@ -2,9 +2,9 @@ package org.tests.cache.personinfo; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java index f7747b5bd..b5c154f12 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java @@ -3,8 +3,8 @@ package org.tests.cache.personinfo; import io.ebean.annotation.Cache; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java index b4b505125..6ec0569c8 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java @@ -3,9 +3,9 @@ package org.tests.cache.personinfo; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.time.Instant; diff --git a/ebean-test/src/test/java/org/tests/cascade/COOne.java b/ebean-test/src/test/java/org/tests/cascade/COOne.java index 07c92ecac..fced7fe5c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/COOne.java +++ b/ebean-test/src/test/java/org/tests/cascade/COOne.java @@ -1,11 +1,11 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class COOne { diff --git a/ebean-test/src/test/java/org/tests/cascade/COOneMany.java b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java index 8894ca8ee..d773df694 100644 --- a/ebean-test/src/test/java/org/tests/cascade/COOneMany.java +++ b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java @@ -2,8 +2,8 @@ package org.tests.cascade; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class COOneMany { diff --git a/ebean-test/src/test/java/org/tests/cascade/CORoot.java b/ebean-test/src/test/java/org/tests/cascade/CORoot.java index 68700b0d3..296c7d485 100644 --- a/ebean-test/src/test/java/org/tests/cascade/CORoot.java +++ b/ebean-test/src/test/java/org/tests/cascade/CORoot.java @@ -1,10 +1,10 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class CORoot { diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java index 2febada00..29f3c22a5 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java @@ -2,10 +2,10 @@ package org.tests.cascade; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity @Cache diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java index 093a2946f..9f4d1300d 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java index b15a4ff8e..412bda3c2 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java @@ -1,9 +1,9 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmOrderedDetail { diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java index 89141a345..8db5bef7a 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java index 29e494539..a0b278da4 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java index 06bf64f18..26bad8cdf 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class RelMaster { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index e1d5f19df..79c4610b1 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 7a1c8ae6c..b38e91dd1 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java index c2f87d08d..46fa475df 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java index 8638fe610..22cc4b23c 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CaoBean { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java index 4d56e0cf6..1235931ea 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class CaoKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java index 9aca96574..df62a8318 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Item { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java index adc176769..c77a9172c 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java @@ -1,7 +1,7 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java index bf1324de9..b695e8ec6 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java @@ -1,8 +1,8 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Parcel { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java index 79d541673..0b79041e6 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ParcelLocation { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java index be0891ac8..8dc04b558 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java index ecf8b3f86..55084a798 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RegionKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java index a6defdc4e..a441fa1e4 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java @@ -2,9 +2,9 @@ package org.tests.compositekeys.db; import io.ebean.annotation.Identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java index 0a98564e1..e19cd4267 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SubTypeKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java index bfd160d98..a45a7753b 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java index 2725c0867..e8d2e9af8 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TypeKey { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java index 18f4f8201..1c699fcbc 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java @@ -3,9 +3,9 @@ package org.tests.ddl; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DfkCascade { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java index fa3c14c2c..94de27cad 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java @@ -1,9 +1,9 @@ package org.tests.ddl; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNone.java b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java index 995ba990d..be0218be8 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNone.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java @@ -2,9 +2,9 @@ package org.tests.ddl; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DfkNone { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java index 5d95be203..1a34ab0ad 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package org.tests.ddl; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class DfkNoneViaJoin { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java index 9b781e3c8..c1c3e6afe 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java @@ -2,10 +2,10 @@ package org.tests.ddl; import io.ebean.annotation.DbForeignKey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java index 84bb826d8..d4852716f 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkOne.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java @@ -1,7 +1,7 @@ package org.tests.ddl; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DfkOne { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java index 5f55e3f0b..aef54a4f7 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java @@ -3,9 +3,9 @@ package org.tests.ddl; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DfkSetNull { diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java index 5140be70c..cb1936c6f 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java @@ -3,10 +3,10 @@ package org.tests.defaultvalues; import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java index 77546973d..04c9b0e39 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java @@ -3,8 +3,8 @@ package org.tests.defaultvalues; import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Draftable diff --git a/ebean-test/src/test/java/org/tests/delete/DcDetail.java b/ebean-test/src/test/java/org/tests/delete/DcDetail.java index e49cc58bc..4a118009e 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcDetail.java +++ b/ebean-test/src/test/java/org/tests/delete/DcDetail.java @@ -1,8 +1,8 @@ package org.tests.delete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DcDetail { diff --git a/ebean-test/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java index 22a0e1b3a..43a4136e9 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcMaster.java +++ b/ebean-test/src/test/java/org/tests/delete/DcMaster.java @@ -1,6 +1,6 @@ package org.tests.delete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index def5d2374..ddebc9ec7 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java index 19fe7661d..37f40457f 100644 --- a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java +++ b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java @@ -2,9 +2,9 @@ package org.tests.expression.bitwise; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BwBean extends Model { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java index c9997015a..5749cbe92 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java @@ -2,8 +2,8 @@ package org.tests.idkeys.db; import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java b/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java index 4388e2ddb..e337be332 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java @@ -2,7 +2,7 @@ package org.tests.idkeys.db; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "ea_object") diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java index 2be7954db..ab276ee24 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java @@ -1,9 +1,9 @@ package org.tests.idkeys.db; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class GenKeyIdentity { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java index 85051a34c..0d2a04d91 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java @@ -1,9 +1,9 @@ package org.tests.idkeys.db; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class GenKeySeqA { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java index 474e4902a..e0f8f90b4 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java @@ -1,6 +1,6 @@ package org.tests.idkeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class GenKeySeqB { diff --git a/ebean-test/src/test/java/org/tests/inherit/ChildA.java b/ebean-test/src/test/java/org/tests/inherit/ChildA.java index 9e6818415..55412518e 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ChildA.java +++ b/ebean-test/src/test/java/org/tests/inherit/ChildA.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("A") diff --git a/ebean-test/src/test/java/org/tests/inherit/ChildB.java b/ebean-test/src/test/java/org/tests/inherit/ChildB.java index 34a42e570..7a92f3f25 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ChildB.java +++ b/ebean-test/src/test/java/org/tests/inherit/ChildB.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("B") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java index a76c0f272..b4a2f2ebc 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("1") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java index 5f3737c90..087782ec1 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("2") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java index 747a995c9..e17172e4a 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class DIntChildBase extends DIntParent { diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java index f67cd5041..5bd4122a5 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "dint_parent") diff --git a/ebean-test/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java index 0f20e16c3..e14578795 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Data.java +++ b/ebean-test/src/test/java/org/tests/inherit/Data.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java index 6dbe92089..7eb423f44 100644 --- a/ebean-test/src/test/java/org/tests/inherit/EUncle.java +++ b/ebean-test/src/test/java/org/tests/inherit/EUncle.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "rawinherit_uncle") diff --git a/ebean-test/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java index 4eac1553a..1e440903d 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Parent.java +++ b/ebean-test/src/test/java/org/tests/inherit/Parent.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java index d01561669..f082bc7cd 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java +++ b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java @@ -2,8 +2,8 @@ package org.tests.inherit; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java index 8a3964f9e..19d1f1089 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java +++ b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import javax.persistence.*; +import jakarta.persistence.*; /** */ diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java index 613637800..16d6b27dd 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java @@ -2,7 +2,7 @@ package org.tests.inheritance; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; /** diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java index f03850f1c..062a67420 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java @@ -1,12 +1,12 @@ package org.tests.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import javax.validation.constraints.NotNull; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; /** * Model class to reference an organization tree node. diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java index 19814855f..6bde8ee89 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Unit") diff --git a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java index c5ac10b64..5215cbe53 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java +++ b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import javax.persistence.*; +import jakarta.persistence.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java index ecd0c2e39..f7fbe6949 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java @@ -1,6 +1,6 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "blockt") diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java index ea0297de1..73d838824 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java @@ -1,7 +1,7 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value = "2") diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java index bf2432b2a..587a81900 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java @@ -1,8 +1,8 @@ package org.tests.inheritance.bothsides; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SourceA extends SourceBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java index 2cac1f07c..44f570ffa 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java @@ -1,8 +1,8 @@ package org.tests.inheritance.bothsides; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SourceB extends SourceBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java index 53056bbb9..d9ae07d90 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java index 0febee7cf..fe5155a90 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Target1 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java index 76c4bb28b..d581a08d9 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Target2 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java index e5359d657..71b849277 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java index 848269e23..80c958cee 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.util.UUID; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java index fea779587..27922451d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CIAddress extends CIBaseModel { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java index 64e983fa8..19021e320 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java @@ -3,8 +3,8 @@ package org.tests.inheritance.cache; import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @Cache(enableQueryCache=true) @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java index 3ac832e3d..2cd10cb82 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="1") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java index 7e376add8..73cdd8d6d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java index f61dd11bf..66ccad83f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java @@ -1,9 +1,9 @@ package org.tests.inheritance.cache; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "street") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java index 88b2de299..8c568d344 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java index 095ba5af6..d8b082c94 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java @@ -1,10 +1,10 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class ComplexBean extends RootBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java index ccf784adc..cda033333 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java @@ -2,9 +2,9 @@ package org.tests.inheritance.cascadedelete; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ElementBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java index 3c66367e8..d5ee43095 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java @@ -1,13 +1,13 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import java.util.UUID; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class ReferencingBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java index 76d9ddc0c..bd72f50b0 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java index e234228fc..69a6674b9 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SimpleBean extends RootBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 899381d4e..6f42c6da8 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,6 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index b192290cf..61285db0f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java index 5ef6ef7c8..b64ab0337 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,6 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7..c8843ccee 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java index 6d315b65a..2ac44823e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java index c58afe6c1..cea72d545 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,7 +3,7 @@ package org.tests.inheritance.model; import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.*; +import jakarta.persistence.*; @ChangeLog @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a6..fa3f577ec 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef4..9e40cab92 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bb..d39f7bb09 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java index e28fe6b66..0386f7e52 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java index 036ceccf8..de8e5d6d4 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderedA extends OrderedParent { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java index d21a708e4..810060dc5 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderedB extends OrderedParent { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java index 43845541c..1935a2607 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java @@ -1,8 +1,8 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java index 59bf6a04a..7cee172f3 100644 --- a/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java +++ b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java @@ -2,10 +2,10 @@ package org.tests.insert; import io.ebean.Model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java index c251efd5a..7ce8ba5bb 100644 --- a/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java @@ -1,7 +1,7 @@ package org.tests.insert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OnlyIdEntity { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java index 2f30ccd49..592f3b8bb 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java @@ -1,11 +1,11 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfCalendar extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCity.java b/ebean-test/src/test/java/org/tests/iud/PcfCity.java index 2612bc1f3..969cbb6cd 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCity.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCity.java @@ -1,9 +1,9 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfCity extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCountry.java b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java index bdfb3f930..e57299433 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCountry.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java @@ -1,8 +1,8 @@ package org.tests.iud; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/iud/PcfEvent.java b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java index 1a8aa8d40..f6de13200 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfEvent.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java @@ -1,6 +1,6 @@ package org.tests.iud; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PcfEvent extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfModel.java b/ebean-test/src/test/java/org/tests/iud/PcfModel.java index 118435243..ef6030c17 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfModel.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfModel.java @@ -2,9 +2,9 @@ package org.tests.iud; import io.ebean.Model; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class PcfModel extends Model { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfPerson.java b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java index 1a3cfdf59..c29d31186 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfPerson.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java @@ -1,11 +1,11 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfPerson extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 27434601e..fbca4ace7 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java index a3d937a77..876212283 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java @@ -3,8 +3,8 @@ package org.tests.json.transientproperties; import com.fasterxml.jackson.annotation.JsonIgnore; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java index 18cc8b854..b8d4f4d96 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java @@ -3,9 +3,9 @@ package org.tests.json.transientproperties; import io.ebean.annotation.Sql; import org.tests.model.basic.Order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java index cb9d46d8d..083514627 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java @@ -2,9 +2,9 @@ package org.tests.json.transientproperties; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java index 582702780..ba3768190 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java @@ -2,9 +2,9 @@ package org.tests.json.transientproperties; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java index 3a2ae072c..29aae4c43 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java @@ -2,9 +2,9 @@ package org.tests.json.transientproperties; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java index ea2eb71fb..91f07257a 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java @@ -3,7 +3,7 @@ package org.tests.json.transientproperties; import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java index bacfbdf9f..c28f9e3cf 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java @@ -4,9 +4,9 @@ import io.ebean.annotation.Formula; import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "main_entity") diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 8f36be0cb..b20698a7f 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -3,7 +3,7 @@ package org.tests.lazyforeignkeys; import io.ebean.annotation.DbForeignKey; import org.tests.model.basic.Cat; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java index 999ef1aa0..4c0eb92d3 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java @@ -2,7 +2,7 @@ package org.tests.lazyloadconf; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java index 8da38cd59..10d04e357 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java @@ -1,6 +1,6 @@ package org.tests.lazyloadconf; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "app_config_control") diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java index f59e7677a..b301bf034 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java @@ -2,7 +2,7 @@ package org.tests.lazyloadconf; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Cache(enableBeanCache = true) diff --git a/ebean-test/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java index 16f79a6ee..29782a117 100644 --- a/ebean-test/src/test/java/org/tests/level/Level1.java +++ b/ebean-test/src/test/java/org/tests/level/Level1.java @@ -1,6 +1,6 @@ package org.tests.level; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java index 76d1339f4..b88e81f48 100644 --- a/ebean-test/src/test/java/org/tests/level/Level2.java +++ b/ebean-test/src/test/java/org/tests/level/Level2.java @@ -1,6 +1,6 @@ package org.tests.level; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level3.java b/ebean-test/src/test/java/org/tests/level/Level3.java index 40393b38d..6168a6ae5 100644 --- a/ebean-test/src/test/java/org/tests/level/Level3.java +++ b/ebean-test/src/test/java/org/tests/level/Level3.java @@ -1,7 +1,7 @@ package org.tests.level; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Level3 { diff --git a/ebean-test/src/test/java/org/tests/level/Level4.java b/ebean-test/src/test/java/org/tests/level/Level4.java index 5ef9b6269..b517ec022 100644 --- a/ebean-test/src/test/java/org/tests/level/Level4.java +++ b/ebean-test/src/test/java/org/tests/level/Level4.java @@ -1,7 +1,7 @@ package org.tests.level; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Level4 { diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 07491fa1f..44eeddfe2 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithLifecycleExceptions; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java index 0b9cf1f24..57971c59f 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java @@ -2,9 +2,9 @@ package org.tests.m2m.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java index 2ae3f9340..dbaedd879 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java @@ -2,9 +2,9 @@ package org.tests.m2m.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MAddress.java b/ebean-test/src/test/java/org/tests/merge/MAddress.java index cfeb31bb6..ccaef2c47 100644 --- a/ebean-test/src/test/java/org/tests/merge/MAddress.java +++ b/ebean-test/src/test/java/org/tests/merge/MAddress.java @@ -1,6 +1,6 @@ package org.tests.merge; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MAddress extends MBase { diff --git a/ebean-test/src/test/java/org/tests/merge/MBase.java b/ebean-test/src/test/java/org/tests/merge/MBase.java index c0daf222e..e11e85015 100644 --- a/ebean-test/src/test/java/org/tests/merge/MBase.java +++ b/ebean-test/src/test/java/org/tests/merge/MBase.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.util.UUID; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/merge/MContact.java b/ebean-test/src/test/java/org/tests/merge/MContact.java index 9331bbb43..5631f1f75 100644 --- a/ebean-test/src/test/java/org/tests/merge/MContact.java +++ b/ebean-test/src/test/java/org/tests/merge/MContact.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MContactMessage.java b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java index a5f71b452..5021a2426 100644 --- a/ebean-test/src/test/java/org/tests/merge/MContactMessage.java +++ b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java @@ -2,8 +2,8 @@ package org.tests.merge; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class MContactMessage extends MBase { diff --git a/ebean-test/src/test/java/org/tests/merge/MCustomer.java b/ebean-test/src/test/java/org/tests/merge/MCustomer.java index 802f8000b..186b6a2fd 100644 --- a/ebean-test/src/test/java/org/tests/merge/MCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/MCustomer.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MGroup.java b/ebean-test/src/test/java/org/tests/merge/MGroup.java index a455006af..7c87c7234 100644 --- a/ebean-test/src/test/java/org/tests/merge/MGroup.java +++ b/ebean-test/src/test/java/org/tests/merge/MGroup.java @@ -2,8 +2,8 @@ package org.tests.merge; import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/merge/MMachine.java b/ebean-test/src/test/java/org/tests/merge/MMachine.java index 896da51a1..ba78dd9f5 100644 --- a/ebean-test/src/test/java/org/tests/merge/MMachine.java +++ b/ebean-test/src/test/java/org/tests/merge/MMachine.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/BaseModel.java b/ebean-test/src/test/java/org/tests/model/BaseModel.java index da67d0375..525f6f25a 100644 --- a/ebean-test/src/test/java/org/tests/model/BaseModel.java +++ b/ebean-test/src/test/java/org/tests/model/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/EGenProps.java b/ebean-test/src/test/java/org/tests/model/EGenProps.java index 623b131f9..43ef3c445 100644 --- a/ebean-test/src/test/java/org/tests/model/EGenProps.java +++ b/ebean-test/src/test/java/org/tests/model/EGenProps.java @@ -3,9 +3,9 @@ package org.tests.model; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-test/src/test/java/org/tests/model/EWhoProps.java b/ebean-test/src/test/java/org/tests/model/EWhoProps.java index 54d3445d8..ddf93c42d 100644 --- a/ebean-test/src/test/java/org/tests/model/EWhoProps.java +++ b/ebean-test/src/test/java/org/tests/model/EWhoProps.java @@ -1,6 +1,6 @@ package org.tests.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EWhoProps extends EWhoPropsSuper { diff --git a/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java index 156eb52d1..2b3c9304c 100644 --- a/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java +++ b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java @@ -5,9 +5,9 @@ import io.ebean.annotation.WhenModified; import io.ebean.annotation.WhoCreated; import io.ebean.annotation.WhoModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java index af12d5787..d37f10070 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java @@ -2,7 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java index 58eae294d..94dd05fe9 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java @@ -2,7 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java index b5863efb3..af9ea8745 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java @@ -3,9 +3,9 @@ package org.tests.model.aggregation; import io.ebean.annotation.Sum; import io.ebean.annotation.View; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java index d88df603d..3b90352ea 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java index dc3da08c2..2f1b5a83e 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Max; import io.ebean.annotation.Sum; import io.ebean.annotation.View; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java index 66d3677f3..ff9feaff4 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java @@ -2,7 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java index e0cbd9352..1bf9d7b67 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java @@ -2,9 +2,9 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class DOrg extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java index 0e18650f6..1674e8c54 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java index a9e3f4431..14cea519e 100644 --- a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java +++ b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DbArray; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java index 523fa3436..7286a7cfd 100644 --- a/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java +++ b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java @@ -4,9 +4,9 @@ package org.tests.model.array; import io.ebean.annotation.Cache; import io.ebean.annotation.DbArray; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java index 98234699a..0c3334d40 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Address.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java index 069b1e4cf..ba68c99d5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Animal.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java index 761a8d4c7..ae3c9a160 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java +++ b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,12 +1,12 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; @Entity public class AnimalShelter { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Article.java b/ebean-test/src/test/java/org/tests/model/basic/Article.java index 797366edd..4cc6f020b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Article.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Article.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java index d660c93f0..5aa6085b7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance() diff --git a/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java index 080b87fa5..351fee45d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java +++ b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java index 9cc71440d..0f0257358 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; /** * A user may have multiple bookmarks diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java index 305ab9497..a01f78ef3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class BBookmarkOrg { diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java index 064f4aa66..2fe503e7d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Chris diff --git a/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java index fcb91cdb3..774cf8ef0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java index 86c39f5b4..da618902e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java index 89ae68bcd..550abd303 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.TimeZone; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/BigDog.java b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java index ddd6e5459..0aa1c331a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BigDog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("BDG") diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java index 4a71909a8..ac0a629f7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CKeyAssoc { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java index aed4a10b9..4a353ac3d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CKeyDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java index 1b1cb0a81..0067a3500 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java index a0d8c828c..139b448f7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java index 268920a34..c55fe81bf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Car.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java index 37ee5720e..b134230a0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CarAccessory extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java index df2aef5bf..7c2dd390c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CarFuse { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Cat.java b/ebean-test/src/test/java/org/tests/model/basic/Cat.java index d3df201b6..a9d0581af 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Cat.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Cat.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Formula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/ebean-test/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java index a4d670071..97a48bf10 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Contact.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java index 1b2963624..a0e4fcb7b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ContactGroup extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java index ffe0b2e56..f1fbc8075 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java index bde38fc78..73f976421 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Country.java @@ -2,9 +2,9 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java index 0b4f98539..0eff23d55 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Customer.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java index 5c4887e9a..7e6d0a028 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-test/src/test/java/org/tests/model/basic/Dog.java b/ebean-test/src/test/java/org/tests/model/basic/Dog.java index 7b2fad546..be7e4f475 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Dog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Dog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java index 603102032..42cae8c93 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java index 214a2447f..279b2b4b5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.*; import org.tests.model.json.PlainBean; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java index 0541f1b3f..5aba6bceb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java index 4ae5a6b1d..bcfa0be7c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java index 410b0cbf3..5a7d2b863 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java index 8af997f69..36c5ccd31 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java @@ -2,9 +2,9 @@ package org.tests.model.basic; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class EBasicClobNoVerChild { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java index 3fb5cc9e4..6975b21e0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Date; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java index 77c6b2f2b..063c26171 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java index f77af37f5..629d34250 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java index aaff1184e..0fda7b6b3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "e_basicenc_relate") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java index 698f6eac2..3460cc998 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java @@ -2,9 +2,9 @@ package org.tests.model.basic; import io.ebean.annotation.EnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "e_basic_enum_id") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java index 7cccf2ac1..99cd57c82 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java @@ -3,9 +3,9 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumType; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java index 160fff74a..297d4b2b3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "e_basic_log") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java index 163827a18..9e1f225ed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "e_basic_ndc") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java index eaefd65fb..3724a870b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java @@ -1,11 +1,11 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java index 10fcbee54..f0e7c82f5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java @@ -4,10 +4,10 @@ import io.ebean.Model; import io.ebean.annotation.Cache; import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java index 44902ed31..11038e261 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java @@ -6,7 +6,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_withlife") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java index e5df815e9..2d8a592d9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java @@ -5,7 +5,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_with_ex") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java index eee062e94..ae91ad03c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java @@ -6,7 +6,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_withlog") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 20a1326b2..7e416bd53 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java index 0655ac781..22e21e00a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java index 8635706c4..91bb9ae69 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EDefaultProp { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java index 8449d7d92..31e9c24c7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java index 8c84ef4e5..9af4fa94e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ENullCollectionDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java index 8a47cec81..ee8534764 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EOptOneA extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java index 6b94d1ecc..9f849a196 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EOptOneB extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java index 15ac6809f..f4f6513db 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EOptOneC extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java index a827bc5b4..f9ad3cc1a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ESimple { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java index 5db551231..1530ffc95 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Currency; import java.util.Locale; import java.util.TimeZone; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java index 75cc12edb..8dc053dba 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java index 979a3ea28..288bd8f40 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java index 414828a98..72b7a359e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EVanillaCollectionDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java index 29a187be3..7b72a709c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java @@ -3,10 +3,10 @@ package org.tests.model.basic; import io.ebean.types.Cidr; import io.ebean.types.Inet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.net.InetAddress; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java index 9f7dee4b6..2c8c6fd1a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java +++ b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; @Cache(readOnly = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java index 3f426696d..9fd059a8e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java index 4aaf5e2ca..c93fdb8d9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "l2_cldf_reset_bean_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java index 0633e254f..945ec1d19 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java index 8c88c06e9..1b3950f15 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java index 3e6ebfaec..d0eadcd7e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "non_updateprop") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java index a04fb62f3..1fab0f8b0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MProtectedConstructBean { diff --git a/ebean-test/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java index c66a1db60..8ce68ac0d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MRole.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java index 7abf2ec60..0f45275b7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUser.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUserType.java b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java index 9d147bcee..3dcf373e1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUserType.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "muser_type") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java index 9b7b6b083..84111f24b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MnocRole { diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java index aa71e9497..d75825808 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java index 7593dc6d0..9976f9487 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java index df731191e..caf515c27 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java index 2534a6ebf..b6261df26 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MyLobSizeJoinMany { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java index a4d8d65ee..00bff96f0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Not cached bean (copy of {@link OCachedBeanChild}} without {@link Cache} annotation diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java index abe945bb5..649a0c007 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java index a2f99e85e..8a67f8249 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Cached bean for testing caching implementation, especially relations. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java index 8ec183379..b02aa68da 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java index 1ef25a2ca..7bb43c225 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java index ef6acaec8..ed97d8cd8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; /** * Cached entity for inheritance. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCar.java b/ebean-test/src/test/java/org/tests/model/basic/OCar.java index db0ebf12c..17367e2f3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCar.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCar.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OCar extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java index cb239a007..74aebe670 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java index 9f758cf21..7b4c55c20 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Order.java b/ebean-test/src/test/java/org/tests/model/basic/Order.java index dfb9f2aef..1d9744868 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Order.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java index 364d94f2f..8da916a41 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java index 393837296..b7318d968 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java index a587538a1..944867100 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/PFile.java b/ebean-test/src/test/java/org/tests/model/basic/PFile.java index ddac4e6c4..7652d1f2c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PFile.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PFile.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class PFile extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java index eba148198..76bf52c1c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; @Entity public class PFileContent extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java index 603cf43b4..ca2563ca5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class PersistentFile extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java index dce5b6a1e..34b89b18a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; @Entity public class PersistentFileContent extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java index 0d10d7df9..1d863ce71 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Person.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.List; @@ -11,7 +11,7 @@ public class Person implements Serializable { private static final long serialVersionUID = 495045977245770183L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java index 736e748af..32c660fd4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Phone.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -11,7 +11,7 @@ public class Phone implements Serializable { private static final long serialVersionUID = -326610269092956952L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java index b0fde6d07..df57dadd0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Product.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java index 039541188..9856a09e5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Section.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java index 26a516042..e513fb55a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; @Entity public class SomeEnumBean { diff --git a/ebean-test/src/test/java/org/tests/model/basic/SubSection.java b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java index b5e8888f2..d45f49ed3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/SubSection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java @@ -2,8 +2,8 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java index 80c0f8d36..07f614d65 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java index 9f084dc8d..4e90897df 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java index e71c03998..4093264f5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java index c20e06772..d689cee10 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java @@ -3,8 +3,8 @@ package org.tests.model.basic; import org.joda.time.LocalDate; import org.joda.time.LocalTime; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TJodaEntity { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java index 04a054372..150b37c4a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "t_mapsuper1") diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java index 543958ed7..2a7373a18 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/basic/TOne.java b/ebean-test/src/test/java/org/tests/model/basic/TOne.java index 13ae7e7e2..09ac64845 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TOne.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A basic entity to test simple things. diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java index 50667a784..7c2b17939 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Index; import io.ebean.annotation.Platform; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java index 6ef9960ba..2386261e1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java index 53ce83a4b..f02d1c671 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java index a19c89c7d..c7a1d535e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java @@ -1,13 +1,13 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TWithPreInsert implements TWithPreInsertCommon { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java index 5f679f9f6..95f4c1cea 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java index 674d0f824..2b8963d99 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java @@ -2,10 +2,10 @@ package org.tests.model.basic; import io.ebean.annotation.Formula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/Trip.java b/ebean-test/src/test/java/org/tests/model/basic/Trip.java index 07cb5ad0a..6b24fd7c6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Trip.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Trip.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java index c32d70777..35785d85f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Truck.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171b..b766599c7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java index 2d214ff75..28305cb21 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "ut_detail") diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java index 4c1b2998c..f66526dbc 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.Model; import io.ebean.annotation.DbJsonB; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java index 6a97b4fed..afdcf410d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java @@ -2,7 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java index 1c9116065..fe1b434be 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java index cab8c4dde..9ba869704 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java index 00119e5ec..c4b03be79 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d..13b4ee34e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f..2f635062e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5..2b1df858e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java index 72fbc08cf..30fb747bb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java @@ -3,7 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java index 1bb0a459b..12783238b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java index fcfb8479f..d18724800 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java @@ -3,8 +3,8 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; import org.tests.model.basic.BasicDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @Cache(enableQueryCache = true) diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java index 548ee094c..48b2ab901 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java @@ -3,9 +3,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; import org.tests.model.basic.BasicDomain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java index 53d3685e8..1d6e957b4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java index bed1d44ab..963c00a3f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java @@ -2,10 +2,10 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java index 7c458bd12..e8d565d28 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java index d570e1e4a..72bfd3a58 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java @@ -4,10 +4,10 @@ import io.ebean.Model; import io.ebean.annotation.Cache; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java index 08fb12bf7..7b5804be7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.Model; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class OCacheBase extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java index 4ee852d90..ac63d8219 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java @@ -2,8 +2,8 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.UniqueConstraint; @Cache(naturalKey = "appName") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java index d4a97b84d..baf35a3ca 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.UniqueConstraint; @Cache(naturalKey = {"app", "detail"}) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java index 592818113..e8bba1e4a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Cached bean for testing caching implementation. diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java index 92cbde2ec..09aca6596 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java @@ -2,9 +2,9 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Cached bean for compound natural key. diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java index ac3eba8a9..7dad96365 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java @@ -2,7 +2,7 @@ package org.tests.model.basic.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.util.UUID; @Cache(naturalKey = "cid") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java index d6c96c825..8e1e36bb2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/First.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/First.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "f_first") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java index dd3ffd624..b7c6ccd65 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.*; +import jakarta.persistence.*; @AttributeOverride(name = "name", column = @Column(name = "mod_name")) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java index 083c30f74..248783508 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java @@ -1,9 +1,9 @@ package org.tests.model.basic.first; -import javax.persistence.CascadeType; -import javax.persistence.JoinColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; @MappedSuperclass public abstract class SuperSecond { diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java index c34292bbe..0c2205356 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java @@ -1,7 +1,7 @@ package org.tests.model.basic.mapsuper; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MapSuperActual extends MapSuperNoId { diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java index d9781a5cb..75fa06dac 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java @@ -2,8 +2,8 @@ package org.tests.model.basic.mapsuper; import io.ebean.annotation.WhenCreated; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java index e49d35903..4de72efeb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java @@ -3,10 +3,10 @@ package org.tests.model.basic.relates; import io.ebean.annotation.ChangeLog; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java index a84ff7eb0..974408671 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java @@ -3,10 +3,10 @@ package org.tests.model.basic.relates; import io.ebean.annotation.ChangeLog; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java index 249d137e4..530d3b1c2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java @@ -3,8 +3,8 @@ package org.tests.model.basic.relates; import io.ebean.annotation.ChangeLog; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java index 9e2109f09..a5635554e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java @@ -3,8 +3,8 @@ package org.tests.model.basic.relates; import io.ebean.annotation.ChangeLog; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java index c405b9ed7..a3468b75e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic.xtra; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "td_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java index bc398b70a..b7039bb56 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java index 1f401072c..4eb9655e7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index 0412c5d75..e9951a7d3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import org.tests.model.basic.EBasicVer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java index 32e5e3af8..fd0cc4412 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java index ad99b4a2d..c26e4064b 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSite.java b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java index 2023a8c4b..036af85e5 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSite.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java @@ -1,8 +1,8 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java index f8eb5b2a3..d8d4b22b8 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java index 9d4b37f1b..2d99c7931 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java index 99b3143b7..2235787aa 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java index 220990cad..36d1b627d 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java index ceda12349..05ef197b0 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java @@ -1,9 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java index a6795de77..ec196e052 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java @@ -1,9 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; @Entity @IdClass(BEmbId.class) diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BUser.java b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java index 7a87fe864..9573f85b7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BUser.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/cache/EColAB.java b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java index 763d70e6c..50dbbdc95 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/EColAB.java +++ b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java @@ -3,9 +3,9 @@ package org.tests.model.cache; import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java index 07b3b9a91..9fc9c3e86 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java @@ -2,8 +2,8 @@ package org.tests.model.cache; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Cache(enableQueryCache = true, enableBeanCache = true) diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java index d422eb5a4..0025e2782 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java @@ -2,7 +2,7 @@ package org.tests.model.cache; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java index 7da07463b..b6fd4dcf9 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java @@ -2,7 +2,7 @@ package org.tests.model.carwheel; import io.ebean.annotation.Aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java index 886ea8d53..7f752081a 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java @@ -1,6 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sa_tire") diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java index 402f90788..6519db572 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java @@ -1,6 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sa_wheel") diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java index 3479c3a65..8ef693d21 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java index 746a2233b..3b1716a6e 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java index d9f917421..64d55b27c 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java @@ -2,10 +2,10 @@ package org.tests.model.carwheeltruck; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TTruckHolder { diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java index 1498b263a..e53107abf 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java @@ -1,8 +1,8 @@ package org.tests.model.carwheeltruck; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java index 03a6f38da..af2e93dc6 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java @@ -1,8 +1,8 @@ package org.tests.model.carwheeltruck; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class TWheel { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java index d19b742db..2ea814a41 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CkeClient { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java index 4a897c1b6..480a38a96 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java index 1c9de8ccc..d45777374 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class CkeUser { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java index de55f7c1a..08faf273a 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java index d44cf8052..be6109e19 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author rnentjes diff --git a/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java index a871d49aa..ae879544e 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java index b5b48bcd9..b59280abd 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java index 3952899e2..a052406bd 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.io.Serializable; diff --git a/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java b/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java index bcc21445f..31bac0a10 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java +++ b/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java @@ -1,8 +1,8 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Entity public class FindControllerMain { diff --git a/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java b/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java index 41a2bd10e..26e5863a0 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java +++ b/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java @@ -1,7 +1,7 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SoftRefA { diff --git a/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java b/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java index c7086096e..da27e66e5 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java +++ b/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java @@ -1,7 +1,7 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SoftRefB { diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java index 0caada259..bb882913d 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,7 +3,7 @@ package org.tests.model.converstation; import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Group.java b/ebean-test/src/test/java/org/tests/model/converstation/Group.java index eee84f8a7..0bc0f845b 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Group.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Group.java @@ -2,9 +2,9 @@ package org.tests.model.converstation; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Message.java b/ebean-test/src/test/java/org/tests/model/converstation/Message.java index 51379a940..45cda714e 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Message.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Message.java @@ -2,9 +2,9 @@ package org.tests.model.converstation; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_message") diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Participation.java b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java index dae00e2d5..a979ea9fa 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Participation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java @@ -2,9 +2,9 @@ package org.tests.model.converstation; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_participation") diff --git a/ebean-test/src/test/java/org/tests/model/converstation/User.java b/ebean-test/src/test/java/org/tests/model/converstation/User.java index f921fd85e..6c0a2a240 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/User.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/User.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java index fb40393c9..5d64de0d5 100644 --- a/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java +++ b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java @@ -4,9 +4,9 @@ import io.ebean.annotation.Identity; import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.AnEnumType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java index f1ce5936e..a2842e116 100644 --- a/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java +++ b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java @@ -3,8 +3,8 @@ package org.tests.model.ddd; import org.tests.model.ivo.Money; import org.tests.model.ivo.Oid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DPerson { diff --git a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java index 4deef720b..2da96cdc6 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java @@ -3,9 +3,9 @@ package org.tests.model.docstore; import io.ebean.annotation.DocStore; import org.tests.model.basic.Customer; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java index 194fa8385..5482a6d6f 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java @@ -3,8 +3,8 @@ package org.tests.model.docstore; import io.ebean.annotation.DocStore; import org.tests.model.basic.Product; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ManyToOne; @DocStore @DiscriminatorValue("PR") diff --git a/ebean-test/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java index 707a56bd8..d5dcaf837 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/Report.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/Report.java @@ -2,8 +2,8 @@ package org.tests.model.docstore; import io.ebean.annotation.DocStore; -import javax.persistence.Inheritance; -import javax.persistence.OneToMany; +import jakarta.persistence.Inheritance; +import jakarta.persistence.OneToMany; import java.util.List; @DocStore diff --git a/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java index 5d44a2fb7..6ef36a15f 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java index 98b79cb68..4832d3112 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java @@ -3,7 +3,7 @@ package org.tests.model.draftable; import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity @Draftable diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Doc.java b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java index e2c196644..b0baa9573 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Doc.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java @@ -2,9 +2,9 @@ package org.tests.model.draftable; import io.ebean.annotation.Draftable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Document.java b/ebean-test/src/test/java/org/tests/model/draftable/Document.java index 2652b2237..c16d14472 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Document.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Document.java @@ -5,10 +5,10 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.DraftOnly; import io.ebean.annotation.Draftable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java index f5cf0b0dd..63054b801 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java @@ -2,8 +2,8 @@ package org.tests.model.draftable; import io.ebean.annotation.DraftableElement; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * 'Owned' by @Draftable root. diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java index 547f3012b..2a663ea97 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Link.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Link.java @@ -2,9 +2,9 @@ package org.tests.model.draftable; import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java index 2c1ca26c2..a08fce9d6 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java @@ -1,6 +1,6 @@ package org.tests.model.draftable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Organisation extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java index 96805eef7..81109a726 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java @@ -1,9 +1,9 @@ package org.tests.model.elementcollection; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java index c41a7540a..f49a82d4f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java index d65a13410..9838847e2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java index de38b9a11..a9709b245 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java @@ -1,9 +1,9 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EcTop { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java index 03b6cb086..2880c8a00 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java index 7ce82c393..ea9d3862c 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java index b4e2b70d1..060c41eb4 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java index 2dad35c3c..a4d0508b9 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java index d89cbc311..8cd6661a7 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java index d6661f1e2..eebaa3e64 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java index 6cf06f282..9eec1fbe6 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java index 750512cc7..bddd013b0 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java index f9c319a03..6e98bc7d1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java @@ -1,12 +1,12 @@ package org.tests.model.elementcollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EcsmParent { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java index 0f3cb85a1..6b474026f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java index 5dc697ddd..cf194d7b7 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java @@ -2,8 +2,8 @@ package org.tests.model.embedded; import org.tests.model.basic.Country; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class EAddr { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java index 4b737f0f5..99a689d01 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java @@ -3,10 +3,10 @@ package org.tests.model.embedded; import io.ebean.annotation.DbJson; import org.tests.model.json.PlainBean; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.util.Map; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java index 2542a066b..dc69b5273 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java @@ -2,7 +2,7 @@ package org.tests.model.embedded; import io.ebean.annotation.NotNull; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java index c42510d67..fcff9d5c8 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "eemb_inner") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java index 2f6797c33..614d2547a 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java index 98e3a1733..75571e97b 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java @@ -2,7 +2,7 @@ package org.tests.model.embedded; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java index edb13ac1b..cb0cfb0af 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java index b3d4ca3e3..7d6e7e6e4 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java @@ -1,9 +1,9 @@ package org.tests.model.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EPerAddr { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java index ef5e82a80..ee6ad5d63 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java index b532ceff6..3f0fa37f2 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson2 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java index 59e793384..2604fadca 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson3 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java index 574a557a6..d7108f062 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Eembeddable { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java b/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java index 09ff8312f..0750888ce 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java @@ -2,7 +2,7 @@ package org.tests.model.embedded; import io.ebean.annotation.DbArray; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java index 912e95e87..bb4e2e2e3 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class PrimaryRevision { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java index dd624cabb..637aab32d 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RevisionId { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java index 341f0670e..183643e70 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -3,8 +3,8 @@ package org.tests.model.embedded; import io.ebean.Model; import io.ebean.annotation.WhenCreated; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java index b67046834..80375f0e3 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java index a0139709c..2f9f718d4 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java @@ -3,9 +3,9 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class ChildPerson extends InheritablePerson { diff --git a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java index 621d81885..16ee7e876 100644 --- a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java @@ -3,7 +3,7 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java index 113e95bc0..a9ab1e796 100644 --- a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java @@ -2,9 +2,9 @@ package org.tests.model.family; import org.tests.model.basic.EBasic; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java index 4f48c9d33..8955af81d 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java @@ -3,7 +3,7 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/generated/MyPart.java b/ebean-test/src/test/java/org/tests/model/generated/MyPart.java index 5d9f2af8d..712d8d220 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/MyPart.java +++ b/ebean-test/src/test/java/org/tests/model/generated/MyPart.java @@ -3,10 +3,10 @@ package org.tests.model.generated; import io.ebean.annotation.DbPartition; import io.ebean.annotation.PartitionMode; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.Instant; @DbPartition(mode = PartitionMode.MONTH, property = "eventTime") diff --git a/ebean-test/src/test/java/org/tests/model/generated/User.java b/ebean-test/src/test/java/org/tests/model/generated/User.java index be1336f44..ab0004a51 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/User.java +++ b/ebean-test/src/test/java/org/tests/model/generated/User.java @@ -1,6 +1,6 @@ package org.tests.model.generated; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Vilmos Nagy diff --git a/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java index a18dee653..524c6151b 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java @@ -5,7 +5,7 @@ import io.ebean.annotation.WhenModified; import io.ebean.annotation.WhoCreated; import io.ebean.annotation.WhoModified; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; /** diff --git a/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java index da17e7557..c36d87365 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java +++ b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java @@ -3,9 +3,9 @@ package org.tests.model.history; import io.ebean.Model; import io.ebean.annotation.History; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java index 6754e8e52..eaa052a74 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java +++ b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java @@ -2,7 +2,7 @@ package org.tests.model.history; import io.ebean.annotation.Length; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/history/HeDoc.java b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java index 35944a322..7cfc28139 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HeDoc.java +++ b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java @@ -2,8 +2,8 @@ package org.tests.model.history; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/history/HeLink.java b/ebean-test/src/test/java/org/tests/model/history/HeLink.java index 8bc4e2011..d831d703d 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HeLink.java +++ b/ebean-test/src/test/java/org/tests/model/history/HeLink.java @@ -5,9 +5,9 @@ import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiDoc.java b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java index 4d68e02d4..7f87b7130 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiDoc.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java @@ -2,8 +2,8 @@ package org.tests.model.history; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/history/HiLink.java b/ebean-test/src/test/java/org/tests/model/history/HiLink.java index 9d62ea235..7970ed7d6 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiLink.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiLink.java @@ -3,8 +3,8 @@ package org.tests.model.history; import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTOne.java b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java index 36018af05..c5300af5d 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java @@ -3,9 +3,9 @@ package org.tests.model.history; import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTThree.java b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java index 2b7ae5473..a4d3b67bb 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTThree.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java @@ -3,7 +3,7 @@ package org.tests.model.history; import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java index 18c2d299d..6af3bc083 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java @@ -3,9 +3,9 @@ package org.tests.model.history; import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java index aabe3d197..2159c1d57 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java @@ -1,9 +1,9 @@ package org.tests.model.history; import io.ebean.annotation.History; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.tests.model.draftable.BaseDomain; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java index f9053cb32..85054a0aa 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java @@ -2,9 +2,9 @@ package org.tests.model.history; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class HistorylessOneToOne extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java index c315110e0..deb7ff058 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java +++ b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java @@ -4,8 +4,8 @@ import io.ebean.annotation.History; import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/history/HsdUser.java b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java index 377bcf4ee..899765e91 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HsdUser.java +++ b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java @@ -4,10 +4,10 @@ import io.ebean.annotation.History; import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java index ea2651039..831dbcb1c 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java @@ -4,7 +4,7 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.JsonIgnore; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoContact.java b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java index bc742aeb6..f12c56731 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoContact.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java @@ -2,10 +2,10 @@ package org.tests.model.info; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class InfoContact extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java index bf93c9c58..fddace0c7 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java @@ -3,7 +3,7 @@ package org.tests.model.info; import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class InfoCustomer extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java index b409840cd..c03817e0f 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java @@ -1,7 +1,7 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("photo") diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java index e2c052a49..83fdef809 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java @@ -1,6 +1,6 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java index e9734b902..2088ee72c 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java @@ -1,8 +1,8 @@ package org.tests.model.inheritmany; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class IMRelated { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java index f8d38fab5..2d86ddc90 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java index 1eb67687e..c5ed5a2e0 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("ONE") diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java index e63891f67..2a125ea94 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java index 8bfb682e2..d20c079da 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class MBase { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java index 95e3b97e8..c01f7000b 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java index 422e93558..dbefb0b73 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java index d0c561c65..be4f5b8ed 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java @@ -1,8 +1,8 @@ package org.tests.model.inheritmany; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class MProfile extends MBase { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Address.java b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java index 78bc0ba80..e39408094 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Address.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java @@ -1,9 +1,9 @@ package org.tests.model.interfaces; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Address implements IAddress { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Person.java b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java index a97766129..e46c9d9fe 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Person.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java index 015d8ada0..9d29730a8 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Persona implements IPersona { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java index 0950feaab..3f6be3bc9 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java index 74ccfedab..af0f2f61d 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java @@ -1,7 +1,7 @@ package org.tests.model.ivo; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ESomeConvertType { diff --git a/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index bd3979651..18a440b1b 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -2,7 +2,7 @@ package org.tests.model.ivo.converter; import org.tests.model.ivo.Money; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.math.BigDecimal; /** diff --git a/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java index 66bb6db7a..9039422f2 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java +++ b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java @@ -7,9 +7,9 @@ import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; import org.joda.time.Period; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BasicJodaEntity { diff --git a/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java b/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java index 052d91156..8f2be28db 100644 --- a/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("A") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/BankAccount.java b/ebean-test/src/test/java/org/tests/model/join/BankAccount.java index 491303be7..9d08c1480 100644 --- a/ebean-test/src/test/java/org/tests/model/join/BankAccount.java +++ b/ebean-test/src/test/java/org/tests/model/join/BankAccount.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("B") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java b/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java index c9336de17..4cda044d1 100644 --- a/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("C") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccess.java b/ebean-test/src/test/java/org/tests/model/join/HAccess.java index d0d0608f1..5e047f6e5 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccess.java @@ -2,7 +2,7 @@ package org.tests.model.join; import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccount.java b/ebean-test/src/test/java/org/tests/model/join/HAccount.java index 2ca896403..300cc2e42 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccount.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccount.java @@ -1,6 +1,6 @@ package org.tests.model.join; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/join/HCustomer.java b/ebean-test/src/test/java/org/tests/model/join/HCustomer.java index 9a5ba3a9d..974d26177 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/join/HCustomer.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class HCustomer { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java index ec14bf136..268cbb5cd 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java @@ -2,9 +2,9 @@ package org.tests.model.json; import io.ebean.annotation.DbMap; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java index ee4617c0e..418938447 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java @@ -2,9 +2,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonBString { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java index 6a84ff2f7..a36c31dc7 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java index 8e801113c..9a0d5e3b2 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java index 225939bb7..b8cf1d378 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java @@ -3,9 +3,9 @@ package org.tests.model.json; import io.ebean.Model; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static io.ebean.annotation.MutationDetection.NONE; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java index 885e85bf8..d62f1247b 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.*; import static io.ebean.annotation.MutationDetection.HASH; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java index 30e0f502f..351265f61 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java @@ -2,7 +2,7 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java index f4df60888..1262082ad 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java @@ -3,9 +3,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java index 6d26bd130..fa7329d0f 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java @@ -3,9 +3,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java index e220af18c..db9781ecd 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java @@ -2,10 +2,10 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java index 744ca6af5..400ca2492 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java @@ -2,9 +2,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java index 2b470ef45..6da1f2328 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java @@ -3,9 +3,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java index 7e294914d..d37950daf 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java @@ -3,9 +3,9 @@ package org.tests.model.json; import io.ebean.Model; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java index 97ce8bb81..ee0d1dbee 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java @@ -3,9 +3,9 @@ package org.tests.model.json; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNode { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java index 527dcdfd0..d197e119c 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeBlob { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java index f8f8392dc..97ca45ab7 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java @@ -3,9 +3,9 @@ package org.tests.model.json; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeJsonB { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java index c8b2939e3..c6f50aaa8 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeVarchar { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java index 45af516dc..de9927491 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java @@ -2,9 +2,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonString { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java index 928f048be..0eca81645 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java @@ -2,9 +2,9 @@ package org.tests.model.json; import io.ebean.annotation.UnmappedJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java index 614758a1c..adf2e42fb 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbArray; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.*; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java index 051b4a344..bd5c323d0 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java @@ -2,9 +2,9 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static io.ebean.annotation.MutationDetection.NONE; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java index ff591d427..ae4ab5bc7 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java @@ -2,10 +2,10 @@ package org.tests.model.lazywithcache; import io.ebean.annotation.Cache; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; /** * Class with @Cache and lazy load property. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java index 6a096113b..3104c4570 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Parent class with ChildWithCache. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java index 521d3d52b..a0ba851d3 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Parent class with ChildWithCache. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java index a51758b3f..3cd130d59 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Looney { diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java index 65930791f..a51be7478 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java @@ -2,7 +2,7 @@ package org.tests.model.lazywithid; import io.ebean.common.BeanList; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java index fa078515b..82043652f 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java @@ -2,10 +2,10 @@ package org.tests.model.m2m; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DRol.java b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java index f4abd56a2..ffee165ab 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DRol.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java @@ -2,10 +2,10 @@ package org.tests.model.m2m; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DRot.java b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java index bb2629fac..0f7032646 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DRot.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java @@ -2,10 +2,10 @@ package org.tests.model.m2m; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java index a8cd7d51b..67070bae5 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java @@ -1,8 +1,8 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MailBox { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java index 2f51929df..6e600ce38 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java index d29c2d1b7..925724e3b 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java @@ -2,9 +2,9 @@ package org.tests.model.m2m; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java index d6a1c1bd7..bf25a6460 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java @@ -3,10 +3,10 @@ package org.tests.model.m2m; import io.ebean.annotation.Identity; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java index b582a16b0..42dee37a7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java @@ -3,8 +3,8 @@ package org.tests.model.m2m; import io.ebean.annotation.Identity; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java index 28e7636a4..5d1b60861 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java @@ -2,9 +2,9 @@ package org.tests.model.m2m; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity @Index(unique = true, columnNames = { "from_id", "to_id" }) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java index fabb58040..6fbe29ba1 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java @@ -4,7 +4,7 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.Platform; import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Identity(start = 1000) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java index e4710130c..fe58eb5cf 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java index 2bf201542..617a670d3 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java @@ -2,7 +2,7 @@ package org.tests.model.m2m; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java index 1b32e7ef9..c16f2d8e9 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Role.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Role.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java index 32db7e352..904a81fca 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Addr.java b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java index 83e06d26b..86a629fe4 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Addr.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java @@ -1,9 +1,9 @@ package org.tests.model.m2o; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Addr { diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java index bf9b5b2c7..ddd4a0d0e 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java @@ -1,6 +1,6 @@ package org.tests.model.m2o; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/map/MpRole.java b/ebean-test/src/test/java/org/tests/model/map/MpRole.java index d30c79a4b..7f272137a 100644 --- a/ebean-test/src/test/java/org/tests/model/map/MpRole.java +++ b/ebean-test/src/test/java/org/tests/model/map/MpRole.java @@ -1,7 +1,7 @@ package org.tests.model.map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MpRole { diff --git a/ebean-test/src/test/java/org/tests/model/map/MpUser.java b/ebean-test/src/test/java/org/tests/model/map/MpUser.java index 94edddb19..aa5c1357d 100644 --- a/ebean-test/src/test/java/org/tests/model/map/MpUser.java +++ b/ebean-test/src/test/java/org/tests/model/map/MpUser.java @@ -1,6 +1,6 @@ package org.tests.model.map; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java index 1c865f073..322105751 100644 --- a/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java +++ b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java @@ -1,7 +1,7 @@ package org.tests.model.mappedsuper; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ASimpleBean extends NotEnhancedMappedSuper { diff --git a/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java index 5a6aaf114..421fc80ac 100644 --- a/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java @@ -1,7 +1,7 @@ package org.tests.model.mappedsuper; -import javax.persistence.MappedSuperclass; -//import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +//import jakarta.persistence.Transient; @MappedSuperclass public class NotEnhancedMappedSuper { diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java index 71116ea0d..599a8f819 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java @@ -3,9 +3,9 @@ package org.tests.model.nofk; import io.ebean.annotation.Formula; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java index c6823500b..a6b241179 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java @@ -2,10 +2,10 @@ package org.tests.model.nofk; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java index 73371c740..ef06ec7b6 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java @@ -2,9 +2,9 @@ package org.tests.model.nofk; import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java index dfc9832c5..b29ac64e8 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index aeda58f12..bc1fd3116 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -7,7 +7,7 @@ import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index 66f85692c..d5c5851e8 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java index b43c344a5..70cee6afd 100644 --- a/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java +++ b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java @@ -2,8 +2,8 @@ package org.tests.model.noid; import io.ebean.annotation.WhenCreated; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/Account.java b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java index a6173400c..e564e3ea4 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/Account.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java @@ -3,9 +3,9 @@ package org.tests.model.onetoone; import io.ebean.Finder; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_account") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java index 22cc9fc8b..1a174ebfb 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java @@ -2,8 +2,8 @@ package org.tests.model.onetoone; import org.tests.model.basic.BasicDomain; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class OCompany extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java index 7a0b406aa..225a55e0b 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java @@ -2,10 +2,10 @@ package org.tests.model.onetoone; import org.tests.model.basic.BasicDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class ORoadShowMsg extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java index fd0b0c58b..3b1409fdc 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java index ac00af5d1..45357ad75 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java index 108c91a94..c4bdee701 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.*; +import jakarta.persistence.*; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java index d9a694476..b3e8b3a31 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoBMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java index 5126f3b2b..eb72bab1b 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoChild { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java index f64a6a81e..0e9a00472 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java index 49d6eb502..89fd88001 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoCust { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java index 25bba8431..5a69c8f9c 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OtoCustAddress { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java index 516c5f9ab..e3fa41232 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java index aa26d4ad5..4620152d7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java index 5f137af72..59e222544 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OtoNotification { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java index 3c1cbc193..995ad6ed1 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoPrime { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java index b09cf2275..8f29f1897 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java @@ -3,9 +3,9 @@ package org.tests.model.onetoone; import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java index 2d60a7dfa..cacbe07ac 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java @@ -3,10 +3,10 @@ package org.tests.model.onetoone; import io.ebean.Finder; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OtoSdChild { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java index 6dea4f146..cd8e0a5f7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.Finder; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoSdMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java index 4f8b8d7d6..1cc315917 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java @@ -2,9 +2,9 @@ package org.tests.model.onetoone; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OtoThMany extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java index 933a8d789..ed915162c 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java @@ -2,8 +2,8 @@ package org.tests.model.onetoone; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OtoThOne extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java index 099a7aca8..8ee8b1149 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java @@ -2,9 +2,9 @@ package org.tests.model.onetoone; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java index 36d7104c2..cfcb4bda4 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index df14dee01..eb89a30be 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java index e4371304f..620ab44ff 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java index edd72b0ae..041fc0571 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java index 58a9b06a9..9048b1b5e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java @@ -2,10 +2,10 @@ package org.tests.model.onetoone; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user_model") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java index 9b21ba440..2297b8a50 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java @@ -2,8 +2,8 @@ package org.tests.model.onetoone; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user_model_optional") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/User.java b/ebean-test/src/test/java/org/tests/model/onetoone/User.java index f36749285..b273f4f34 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/User.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/User.java @@ -3,9 +3,9 @@ package org.tests.model.onetoone; import io.ebean.Finder; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java index 4445f8d3b..662834634 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java @@ -2,10 +2,10 @@ package org.tests.model.onetoone.album; import io.ebean.Finder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; @Entity public class Album extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java index 3b316eb91..95e26fe53 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java @@ -6,8 +6,8 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; import org.joda.time.DateTime; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class BaseModel extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java index bfbcfd002..ecd24912d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java @@ -6,9 +6,9 @@ import io.ebean.annotation.SoftDelete; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PreRemove; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PreRemove; @Entity public class Cover extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java index eef657be5..ad023f0d3 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java @@ -4,7 +4,7 @@ import io.ebean.Model; import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "calcd_data") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java index 00704eb27..83fda8d6f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone.calcd; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "calcd_input") diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java index d131ed6d8..851d85c08 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -1,6 +1,6 @@ package org.tests.model.orderentity; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java index eb8543c64..9fe853adb 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -1,6 +1,6 @@ package org.tests.model.orderentity; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.math.BigDecimal; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java index 75790e26a..c4b07d3cd 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java @@ -2,10 +2,10 @@ package org.tests.model.orphanremoval; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmBeanListChild extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java index 6a9cd478f..1aacb79d6 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java @@ -2,13 +2,13 @@ package org.tests.model.orphanremoval; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmBeanListParent extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java index 5a22543a1..7086754b7 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java @@ -1,9 +1,9 @@ package org.tests.model.orphanremoval; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java index 6fe3be4dd..ce709fccb 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java @@ -1,8 +1,8 @@ package org.tests.model.orphanremoval; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java index 96384d261..630fdc7f8 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java @@ -2,7 +2,7 @@ package org.tests.model.orphanremoval; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java index 9565a6a42..5642729d0 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java @@ -2,7 +2,7 @@ package org.tests.model.orphanremoval; import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java index de541ec3c..cbd9020be 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MPrinter { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java index 3bef094f5..05ac1b808 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MPrinterState { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java index 5efcd7340..982004a1f 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java @@ -1,7 +1,7 @@ package org.tests.model.prnt; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MSomeOther { diff --git a/ebean-test/src/test/java/org/tests/model/pview/Paggview.java b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java index cc317f718..e25315159 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Paggview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java @@ -1,9 +1,9 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "paggview") diff --git a/ebean-test/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java index a985fb76c..5545cf66e 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Pview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Pview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java index 10f8b6237..59d4bdf2a 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Wview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Wview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java index 35a444996..ee8a0dafc 100644 --- a/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java +++ b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java @@ -2,7 +2,7 @@ package org.tests.model.rawsql; import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java index 80cbd64c8..ba49af458 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java @@ -1,8 +1,8 @@ package org.tests.model.selfref; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java index 2efff0071..8c2022887 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java index 7999dcb80..a9e767408 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java index f29430aed..619c0d403 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "self_ref_customer") diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java index 2e054e5ad..08eef4990 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 256fe5634..1ed17e923 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/site/DataContainer.java b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java index 47c91a6e1..040d4b728 100644 --- a/ebean-test/src/test/java/org/tests/model/site/DataContainer.java +++ b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java @@ -1,7 +1,7 @@ package org.tests.model.site; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java index 1b950f821..eaf05e05a 100644 --- a/ebean-test/src/test/java/org/tests/model/site/Site.java +++ b/ebean-test/src/test/java/org/tests/model/site/Site.java @@ -2,7 +2,7 @@ package org.tests.model.site; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java index 179706233..d7767f65b 100644 --- a/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java +++ b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java @@ -1,7 +1,7 @@ package org.tests.model.site; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java index fb08f9174..5ec01a4c8 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java +++ b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java @@ -2,13 +2,13 @@ package org.tests.model.site; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TreeEntity extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java index 0ca927b7b..e637ff400 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java @@ -2,9 +2,9 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java index 6c1670f1d..4c918b344 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class EBasicNoSDChild { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java index f70f9c491..ddabcee36 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java @@ -1,7 +1,7 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EBasicSDChild extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java index 78d9ae6ee..7b5d42e23 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java index 1c50b91dc..cd8de963a 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java index bdc49070a..4632ca9cc 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ESoftDelDown extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java index af19536f4..ed6208e63 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java index 6de682429..a51133cb7 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java @@ -2,7 +2,7 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ESoftDelOneA { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java index b89192b31..c9982fb38 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class ESoftDelOneB { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java index 3b90c4240..b056a3b6e 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java index 31e36afe8..493ee1103 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java index c7b14cc46..eae7d8235 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ESoftDelUp extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java index bcac7764a..84b357c8f 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java index 8b9ce71e7..ad3827f0a 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java @@ -2,10 +2,10 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java index 608343d56..dc23490ca 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java @@ -2,10 +2,10 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity public class ESoftDelY { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java index 5ce11c175..fe0365f3f 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java @@ -2,8 +2,8 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java index ec96fa3e9..604732292 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java @@ -1,7 +1,7 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EsdDetail extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java index 29632338b..36bb2b1a4 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java @@ -1,10 +1,10 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EsdMaster extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java index 9cbeca792..e6f07d66c 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Category.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Category.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java index 5b1fb9e99..8c60ef6ed 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Group.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Group.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/survey/Question.java b/ebean-test/src/test/java/org/tests/model/survey/Question.java index 1f5c9d081..fcc73cefd 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Question.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Question.java @@ -1,9 +1,9 @@ package org.tests.model.survey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Question { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java index 328dd2ab2..626e0e5b3 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Survey.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Survey.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java index 04721196e..253ef06ff 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java @@ -1,9 +1,9 @@ package org.tests.model.tevent; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class TEvent { diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java index 6e3492229..c68e68321 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java @@ -1,9 +1,9 @@ package org.tests.model.tevent; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java index bcbad8ef2..286ad84e2 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java @@ -2,7 +2,7 @@ package org.tests.model.tevent; import io.ebean.annotation.Aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java index 4b2cc1f5b..eb5f8543b 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java @@ -1,9 +1,9 @@ package org.tests.model.types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; import java.io.File; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java index 1a0fee0bf..baac0af7f 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java @@ -1,9 +1,9 @@ package org.tests.model.types; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.nio.file.Path; import java.sql.Date; import java.time.*; diff --git a/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java index 678e0321c..ce29e9af9 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java @@ -1,8 +1,8 @@ package org.tests.model.types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.time.MonthDay; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java index dd28ae184..ac5f4f362 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java @@ -4,7 +4,7 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java index 152ba6212..c0bddb270 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java @@ -4,9 +4,9 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.io.Serializable; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java index 7f8332c6f..495b88571 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java @@ -4,10 +4,10 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.io.Serializable; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java index 26223b801..41e52d89f 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java index fdcce6782..e96ab10bc 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionToy.java b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java index b7491ecb3..cb4a2ef11 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionToy.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java @@ -1,9 +1,9 @@ package org.tests.model.version; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class VersionToy { diff --git a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java index 1700e0f2d..12fea41af 100644 --- a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java +++ b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java @@ -4,7 +4,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.View; import org.tests.model.basic.Order; -import javax.persistence.*; +import jakarta.persistence.*; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java index 3f961f85e..3ef3e757f 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class WithZero { diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java index c6ea43821..247be873a 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OMVertex.java b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java index 95d57d133..643ca97cb 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OMVertex.java +++ b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java @@ -1,9 +1,9 @@ package org.tests.o2m; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java index 95ec6d101..231906f2f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java +++ b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java @@ -1,7 +1,7 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java index 8c6c908b6..e301781f9 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java @@ -1,8 +1,8 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class OmAccountChildDBO { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java index b2aa63d00..24d4bd6d0 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java @@ -2,12 +2,12 @@ package org.tests.o2m; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmAccountDBO extends Model { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java index b94ca0a66..f40dcba43 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java @@ -1,9 +1,9 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmBasicChild { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java index 76f23c86a..6fbb94456 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java @@ -2,13 +2,13 @@ package org.tests.o2m; import io.ebean.annotation.Where; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmBasicParent { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java index 411695428..a281cbb8a 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java @@ -1,6 +1,6 @@ package org.tests.o2m.dm; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Attachment extends HistoryColumns { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java index 28482c805..70d3a8ba7 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java @@ -1,6 +1,6 @@ package org.tests.o2m.dm; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java b/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java index 31d8f127e..77ade92bf 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java @@ -2,10 +2,10 @@ package org.tests.o2m.dm; import org.tests.model.draftable.BaseDomain; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class HistoryColumns extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java index 6b71ab238..4dc015cc3 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java @@ -2,7 +2,7 @@ package org.tests.o2m.dm; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PersonEntity extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java index 1cb1bfa1a..7001f7098 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java @@ -2,10 +2,10 @@ package org.tests.o2m.dm; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java index 325d0b811..6aa5116e7 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java @@ -3,9 +3,9 @@ package org.tests.o2m.dm; import com.fasterxml.jackson.annotation.JsonIgnore; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class WorkflowOperationEntity extends HistoryColumns { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java index eda26cf3d..8240cb659 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java @@ -1,9 +1,9 @@ package org.tests.o2m.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="monkey") diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java index 4e335aa0c..336f8e78a 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java index 5782c220f..5f44e6b5e 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java index db64e6be2..f52ecfd4b 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java index 14644d200..d05c1aac1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ClassA extends ClassSuper { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java index 305b33999..da4008ed0 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ClassB extends ClassSuper { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java index 2b62d81bf..94ed3eb67 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java @@ -2,7 +2,7 @@ package org.tests.o2m.jointable.inheritance; import org.tests.o2m.jointable.JtMonkey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java index b5b18eb6d..2301dac7d 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java index 7d2e40a42..eb6de80a8 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java @@ -1,9 +1,9 @@ package org.tests.o2m.lazy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oml_baz") diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java index c460d5d50..1cf44412e 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java index a08a0a58f..7b0d40f88 100644 --- a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java +++ b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java @@ -1,6 +1,6 @@ package org.tests.o2m.recurse; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java index aa77c3e73..6d789d5d6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java +++ b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java @@ -2,10 +2,10 @@ package org.tests.o2m.recurse; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class RMItemHolder extends Model { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java index 6be6928fd..693084324 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java @@ -1,10 +1,10 @@ package org.tests.o2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoLevelA { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java index 5f7899cbf..fbb1fa6f1 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java @@ -1,9 +1,9 @@ package org.tests.o2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoLevelB { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java index b5caa688e..bbbe2b2cb 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java @@ -1,7 +1,7 @@ package org.tests.o2o; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OtoLevelC { diff --git a/ebean-test/src/test/java/org/tests/order/OrderMaster.java b/ebean-test/src/test/java/org/tests/order/OrderMaster.java index 71a6978a9..976ccf0b8 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderMaster.java +++ b/ebean-test/src/test/java/org/tests/order/OrderMaster.java @@ -1,9 +1,9 @@ package org.tests.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java index 4e1751cab..caea178fa 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java @@ -1,6 +1,6 @@ package org.tests.order; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java index 19ea3481c..e20aa6e85 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java @@ -2,7 +2,7 @@ package org.tests.order; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/order/OrderToy.java b/ebean-test/src/test/java/org/tests/order/OrderToy.java index a305b47c9..6c226fdfd 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderToy.java +++ b/ebean-test/src/test/java/org/tests/order/OrderToy.java @@ -1,8 +1,8 @@ package org.tests.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class OrderToy { diff --git a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java index 2557d1782..6a1ac7c85 100644 --- a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -5,7 +5,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index 59307d83c..cd6bce065 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -15,7 +15,7 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 629776577..4b9cba719 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -10,7 +10,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/ebean-test/src/test/java/org/tests/query/cache/Acl.java b/ebean-test/src/test/java/org/tests/query/cache/Acl.java index 0594164fc..07c1bcf64 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Acl.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Acl.java @@ -1,8 +1,8 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Acl { diff --git a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java index 53d8f95e8..a8ba08dde 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java +++ b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java index 71cfcb727..f43eb70e9 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Contract.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Contract.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java index 409715391..9050d49aa 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java +++ b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java @@ -1,9 +1,9 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java index 288582d0d..700f60529 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Position.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Position.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_position") diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index 31260a3a6..5e57a7e4c 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.UUID; import java.util.concurrent.ExecutionException; diff --git a/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java index 50ca71d5d..f8ccd25aa 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java +++ b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java @@ -2,7 +2,7 @@ package org.tests.rawsql; import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java index bbff6f0d3..eaa2c90e8 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java +++ b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java @@ -2,8 +2,8 @@ package org.tests.rawsql; import io.ebean.annotation.Sql; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java b/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java index a119896e8..436319732 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java +++ b/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java @@ -1,6 +1,6 @@ package org.tests.rawsql.transport; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/M2MDepart.java b/ebean-test/src/test/java/org/tests/sets/M2MDepart.java index bf945f751..54eef165a 100644 --- a/ebean-test/src/test/java/org/tests/sets/M2MDepart.java +++ b/ebean-test/src/test/java/org/tests/sets/M2MDepart.java @@ -1,8 +1,8 @@ package org.tests.sets; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/M2MEmp.java b/ebean-test/src/test/java/org/tests/sets/M2MEmp.java index fa70d8818..08226f4ac 100644 --- a/ebean-test/src/test/java/org/tests/sets/M2MEmp.java +++ b/ebean-test/src/test/java/org/tests/sets/M2MEmp.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Objects; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/sets/MapDepart.java b/ebean-test/src/test/java/org/tests/sets/MapDepart.java index 562b58cda..a8a4494e7 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapDepart.java +++ b/ebean-test/src/test/java/org/tests/sets/MapDepart.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/MapDepart2.java b/ebean-test/src/test/java/org/tests/sets/MapDepart2.java index d542683d5..30c0fe377 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapDepart2.java +++ b/ebean-test/src/test/java/org/tests/sets/MapDepart2.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/sets/MapEmp.java b/ebean-test/src/test/java/org/tests/sets/MapEmp.java index 1e972f9d6..771f27b30 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapEmp.java +++ b/ebean-test/src/test/java/org/tests/sets/MapEmp.java @@ -1,8 +1,8 @@ package org.tests.sets; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.Objects; @Entity diff --git a/ebean-test/src/test/java/org/tests/sets/MapEmp2.java b/ebean-test/src/test/java/org/tests/sets/MapEmp2.java index 4f33036c3..3b995b1c2 100644 --- a/ebean-test/src/test/java/org/tests/sets/MapEmp2.java +++ b/ebean-test/src/test/java/org/tests/sets/MapEmp2.java @@ -1,8 +1,8 @@ package org.tests.sets; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class MapEmp2 { diff --git a/ebean-test/src/test/java/org/tests/sets/O2MDepart.java b/ebean-test/src/test/java/org/tests/sets/O2MDepart.java index a2272e4f9..aa3ab94d4 100644 --- a/ebean-test/src/test/java/org/tests/sets/O2MDepart.java +++ b/ebean-test/src/test/java/org/tests/sets/O2MDepart.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/sets/O2MEmp.java b/ebean-test/src/test/java/org/tests/sets/O2MEmp.java index 971e2e26d..af72f1e62 100644 --- a/ebean-test/src/test/java/org/tests/sets/O2MEmp.java +++ b/ebean-test/src/test/java/org/tests/sets/O2MEmp.java @@ -1,6 +1,6 @@ package org.tests.sets; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Objects; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java index 694246b5b..1582f4b8f 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java index 553a77852..f21f0fe22 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("EXT") diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java index b79e59950..63443db32 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java index f0f820ded..8ee4c5225 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java index 26599cf73..b7248bf1c 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("EXT") diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java index eb558952b..6072f13b3 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("INT") diff --git a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java index a45108d28..3949426e2 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java +++ b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java @@ -1,6 +1,6 @@ package org.tests.sp.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java index 415dcecba..8f3ef6fe9 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java @@ -2,7 +2,7 @@ package org.tests.sp.model.car; import org.tests.sp.model.IdEntity; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Door.java b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java index db8576e65..463cad68c 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Door.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java @@ -2,8 +2,8 @@ package org.tests.sp.model.car; import org.tests.sp.model.IdEntity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "sp_car_door") diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java index 46d8ad41f..1f7699ff5 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java @@ -2,8 +2,8 @@ package org.tests.sp.model.car; import org.tests.sp.model.IdEntity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "sp_car_wheel") diff --git a/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java b/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java index 4a2d30313..d934c9b8c 100644 --- a/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java +++ b/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java @@ -1,8 +1,8 @@ package org.tests.timezone; import javax.annotation.Nullable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.time.LocalTime; @Entity diff --git a/ebean-test/src/test/java/org/tests/timezone/TzBean.java b/ebean-test/src/test/java/org/tests/timezone/TzBean.java index e760b5789..e57120451 100644 --- a/ebean-test/src/test/java/org/tests/timezone/TzBean.java +++ b/ebean-test/src/test/java/org/tests/timezone/TzBean.java @@ -1,9 +1,9 @@ package org.tests.timezone; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index cdcf7bbdc..f15da28af 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index 74e480340..aef2254a2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.annotation.TxIsolation; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import static org.assertj.core.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java index c34688083..798769831 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNested.java @@ -4,7 +4,7 @@ import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.concurrent.Callable; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java index 4edd37ae9..2717cbc03 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java index 3ae5e80d2..cbc86d998 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index d497abbb1..06366bf08 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java index 904ae2350..9282e810e 100644 --- a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java +++ b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java @@ -2,9 +2,9 @@ package org.tests.types; import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index f078d2b9d..721446c75 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -10,7 +10,7 @@ import org.tests.model.basic.EBasicVer; import org.tests.model.basic.xtra.DummyDao; import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/update/EPersonOnline.java b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java index 232226652..f9d77ff26 100644 --- a/ebean-test/src/test/java/org/tests/update/EPersonOnline.java +++ b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java @@ -3,9 +3,9 @@ package org.tests.update; import io.ebean.annotation.Index; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.time.Instant; diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index 36dab37d0..df45afd86 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -11,7 +11,7 @@ import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; import org.tests.model.basic.ResetBasicData; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; @@ -100,7 +100,7 @@ public class TestStatelessUpdate extends TransactionalTestCase { /** * I am expecting that Ebean detects there aren't any changes and don't execute any query. - * Currently a {@link javax.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown. + * Currently a {@link jakarta.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown. */ @Test public void testWithoutChangesAndIgnoreNullValues() { diff --git a/ebean-test/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java index 87166bfda..1b4ef1049 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Child.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Child.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_d") diff --git a/ebean-test/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java index 6a582a981..1e7d9c434 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Parent.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Parent.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_c") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java index 71fb72816..fb06607cb 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_a") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java index cbd32a7fb..bf28b7abf 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_b") diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index 3299802d5..d1e536221 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -6,12 +6,12 @@ interface Constants { String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; - String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - String DISCRIMINATOR_VALUE = "javax.persistence.DiscriminatorValue"; - String INHERITANCE = "javax.persistence.Inheritance"; - String ENTITY = "javax.persistence.Entity"; - String EMBEDDABLE = "javax.persistence.Embeddable"; - String CONVERTER = "javax.persistence.Converter"; + String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue"; + String INHERITANCE = "jakarta.persistence.Inheritance"; + String ENTITY = "jakarta.persistence.Entity"; + String EMBEDDABLE = "jakarta.persistence.Embeddable"; + String CONVERTER = "jakarta.persistence.Converter"; String EBEAN_COMPONENT = "io.ebean.annotation.EbeanComponent"; String DBARRAY = "io.ebean.annotation.DbArray"; diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 8e5439dea..e94619715 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -200,7 +200,7 @@ class ProcessingContext implements Constants { return ( modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT) || - hasAnnotations(field, "javax.persistence.Transient") + hasAnnotations(field, "jakarta.persistence.Transient") ); } diff --git a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java index 6f8bc9f09..cd28bccab 100644 --- a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java +++ b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java @@ -6,7 +6,7 @@ import io.ebean.config.dbplatform.DatabasePlatformProvider; import io.ebean.platform.cockroach.CockroachPlatform; import io.ebean.platform.yugabyte.YugabytePlatform; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.*; import java.util.Locale; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index 5b152eb4a..58412960a 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -7,12 +7,12 @@ interface Constants { String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; - String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - String DISCRIMINATOR_VALUE = "javax.persistence.DiscriminatorValue"; - String INHERITANCE = "javax.persistence.Inheritance"; - String ENTITY = "javax.persistence.Entity"; - String EMBEDDABLE = "javax.persistence.Embeddable"; - String CONVERTER = "javax.persistence.Converter"; + String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue"; + String INHERITANCE = "jakarta.persistence.Inheritance"; + String ENTITY = "jakarta.persistence.Entity"; + String EMBEDDABLE = "jakarta.persistence.Embeddable"; + String CONVERTER = "jakarta.persistence.Converter"; String EBEAN_COMPONENT = "io.ebean.annotation.EbeanComponent"; String DBARRAY = "io.ebean.annotation.DbArray"; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 631eb4d3f..e1bedcd1d 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -157,7 +157,7 @@ class ProcessingContext implements Constants { return ( modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT) || - hasAnnotations(field, "javax.persistence.Transient") + hasAnnotations(field, "jakarta.persistence.Transient") ); } diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 0d7eb9e7c..97dc354af 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -52,7 +52,7 @@ io.ebean querybean-generator - 13.16.0 + 13.22.0 diff --git a/tests/test-java16/src/main/java/org/example/records/Address.java b/tests/test-java16/src/main/java/org/example/records/Address.java index 2ac531402..8d46b4bb1 100644 --- a/tests/test-java16/src/main/java/org/example/records/Address.java +++ b/tests/test-java16/src/main/java/org/example/records/Address.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record Address (String line1, String line2, String city) { diff --git a/tests/test-java16/src/main/java/org/example/records/BaseModel.java b/tests/test-java16/src/main/java/org/example/records/BaseModel.java index a2698576c..d04e6705d 100644 --- a/tests/test-java16/src/main/java/org/example/records/BaseModel.java +++ b/tests/test-java16/src/main/java/org/example/records/BaseModel.java @@ -3,9 +3,9 @@ package org.example.records; import io.ebean.Model; import io.ebean.annotation.Identity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @Identity(start = 1000, cache = 100) @MappedSuperclass diff --git a/tests/test-java16/src/main/java/org/example/records/Contact.java b/tests/test-java16/src/main/java/org/example/records/Contact.java index 4b054511f..044da173b 100644 --- a/tests/test-java16/src/main/java/org/example/records/Contact.java +++ b/tests/test-java16/src/main/java/org/example/records/Contact.java @@ -2,10 +2,10 @@ package org.example.records; import io.ebean.Model; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class Contact extends Model { diff --git a/tests/test-java16/src/main/java/org/example/records/Course.java b/tests/test-java16/src/main/java/org/example/records/Course.java index e3798c02c..d9aa30e26 100644 --- a/tests/test-java16/src/main/java/org/example/records/Course.java +++ b/tests/test-java16/src/main/java/org/example/records/Course.java @@ -2,9 +2,9 @@ package org.example.records; import io.ebean.annotation.Length; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.util.HashMap; import java.util.Map; diff --git a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java index dc95a8723..d1639d901 100644 --- a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java +++ b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java @@ -2,9 +2,9 @@ package org.example.records; import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Identity(start = 1000) @Entity diff --git a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java index d3436db7b..4b48ccce0 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record CustomAccessors(String line1, String line2, String city) { diff --git a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java index 964821c69..7a3c3a96c 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java index 1883a708c..e528e5da9 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java @@ -2,7 +2,7 @@ package org.example.records; import io.avaje.lang.NonNullApi; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @NonNullApi diff --git a/tests/test-java16/src/main/java/org/example/records/CustomToString.java b/tests/test-java16/src/main/java/org/example/records/CustomToString.java index 8712fa38a..eebbb610e 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomToString.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomToString.java @@ -2,7 +2,7 @@ package org.example.records; import io.avaje.lang.NonNullApi; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @NonNullApi @Embeddable diff --git a/tests/test-java16/src/main/java/org/example/records/UserRole.java b/tests/test-java16/src/main/java/org/example/records/UserRole.java index 1d25f6e97..8c05a19e6 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRole.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRole.java @@ -2,9 +2,9 @@ package org.example.records; import io.ebean.Model; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity public class UserRole extends Model { diff --git a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java index a0807de0a..0b27543ea 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record UserRoleId(Integer userId, String roleId) { diff --git a/tests/test-java16/src/main/java/org/example/records/UserSite.java b/tests/test-java16/src/main/java/org/example/records/UserSite.java index fb881c32e..536709b23 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSite.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSite.java @@ -2,7 +2,7 @@ package org.example.records; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @IdClass(UserSiteId.class) diff --git a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java index 36c4dd599..c43e452d2 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.UUID; @Embeddable diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt index c70290d63..6629ef6ad 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import org.example.otherpackage.GenericType; diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt index 44789893f..b50b8dfc0 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt @@ -2,9 +2,9 @@ package org.example.domain; import java.time.Instant; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import io.ebean.Model; import io.ebean.annotation.WhenCreated; diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt index b96fd987c..c50b3c600 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt @@ -1,6 +1,6 @@ package org.example.domain -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "t_inner") diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt index a24154449..0accb2546 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class GenericTypeAttributeConverter : AttributeConverter, String> { diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt index 55981a0a8..f6173c64b 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class PhoneAttributeConverter : AttributeConverter { diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt index 690978ce3..7b0594a59 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class ValidEmailAttributeConverter : AttributeConverter { diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt index 514739a39..bd3348f7a 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt @@ -1,8 +1,8 @@ package org.example.order -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Version +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Version import org.example.api.ICustomer @Entity diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt index a5e87f9d9..1c846069c 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt @@ -1,12 +1,12 @@ package org.example.order -import javax.persistence.CascadeType -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.ManyToOne -import javax.persistence.OneToMany -import javax.persistence.Table -import javax.persistence.Version +import jakarta.persistence.CascadeType +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne +import jakarta.persistence.OneToMany +import jakarta.persistence.Table +import jakarta.persistence.Version @Entity @Table(name = "t_order") diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt index 6a7e123ec..7d5a9c9bf 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt @@ -1,9 +1,9 @@ package org.example.order import java.math.BigDecimal -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.ManyToOne +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne @Entity class OrderItem(