diff --git a/hyperjaxb/ejb/plugin/src/main/resources/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizations.xml b/hyperjaxb/ejb/plugin/src/main/resources/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizations.xml index 55fe81f66..cba1ea128 100644 --- a/hyperjaxb/ejb/plugin/src/main/resources/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizations.xml +++ b/hyperjaxb/ejb/plugin/src/main/resources/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizations.xml @@ -83,14 +83,14 @@ - + - + diff --git a/hyperjaxb/ejb/roundtrip/pom.xml b/hyperjaxb/ejb/roundtrip/pom.xml index 97e4973eb..138cfa39c 100644 --- a/hyperjaxb/ejb/roundtrip/pom.xml +++ b/hyperjaxb/ejb/roundtrip/pom.xml @@ -36,19 +36,18 @@ provided - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml b/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml index 204223e73..29d6da3f2 100644 --- a/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml +++ b/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml @@ -46,9 +46,9 @@ ${jpa-api.version} - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} @@ -59,8 +59,7 @@ org.hsqldb hsqldb - ${hsqldb.version} - jdk8 + ${hsqldb.version} runtime diff --git a/hyperjaxb/ejb/samples/po-customized-eclipselink/pom.xml b/hyperjaxb/ejb/samples/po-customized-eclipselink/pom.xml index 5db83d1a9..b7b4cb73a 100644 --- a/hyperjaxb/ejb/samples/po-customized-eclipselink/pom.xml +++ b/hyperjaxb/ejb/samples/po-customized-eclipselink/pom.xml @@ -41,7 +41,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/samples/po-customized-eclipselink/project-pom.xml b/hyperjaxb/ejb/samples/po-customized-eclipselink/project-pom.xml index 0b7fb8cb0..d9d35f41e 100644 --- a/hyperjaxb/ejb/samples/po-customized-eclipselink/project-pom.xml +++ b/hyperjaxb/ejb/samples/po-customized-eclipselink/project-pom.xml @@ -49,8 +49,7 @@ org.hsqldb hsqldb - ${hsqldb.version} - jdk8 + ${hsqldb.version} test diff --git a/hyperjaxb/ejb/samples/po-initial/pom.xml b/hyperjaxb/ejb/samples/po-initial/pom.xml index 739329a3d..6899598c1 100644 --- a/hyperjaxb/ejb/samples/po-initial/pom.xml +++ b/hyperjaxb/ejb/samples/po-initial/pom.xml @@ -29,8 +29,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -42,8 +42,6 @@ org.hsqldb hsqldb - ${hsqldb.version} - jdk8 test diff --git a/hyperjaxb/ejb/samples/po-initial/project-pom.xml b/hyperjaxb/ejb/samples/po-initial/project-pom.xml index d159ab581..ad263f8a2 100644 --- a/hyperjaxb/ejb/samples/po-initial/project-pom.xml +++ b/hyperjaxb/ejb/samples/po-initial/project-pom.xml @@ -40,17 +40,16 @@ - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} test org.hsqldb hsqldb - ${hsqldb.version} - jdk8 + ${hsqldb.version} test diff --git a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml index d1c0265fb..7b6f90883 100644 --- a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml +++ b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml @@ -35,17 +35,16 @@ - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} test org.hsqldb hsqldb - ${hsqldb.version} - jdk8 + ${hsqldb.version} test diff --git a/hyperjaxb/ejb/samples/uniprot/pom.xml b/hyperjaxb/ejb/samples/uniprot/pom.xml index 9272c8beb..783dd2ebf 100644 --- a/hyperjaxb/ejb/samples/uniprot/pom.xml +++ b/hyperjaxb/ejb/samples/uniprot/pom.xml @@ -29,8 +29,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -42,7 +42,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/samples/uniprot/project-pom.xml b/hyperjaxb/ejb/samples/uniprot/project-pom.xml index 78a2a1415..0d6e0ba4d 100644 --- a/hyperjaxb/ejb/samples/uniprot/project-pom.xml +++ b/hyperjaxb/ejb/samples/uniprot/project-pom.xml @@ -40,9 +40,9 @@ - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} test @@ -50,7 +50,6 @@ org.hsqldb hsqldb ${hsqldb.version} - jdk8 test diff --git a/hyperjaxb/ejb/schemas/customizations/src/main/java/org/jvnet/hyperjaxb3/ejb/schemas/customizations/Customizations.java b/hyperjaxb/ejb/schemas/customizations/src/main/java/org/jvnet/hyperjaxb3/ejb/schemas/customizations/Customizations.java index cf87f7d91..833772b22 100644 --- a/hyperjaxb/ejb/schemas/customizations/src/main/java/org/jvnet/hyperjaxb3/ejb/schemas/customizations/Customizations.java +++ b/hyperjaxb/ejb/schemas/customizations/src/main/java/org/jvnet/hyperjaxb3/ejb/schemas/customizations/Customizations.java @@ -109,7 +109,7 @@ public static QName orm(String localPart) { public static final QName EMBEDDED_ELEMENT_NAME = hj("embedded"); public static QName GENERATED_ELEMENT_NAME = new QName( - "http://jaxb2-commons.dev.java.net/basic", "generated"); + "urn:jaxb.jvnet.org:plugin", "generated"); diff --git a/hyperjaxb/ejb/schemas/customizations/src/main/resources/customizations.xsd b/hyperjaxb/ejb/schemas/customizations/src/main/resources/customizations.xsd index 81ffc36f3..c5dd11bc6 100644 --- a/hyperjaxb/ejb/schemas/customizations/src/main/resources/customizations.xsd +++ b/hyperjaxb/ejb/schemas/customizations/src/main/resources/customizations.xsd @@ -11,7 +11,7 @@ xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance"> + schemaLocation="orm/orm_3_1.xsd"/> diff --git a/hyperjaxb/ejb/schemas/customizations/src/main/resources/orm/orm_3_0.xsd b/hyperjaxb/ejb/schemas/customizations/src/main/resources/orm/orm_3_1.xsd similarity index 99% rename from hyperjaxb/ejb/schemas/customizations/src/main/resources/orm/orm_3_0.xsd rename to hyperjaxb/ejb/schemas/customizations/src/main/resources/orm/orm_3_1.xsd index 233d98f6e..f233261ef 100644 --- a/hyperjaxb/ejb/schemas/customizations/src/main/resources/orm/orm_3_0.xsd +++ b/hyperjaxb/ejb/schemas/customizations/src/main/resources/orm/orm_3_1.xsd @@ -1,6 +1,6 @@ + + + + + + + ... + + + + ]]> + + + + + + + + + + + + + + + + + + The entity-mappings element is the root element of a mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, converter, named-query, + named-native-query, named-stored-procedure-query, and + sql-result-set-mapping elements are global to the persistence + unit. It is undefined to have more than one sequence-generator + or table-generator of the same name in the same or different + mapping files in a persistence unit. It is undefined to have + more than one named-query, named-native-query, sql-result-set-mapping, + or named-stored-procedure-query of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one converter for the same target + type in the same or different mapping files in a persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified, + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + + + + + + + + + + + + + + + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + catalog - Used as the catalog for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + delimited-identifiers - Used to treat database identifiers as + delimited identifiers. + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in all entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + + + + + + + + + + + + + + + + + + + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns() default{}; + JoinTable joinTable() default @JoinTable; + } + + + + + + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + + + + + + + + + + + + + + + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + + + + + + + + + + + + + + + + + + + + + + + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH}; + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface CollectionTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + + + + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + Class type() default void.class; + } + + + + + + + + + + + + + + public enum ConstraintMode {CONSTRAINT, NO_CONSTRAINT, PROVIDER_DEFAULT}; + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface ConstructorResult { + Class targetClass(); + ColumnResult[] columns(); + } + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Convert { + Class converter() default void.class; + String attributeName() default ""; + boolean disableConversion() default false; + } + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Converter { + boolean autoApply() default false; + } + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + + + + + + + + + + + + + + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ElementCollection { + Class targetClass() default void.class; + FetchType fetch() default LAZY; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + + + + + + + + + + + + + + + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + + + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + + + + + + + + + + + + + + + + public enum EnumType { + ORDINAL, + STRING + } + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + + + + + + + + + + + + public enum FetchType { LAZY, EAGER }; + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface ForeignKey { + String name() default ""; + ConstraintMode value() default CONSTRAINT; + String foreign-key-definition() default ""; + + Note that the elements that embed the use of the annotation + default this use as @ForeignKey(PROVIDER_DEFAULT). + + } + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + + + + + + + + + + + + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, UUID, AUTO }; + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface Index { + String name() default ""; + String columnList(); + boolean unique() default false; + } + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + + + + + + + + + + + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + ForeignKey foreignKey() default @ForeignKey(); + } + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + + + + + + + + + + + public enum LockModeType { READ, WRITE, OPTIMISTIC, OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ, PESSIMISTIC_WRITE, PESSIMISTIC_FORCE_INCREMENT, NONE}; + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyClass { + Class value(); + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyColumn { + String name() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + + + + + + + + + + + + + + + + + + + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface NamedAttributeNode { + String value(); + String subgraph() default ""; + String keySubgraph() default ""; + } + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedEntityGraph { + String name() default ""; + NamedAttributeNode[] attributeNodes() default {}; + boolean includeAllAttributes() default false; + NamedSubgraph[] subgraphs() default {}; + NamedSubGraph[] subclassSubgraphs() default {}; + } + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + LockModeType lockMode() default NONE; + QueryHint[] hints() default {}; + } + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedStoredProcedureQuery { + String name(); + String procedureName(); + StoredProcedureParameter[] parameters() default {}; + Class[] resultClasses() default {}; + String[] resultSetMappings() default{}; + QueryHint[] hints() default {}; + } + + + + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface NamedSubgraph { + String name(); + Class type() default void.class; + NamedAttributeNode[] attributeNodes(); + } + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + boolean orphanRemoval() default false; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderColumn { + String name() default ""; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + } + + + + + + + + + + + + + + + + + public enum ParameterMode { IN, INOUT, OUT, REF_CURSOR}; + + + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + String catalog() default ""; + String schema() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ConstructorResult[] classes() default{}; + ColumnResult[] columns() default {}; + } + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface StoredProcedureParameter { + String name() default ""; + ParameterMode mode() default ParameterMode.IN; + Class type(); + } + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + Indexes[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + + + + + + + + + + + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String name() default ""; + String[] columnNames(); + } + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + + + + + + + + + + + diff --git a/hyperjaxb/ejb/templates/basic/pom.xml b/hyperjaxb/ejb/templates/basic/pom.xml index 5aa27ffb9..af257cfdd 100644 --- a/hyperjaxb/ejb/templates/basic/pom.xml +++ b/hyperjaxb/ejb/templates/basic/pom.xml @@ -33,8 +33,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -46,7 +46,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/templates/basic/project-pom.xml b/hyperjaxb/ejb/templates/basic/project-pom.xml index 14e9c969f..6156ad9ea 100644 --- a/hyperjaxb/ejb/templates/basic/project-pom.xml +++ b/hyperjaxb/ejb/templates/basic/project-pom.xml @@ -40,18 +40,17 @@ - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} test org.hsqldb hsqldb - ${hsqldb.version} - jdk8 - test + ${hsqldb.version} + test diff --git a/hyperjaxb/ejb/tests/addressbook/pom.xml b/hyperjaxb/ejb/tests/addressbook/pom.xml index eb60bdbe6..65052d45f 100644 --- a/hyperjaxb/ejb/tests/addressbook/pom.xml +++ b/hyperjaxb/ejb/tests/addressbook/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ak/pom.xml b/hyperjaxb/ejb/tests/ak/pom.xml index 076ea00dd..e6ca7b959 100644 --- a/hyperjaxb/ejb/tests/ak/pom.xml +++ b/hyperjaxb/ejb/tests/ak/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/annox/pom.xml b/hyperjaxb/ejb/tests/annox/pom.xml index c076402a9..2ad3c29e3 100644 --- a/hyperjaxb/ejb/tests/annox/pom.xml +++ b/hyperjaxb/ejb/tests/annox/pom.xml @@ -26,14 +26,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/any/pom.xml b/hyperjaxb/ejb/tests/any/pom.xml index c6a61e745..04052293e 100644 --- a/hyperjaxb/ejb/tests/any/pom.xml +++ b/hyperjaxb/ejb/tests/any/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/bibtexml/pom.xml b/hyperjaxb/ejb/tests/bibtexml/pom.xml index 09fa45528..d7aef373b 100644 --- a/hyperjaxb/ejb/tests/bibtexml/pom.xml +++ b/hyperjaxb/ejb/tests/bibtexml/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ccr/pom.xml b/hyperjaxb/ejb/tests/ccr/pom.xml index 3945cb606..ac18981a4 100644 --- a/hyperjaxb/ejb/tests/ccr/pom.xml +++ b/hyperjaxb/ejb/tests/ccr/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/cda/pom.xml b/hyperjaxb/ejb/tests/cda/pom.xml index 728efd57c..ceef8896e 100644 --- a/hyperjaxb/ejb/tests/cda/pom.xml +++ b/hyperjaxb/ejb/tests/cda/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 3.0.2-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-cda @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/component-jpa2/pom.xml b/hyperjaxb/ejb/tests/component-jpa2/pom.xml index 54fc4fe1a..5cfe0c20c 100644 --- a/hyperjaxb/ejb/tests/component-jpa2/pom.xml +++ b/hyperjaxb/ejb/tests/component-jpa2/pom.xml @@ -14,8 +14,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test diff --git a/hyperjaxb/ejb/tests/component/pom.xml b/hyperjaxb/ejb/tests/component/pom.xml index 0ae29bbf7..35bb78216 100644 --- a/hyperjaxb/ejb/tests/component/pom.xml +++ b/hyperjaxb/ejb/tests/component/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-component @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/cu-one/pom.xml b/hyperjaxb/ejb/tests/cu-one/pom.xml index 76462fc3b..30e5e8886 100644 --- a/hyperjaxb/ejb/tests/cu-one/pom.xml +++ b/hyperjaxb/ejb/tests/cu-one/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core org.hsqldb hsqldb - jdk8 test @@ -42,9 +41,9 @@ - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} diff --git a/hyperjaxb/ejb/tests/cu-one/src/main/resources/schema.xsd b/hyperjaxb/ejb/tests/cu-one/src/main/resources/schema.xsd index 757d7fe71..9d9b0a791 100644 --- a/hyperjaxb/ejb/tests/cu-one/src/main/resources/schema.xsd +++ b/hyperjaxb/ejb/tests/cu-one/src/main/resources/schema.xsd @@ -7,8 +7,8 @@ xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" - xmlns:annox="http://annox.dev.java.net" - xmlns:ha="http://annox.dev.java.net/org.hibernate.annotations" + xmlns:annox="urn:jaxb.jvnet.org:annox" + xmlns:ha="urn:jaxb.jvnet.org:annox:org.hibernate.annotations" jaxb:extensionBindingPrefixes="hj orm xjc annox" jaxb:version="3.0" @@ -249,7 +249,7 @@ - DATE + TIMESTAMP diff --git a/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml b/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml index 4f6ba7637..d003caacf 100644 --- a/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml +++ b/hyperjaxb/ejb/tests/custom-naming/schema/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests-custom-naming - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-custom-naming-schema @@ -22,14 +22,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/customType/pom.xml b/hyperjaxb/ejb/tests/customType/pom.xml index 501461548..1e28f71c6 100644 --- a/hyperjaxb/ejb/tests/customType/pom.xml +++ b/hyperjaxb/ejb/tests/customType/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/customizations/pom.xml b/hyperjaxb/ejb/tests/customizations/pom.xml index debd893a7..e3e6e7189 100644 --- a/hyperjaxb/ejb/tests/customizations/pom.xml +++ b/hyperjaxb/ejb/tests/customizations/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/dc/pom.xml b/hyperjaxb/ejb/tests/dc/pom.xml index 49177521f..a95c5aa41 100644 --- a/hyperjaxb/ejb/tests/dc/pom.xml +++ b/hyperjaxb/ejb/tests/dc/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/derby/pom.xml b/hyperjaxb/ejb/tests/derby/pom.xml index 5c8f5e78c..a59b02e8b 100644 --- a/hyperjaxb/ejb/tests/derby/pom.xml +++ b/hyperjaxb/ejb/tests/derby/pom.xml @@ -15,8 +15,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test diff --git a/hyperjaxb/ejb/tests/device/pom.xml b/hyperjaxb/ejb/tests/device/pom.xml index 69e679571..97a186d47 100644 --- a/hyperjaxb/ejb/tests/device/pom.xml +++ b/hyperjaxb/ejb/tests/device/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/dl/pom.xml b/hyperjaxb/ejb/tests/dl/pom.xml index ebd0fc84f..04c80f6b1 100644 --- a/hyperjaxb/ejb/tests/dl/pom.xml +++ b/hyperjaxb/ejb/tests/dl/pom.xml @@ -16,14 +16,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/dom/pom.xml b/hyperjaxb/ejb/tests/dom/pom.xml index 6e021e9b3..f68231461 100644 --- a/hyperjaxb/ejb/tests/dom/pom.xml +++ b/hyperjaxb/ejb/tests/dom/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/dy/pom.xml b/hyperjaxb/ejb/tests/dy/pom.xml index d9a2074f6..0f870367d 100644 --- a/hyperjaxb/ejb/tests/dy/pom.xml +++ b/hyperjaxb/ejb/tests/dy/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ebxmlrr/pom.xml b/hyperjaxb/ejb/tests/ebxmlrr/pom.xml index eac9de628..0901c4794 100644 --- a/hyperjaxb/ejb/tests/ebxmlrr/pom.xml +++ b/hyperjaxb/ejb/tests/ebxmlrr/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/edxl/pom.xml b/hyperjaxb/ejb/tests/edxl/pom.xml index ea3d73055..802fa7b76 100644 --- a/hyperjaxb/ejb/tests/edxl/pom.xml +++ b/hyperjaxb/ejb/tests/edxl/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-edxl @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ek/pom.xml b/hyperjaxb/ejb/tests/ek/pom.xml index d7a90d0ff..020923a58 100644 --- a/hyperjaxb/ejb/tests/ek/pom.xml +++ b/hyperjaxb/ejb/tests/ek/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml b/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml index a67f11737..889132467 100644 --- a/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml +++ b/hyperjaxb/ejb/tests/embeddable-jpa2/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/embeddable/pom.xml b/hyperjaxb/ejb/tests/embeddable/pom.xml index 999452fe5..2cd2f9cc3 100644 --- a/hyperjaxb/ejb/tests/embeddable/pom.xml +++ b/hyperjaxb/ejb/tests/embeddable/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/eminq/pom.xml b/hyperjaxb/ejb/tests/eminq/pom.xml index df52333d7..41e841dd3 100644 --- a/hyperjaxb/ejb/tests/eminq/pom.xml +++ b/hyperjaxb/ejb/tests/eminq/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/enum/pom.xml b/hyperjaxb/ejb/tests/enum/pom.xml index e3c26fa01..61c0fda43 100644 --- a/hyperjaxb/ejb/tests/enum/pom.xml +++ b/hyperjaxb/ejb/tests/enum/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/enum/src/main/resources/schema.xsd b/hyperjaxb/ejb/tests/enum/src/main/resources/schema.xsd index 4da6043d8..dc730ad61 100644 --- a/hyperjaxb/ejb/tests/enum/src/main/resources/schema.xsd +++ b/hyperjaxb/ejb/tests/enum/src/main/resources/schema.xsd @@ -22,7 +22,7 @@ - + diff --git a/hyperjaxb/ejb/tests/episodes/a/pom.xml b/hyperjaxb/ejb/tests/episodes/a/pom.xml index 55d95d365..18049133f 100644 --- a/hyperjaxb/ejb/tests/episodes/a/pom.xml +++ b/hyperjaxb/ejb/tests/episodes/a/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/episodes/b/pom.xml b/hyperjaxb/ejb/tests/episodes/b/pom.xml index e7c47ee06..7b4f6b635 100644 --- a/hyperjaxb/ejb/tests/episodes/b/pom.xml +++ b/hyperjaxb/ejb/tests/episodes/b/pom.xml @@ -19,14 +19,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml b/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml index 1a0587ca1..6f55e13c4 100644 --- a/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml +++ b/hyperjaxb/ejb/tests/equals-builder/schema/pom.xml @@ -20,14 +20,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml b/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml index 589d3947c..528e390b2 100644 --- a/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml +++ b/hyperjaxb/ejb/tests/fpml-pretrade/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ids/pom.xml b/hyperjaxb/ejb/tests/ids/pom.xml index 7b8bae0b3..f74d7f65e 100644 --- a/hyperjaxb/ejb/tests/ids/pom.xml +++ b/hyperjaxb/ejb/tests/ids/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml b/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml index 266dd2720..b5030fa9a 100644 --- a/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml +++ b/hyperjaxb/ejb/tests/ims-eportfolio/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ims-lip/pom.xml b/hyperjaxb/ejb/tests/ims-lip/pom.xml index 29f4ef5b5..0554c4cd4 100644 --- a/hyperjaxb/ejb/tests/ims-lip/pom.xml +++ b/hyperjaxb/ejb/tests/ims-lip/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/ioda/pom.xml b/hyperjaxb/ejb/tests/ioda/pom.xml index 4bf522945..b5e3bdea3 100644 --- a/hyperjaxb/ejb/tests/ioda/pom.xml +++ b/hyperjaxb/ejb/tests/ioda/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/issues-el/pom.xml b/hyperjaxb/ejb/tests/issues-el/pom.xml index c70b83f28..20d18ecb2 100644 --- a/hyperjaxb/ejb/tests/issues-el/pom.xml +++ b/hyperjaxb/ejb/tests/issues-el/pom.xml @@ -21,7 +21,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/issues-jpa2/pom.xml b/hyperjaxb/ejb/tests/issues-jpa2/pom.xml index 94849595e..c4456484e 100644 --- a/hyperjaxb/ejb/tests/issues-jpa2/pom.xml +++ b/hyperjaxb/ejb/tests/issues-jpa2/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/issues-pre/pom.xml b/hyperjaxb/ejb/tests/issues-pre/pom.xml index 2889a32b3..ca8ecc7a2 100644 --- a/hyperjaxb/ejb/tests/issues-pre/pom.xml +++ b/hyperjaxb/ejb/tests/issues-pre/pom.xml @@ -14,8 +14,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test diff --git a/hyperjaxb/ejb/tests/issues/pom.xml b/hyperjaxb/ejb/tests/issues/pom.xml index d1903d0f0..3fc98d91a 100644 --- a/hyperjaxb/ejb/tests/issues/pom.xml +++ b/hyperjaxb/ejb/tests/issues/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/issues/src/main/resources/binding.xjb b/hyperjaxb/ejb/tests/issues/src/main/resources/binding.xjb index 9d05fd38a..734a992f1 100644 --- a/hyperjaxb/ejb/tests/issues/src/main/resources/binding.xjb +++ b/hyperjaxb/ejb/tests/issues/src/main/resources/binding.xjb @@ -3,7 +3,7 @@ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations" - xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance" + xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance" jaxb:extensionBindingPrefixes="xjc orm inheritance" xmlns:test="urn:test"> diff --git a/hyperjaxb/ejb/tests/issues/src/main/resources/schema-ignored.xsd b/hyperjaxb/ejb/tests/issues/src/main/resources/schema-ignored.xsd index 527c47585..28032d2c3 100644 --- a/hyperjaxb/ejb/tests/issues/src/main/resources/schema-ignored.xsd +++ b/hyperjaxb/ejb/tests/issues/src/main/resources/schema-ignored.xsd @@ -26,4 +26,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hyperjaxb/ejb/tests/issues/src/main/resources/schema.xsd b/hyperjaxb/ejb/tests/issues/src/main/resources/schema.xsd index 7ad491263..c07fa1cb7 100644 --- a/hyperjaxb/ejb/tests/issues/src/main/resources/schema.xsd +++ b/hyperjaxb/ejb/tests/issues/src/main/resources/schema.xsd @@ -207,29 +207,6 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hyperjaxb/ejb/tests/issues/src/test/samples/issue112[0].xml b/hyperjaxb/ejb/tests/issues/src/test/tobefixed/issue112[0].xml similarity index 100% rename from hyperjaxb/ejb/tests/issues/src/test/samples/issue112[0].xml rename to hyperjaxb/ejb/tests/issues/src/test/tobefixed/issue112[0].xml diff --git a/hyperjaxb/ejb/tests/nml/pom.xml b/hyperjaxb/ejb/tests/nml/pom.xml index e86cc0554..02f1b5b33 100644 --- a/hyperjaxb/ejb/tests/nml/pom.xml +++ b/hyperjaxb/ejb/tests/nml/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 3.0.2-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-nml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/nokis/pom.xml b/hyperjaxb/ejb/tests/nokis/pom.xml index 7e4db8d94..e1a7f736b 100644 --- a/hyperjaxb/ejb/tests/nokis/pom.xml +++ b/hyperjaxb/ejb/tests/nokis/pom.xml @@ -13,14 +13,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/one/pom.xml b/hyperjaxb/ejb/tests/one/pom.xml index 1905520b5..756efa630 100644 --- a/hyperjaxb/ejb/tests/one/pom.xml +++ b/hyperjaxb/ejb/tests/one/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/onix30/pom.xml b/hyperjaxb/ejb/tests/onix30/pom.xml index 1704192d5..bb0daa5b7 100644 --- a/hyperjaxb/ejb/tests/onix30/pom.xml +++ b/hyperjaxb/ejb/tests/onix30/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/onix30/src/main/resources/binding.xjb b/hyperjaxb/ejb/tests/onix30/src/main/resources/binding.xjb index 29f42acf4..fe7bb673b 100644 --- a/hyperjaxb/ejb/tests/onix30/src/main/resources/binding.xjb +++ b/hyperjaxb/ejb/tests/onix30/src/main/resources/binding.xjb @@ -6,7 +6,7 @@ diff --git a/hyperjaxb/ejb/tests/ota/pom.xml b/hyperjaxb/ejb/tests/ota/pom.xml index 5d2eeab22..05d4f5e28 100644 --- a/hyperjaxb/ejb/tests/ota/pom.xml +++ b/hyperjaxb/ejb/tests/ota/pom.xml @@ -14,8 +14,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -27,7 +27,6 @@ org.hsqldb hsqldb - jdk8 test - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/pesc/pom.xml b/hyperjaxb/ejb/tests/pesc/pom.xml index 69ca29cef..5277d9642 100644 --- a/hyperjaxb/ejb/tests/pesc/pom.xml +++ b/hyperjaxb/ejb/tests/pesc/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/plmxml/pom.xml b/hyperjaxb/ejb/tests/plmxml/pom.xml index 52f6b38a9..b0cc83892 100644 --- a/hyperjaxb/ejb/tests/plmxml/pom.xml +++ b/hyperjaxb/ejb/tests/plmxml/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-plmxml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/po-customized/pom.xml b/hyperjaxb/ejb/tests/po-customized/pom.xml index f2614d988..5c83bc573 100644 --- a/hyperjaxb/ejb/tests/po-customized/pom.xml +++ b/hyperjaxb/ejb/tests/po-customized/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/po-el-customized/pom.xml b/hyperjaxb/ejb/tests/po-el-customized/pom.xml index fe08bb298..3706b5d7e 100644 --- a/hyperjaxb/ejb/tests/po-el-customized/pom.xml +++ b/hyperjaxb/ejb/tests/po-el-customized/pom.xml @@ -21,7 +21,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/po-jaxb/pom.xml b/hyperjaxb/ejb/tests/po-jaxb/pom.xml index 0f591f2c6..0fef28f8e 100644 --- a/hyperjaxb/ejb/tests/po-jaxb/pom.xml +++ b/hyperjaxb/ejb/tests/po-jaxb/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml b/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml index 099401107..b8b23c780 100644 --- a/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml +++ b/hyperjaxb/ejb/tests/po-jpa-2.1/pom.xml @@ -14,8 +14,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test diff --git a/hyperjaxb/ejb/tests/po-mysql/pom.xml b/hyperjaxb/ejb/tests/po-mysql/pom.xml index acccff5d8..17fa45880 100644 --- a/hyperjaxb/ejb/tests/po-mysql/pom.xml +++ b/hyperjaxb/ejb/tests/po-mysql/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-po-mysql @@ -15,8 +15,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -68,9 +68,9 @@ ${jpa-api.version} - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} com.mysql diff --git a/hyperjaxb/ejb/tests/po-tl-customized/pom.xml b/hyperjaxb/ejb/tests/po-tl-customized/pom.xml index b173b8187..734ade946 100644 --- a/hyperjaxb/ejb/tests/po-tl-customized/pom.xml +++ b/hyperjaxb/ejb/tests/po-tl-customized/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 3.0.2-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-po-tl-customized @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/po/pom.xml b/hyperjaxb/ejb/tests/po/pom.xml index 2ab370eb5..760552747 100644 --- a/hyperjaxb/ejb/tests/po/pom.xml +++ b/hyperjaxb/ejb/tests/po/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/polyform/pom.xml b/hyperjaxb/ejb/tests/polyform/pom.xml index f4aea2fa0..c1c9151c1 100644 --- a/hyperjaxb/ejb/tests/polyform/pom.xml +++ b/hyperjaxb/ejb/tests/polyform/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/pom.xml b/hyperjaxb/ejb/tests/pom.xml index d7f79a552..29d377c35 100644 --- a/hyperjaxb/ejb/tests/pom.xml +++ b/hyperjaxb/ejb/tests/pom.xml @@ -186,7 +186,7 @@ - ccr + custom-naming diff --git a/hyperjaxb/ejb/tests/punit/core/pom.xml b/hyperjaxb/ejb/tests/punit/core/pom.xml index 3c70f1a16..54447d717 100644 --- a/hyperjaxb/ejb/tests/punit/core/pom.xml +++ b/hyperjaxb/ejb/tests/punit/core/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/punit/ext/pom.xml b/hyperjaxb/ejb/tests/punit/ext/pom.xml index 3eae0d74e..2b60462f1 100644 --- a/hyperjaxb/ejb/tests/punit/ext/pom.xml +++ b/hyperjaxb/ejb/tests/punit/ext/pom.xml @@ -20,14 +20,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/px/pom.xml b/hyperjaxb/ejb/tests/px/pom.xml index 890ec2b70..f7fa9c67d 100644 --- a/hyperjaxb/ejb/tests/px/pom.xml +++ b/hyperjaxb/ejb/tests/px/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/regrep/pom.xml b/hyperjaxb/ejb/tests/regrep/pom.xml index 55477ef7c..ad3dbe9e7 100644 --- a/hyperjaxb/ejb/tests/regrep/pom.xml +++ b/hyperjaxb/ejb/tests/regrep/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/rim/pom.xml b/hyperjaxb/ejb/tests/rim/pom.xml index d8129a476..2e4b8fffa 100644 --- a/hyperjaxb/ejb/tests/rim/pom.xml +++ b/hyperjaxb/ejb/tests/rim/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/sbml/pom.xml b/hyperjaxb/ejb/tests/sbml/pom.xml index e35926905..f2f341612 100644 --- a/hyperjaxb/ejb/tests/sbml/pom.xml +++ b/hyperjaxb/ejb/tests/sbml/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/sepa/pom.xml b/hyperjaxb/ejb/tests/sepa/pom.xml index 8924126fa..69a76af16 100644 --- a/hyperjaxb/ejb/tests/sepa/pom.xml +++ b/hyperjaxb/ejb/tests/sepa/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/service/pom.xml b/hyperjaxb/ejb/tests/service/pom.xml index 362c671d6..09bebc731 100644 --- a/hyperjaxb/ejb/tests/service/pom.xml +++ b/hyperjaxb/ejb/tests/service/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/simple/pom.xml b/hyperjaxb/ejb/tests/simple/pom.xml index 55bbb45a4..741715109 100644 --- a/hyperjaxb/ejb/tests/simple/pom.xml +++ b/hyperjaxb/ejb/tests/simple/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/sml/pom.xml b/hyperjaxb/ejb/tests/sml/pom.xml index c39031865..e783cb1c2 100644 --- a/hyperjaxb/ejb/tests/sml/pom.xml +++ b/hyperjaxb/ejb/tests/sml/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-sml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/st/pom.xml b/hyperjaxb/ejb/tests/st/pom.xml index 9850b9640..00ffc05f1 100644 --- a/hyperjaxb/ejb/tests/st/pom.xml +++ b/hyperjaxb/ejb/tests/st/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/star/pom.xml b/hyperjaxb/ejb/tests/star/pom.xml index aa11cb7ac..f3406d5a4 100644 --- a/hyperjaxb/ejb/tests/star/pom.xml +++ b/hyperjaxb/ejb/tests/star/pom.xml @@ -5,7 +5,7 @@ org.jvnet.jaxb hyperjaxb3-ejb-tests - 2.0.10-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml hyperjaxb3-ejb-tests-star @@ -15,8 +15,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -27,7 +27,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/tp/pom.xml b/hyperjaxb/ejb/tests/tp/pom.xml index 6b37b0422..3221c844a 100644 --- a/hyperjaxb/ejb/tests/tp/pom.xml +++ b/hyperjaxb/ejb/tests/tp/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/transient-ids/pom.xml b/hyperjaxb/ejb/tests/transient-ids/pom.xml index e31267e81..a5dd3d53d 100644 --- a/hyperjaxb/ejb/tests/transient-ids/pom.xml +++ b/hyperjaxb/ejb/tests/transient-ids/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/uniprot/pom.xml b/hyperjaxb/ejb/tests/uniprot/pom.xml index b2363fef3..2c2eb7b9d 100644 --- a/hyperjaxb/ejb/tests/uniprot/pom.xml +++ b/hyperjaxb/ejb/tests/uniprot/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/verylong/pom.xml b/hyperjaxb/ejb/tests/verylong/pom.xml index a94a525be..beef2042b 100644 --- a/hyperjaxb/ejb/tests/verylong/pom.xml +++ b/hyperjaxb/ejb/tests/verylong/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/web/pom.xml b/hyperjaxb/ejb/tests/web/pom.xml index cfa93aef5..7c4afe708 100644 --- a/hyperjaxb/ejb/tests/web/pom.xml +++ b/hyperjaxb/ejb/tests/web/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/xacml/pom.xml b/hyperjaxb/ejb/tests/xacml/pom.xml index ab90baffb..d7f3dc7d1 100644 --- a/hyperjaxb/ejb/tests/xacml/pom.xml +++ b/hyperjaxb/ejb/tests/xacml/pom.xml @@ -14,14 +14,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tests/xmldsig/pom.xml b/hyperjaxb/ejb/tests/xmldsig/pom.xml index 09847cf7c..4d5417100 100644 --- a/hyperjaxb/ejb/tests/xmldsig/pom.xml +++ b/hyperjaxb/ejb/tests/xmldsig/pom.xml @@ -15,14 +15,13 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tutorials/po/step-one/pom.xml b/hyperjaxb/ejb/tutorials/po/step-one/pom.xml index 2c3de0984..3f8012627 100644 --- a/hyperjaxb/ejb/tutorials/po/step-one/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/step-one/pom.xml @@ -35,8 +35,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -53,7 +53,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tutorials/po/step-three/pom.xml b/hyperjaxb/ejb/tutorials/po/step-three/pom.xml index 337fb5f22..04b5817ca 100644 --- a/hyperjaxb/ejb/tutorials/po/step-three/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/step-three/pom.xml @@ -53,7 +53,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/ejb/tutorials/po/step-two/pom.xml b/hyperjaxb/ejb/tutorials/po/step-two/pom.xml index 18074d15d..073391121 100644 --- a/hyperjaxb/ejb/tutorials/po/step-two/pom.xml +++ b/hyperjaxb/ejb/tutorials/po/step-two/pom.xml @@ -41,8 +41,8 @@ - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test @@ -54,7 +54,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/misc/dynamic/pom.xml b/hyperjaxb/misc/dynamic/pom.xml index 5cbf0f2a6..1603842ea 100644 --- a/hyperjaxb/misc/dynamic/pom.xml +++ b/hyperjaxb/misc/dynamic/pom.xml @@ -30,15 +30,14 @@ jaxb-xjc - org.hibernate - hibernate-core-jakarta + org.hibernate.orm + hibernate-core test org.hsqldb hsqldb ${hsqldb.version} - jdk8 test diff --git a/hyperjaxb/misc/jdo/roundtrip/pom.xml b/hyperjaxb/misc/jdo/roundtrip/pom.xml index 7ebec889c..329794963 100644 --- a/hyperjaxb/misc/jdo/roundtrip/pom.xml +++ b/hyperjaxb/misc/jdo/roundtrip/pom.xml @@ -24,7 +24,6 @@ org.hsqldb hsqldb - jdk8 test @@ -53,7 +52,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/misc/jdo/sample-hotel/pom.xml b/hyperjaxb/misc/jdo/sample-hotel/pom.xml index e35e13100..ac77fdc89 100644 --- a/hyperjaxb/misc/jdo/sample-hotel/pom.xml +++ b/hyperjaxb/misc/jdo/sample-hotel/pom.xml @@ -21,7 +21,6 @@ org.hsqldb hsqldb - jdk8 test diff --git a/hyperjaxb/pom.xml b/hyperjaxb/pom.xml index a68889e8e..c1e292bb5 100644 --- a/hyperjaxb/pom.xml +++ b/hyperjaxb/pom.xml @@ -21,9 +21,9 @@ 2.7.2 10.14.2.0 - 3.0.0 - 5.5.9.Final - 3.0.3 + 3.1.0 + 6.3.1.Final + 4.0.2 install @@ -72,9 +72,9 @@ - org.hibernate - hibernate-core-jakarta - ${hibernate-entitymanager.version} + org.hibernate.orm + hibernate-core + ${hibernate-core.version} @@ -93,7 +93,6 @@ org.hsqldb hsqldb ${hsqldb.version} - jdk8