github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #2722 from ebean-orm/feature/jakarta-jaxb"

Browse Source 
This reverts commit a6304ebe8b, reversing
changes made to 87cc95f60d.
This commit is contained in:
Noemi Praml
2022-08-09 14:53:34 +02:00
parent ed79ef8993
commit e885ec9e3d
70 changed files with 174 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-autotune/pom.xml
+4 -9
View File
@@ -32,15 +32,10 @@
<!-- needed for java 11+ -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.0</version>
<scope>runtime</scope>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.6</version>
<scope>provided</scope>
</dependency>
<dependency>
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java
+4 -4
View File
@@ -1,9 +1,9 @@
package io.ebeaninternal.server.autotune.model;
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 javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.server.autotune.model;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;
/**
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.ebeaninternal.server.autotune.model;
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 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;
/**
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java
+4 -4
View File
@@ -1,9 +1,9 @@
package io.ebeaninternal.server.autotune.model;
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 javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java
+4 -4
View File
@@ -1,9 +1,9 @@
package io.ebeaninternal.server.autotune.model;
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 javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java
+4 -4
View File
@@ -1,9 +1,9 @@
package io.ebeaninternal.server.autotune.model;
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 javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java
+1 -1
View File
@@ -1,2 +1,2 @@
@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package io.ebeaninternal.server.autotune.model;
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java
+3 -3
View File
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.autotune.service;
import io.ebeaninternal.server.autotune.model.Autotune;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java
+3 -3
View File
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.autotune.service;
import io.ebeaninternal.server.autotune.model.Autotune;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
ebean-autotune/src/main/java/module-info.java
+2 -1
View File
@@ -10,5 +10,6 @@ module io.ebean.autotune {
requires io.ebean.api;
requires io.ebean.core;
requires jakarta.xml.bind;
requires java.xml;
requires java.xml.bind;
}
ebean-ddl-generator/pom.xml
+5 -9
View File
@@ -39,16 +39,12 @@
<scope>provided</scope>
</dependency>
<!-- needed for java 11+ -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.0</version>
<scope>runtime</scope>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.6</version>
<scope>provided</scope>
</dependency>
<!-- test dependencies -->
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java
+1 -1
View File
@@ -11,6 +11,6 @@ public class Detect {
* Return true if JAXB is present.
*/
public static boolean isJAXBPresent(DatabaseConfig config) {
return config.getClassLoadConfig().isPresent("jakarta.xml.bind.JAXBException");
return config.getClassLoadConfig().isPresent("javax.xml.bind.JAXBException");
}
}
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.math.BigInteger;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
+4 -4
View File
@@ -1,9 +1,9 @@
package io.ebeaninternal.dbmigration.migration;
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 javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
+3 -3
View File
@@ -1,8 +1,8 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnumValue;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
+3 -3
View File
@@ -1,8 +1,8 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnumValue;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
+1 -1
View File
@@ -1,2 +1,2 @@
@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package io.ebeaninternal.dbmigration.migration;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
+3 -3
View File
@@ -3,9 +3,9 @@ package io.ebeaninternal.dbmigration.migrationreader;
import io.ebeaninternal.dbmigration.migration.Migration;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
+3 -3
View File
@@ -4,9 +4,9 @@ package io.ebeaninternal.dbmigration.migrationreader;
import io.ebean.util.IOUtils;
import io.ebeaninternal.dbmigration.migration.Migration;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import java.io.File;
import java.io.IOException;
import java.io.Writer;
ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
+6 -6
View File
@@ -1,11 +1,11 @@
package io.ebeaninternal.extraddl.model;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlValue;
import 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;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.ebeaninternal.extraddl.model;
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 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 java.util.ArrayList;
import java.util.List;
ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+3 -3
View File
@@ -4,9 +4,9 @@ import io.ebean.annotation.Platform;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import java.io.IOException;
import java.io.InputStream;
ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.extraddl.model;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;
/**
ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
+1 -1
View File
@@ -1,2 +1,2 @@
@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package io.ebeaninternal.extraddl.model;
ebean-ddl-generator/src/main/java/module-info.java
+1 -1
View File
@@ -13,7 +13,7 @@ module io.ebean.ddl.generator {
requires transitive io.ebean.ddl.runner;
requires transitive io.ebean.core;
requires transitive jakarta.xml.bind;
requires transitive java.xml.bind;
requires io.ebean.core.type;
requires io.ebean.migration;
ebean-externalmapping-xml/pom.xml
+8 -7
View File
@@ -32,15 +32,16 @@
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.6</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.0</version>
<scope>runtime</scope>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+3 -3
View File
@@ -3,9 +3,9 @@ package io.ebeaninternal.xmlmapping;
import io.avaje.classpath.scanner.Resource;
import io.ebeaninternal.xmlmapping.model.XmEbean;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.xmlmapping.model;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;
/**
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.ebeaninternal.xmlmapping.model;
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 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;
/**
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.ebeaninternal.xmlmapping.model;
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 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;
/**
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
+6 -6
View File
@@ -1,11 +1,11 @@
package io.ebeaninternal.xmlmapping.model;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.ebeaninternal.xmlmapping.model;
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 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 java.util.ArrayList;
import java.util.List;
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java
+6 -6
View File
@@ -1,11 +1,11 @@
package io.ebeaninternal.xmlmapping.model;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java
+6 -6
View File
@@ -1,11 +1,11 @@
package io.ebeaninternal.xmlmapping.model;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java
+5 -5
View File
@@ -1,10 +1,10 @@
package io.ebeaninternal.xmlmapping.model;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
/**
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java
+6 -6
View File
@@ -1,11 +1,11 @@
package io.ebeaninternal.xmlmapping.model;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java
+1 -1
View File
@@ -1,2 +1,2 @@
@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ebean", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ebean", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package io.ebeaninternal.xmlmapping.model;
ebean-externalmapping-xml/src/main/java/module-info.java
+2 -1
View File
@@ -10,7 +10,8 @@ module io.ebean.xmapping.xml {
provides XmapService with JaxbXmapService;
requires transitive io.ebean.xmapping.api;
requires transitive jakarta.xml.bind;
requires transitive java.xml;
requires transitive java.xml.bind;
requires io.avaje.classpath.scanner.api;
requires io.avaje.classpath.scanner;
requires static org.slf4j;
ebean-test/pom.xml
+9 -7
View File
@@ -73,15 +73,17 @@
<!-- Including JAXB for DB Migration generation with Java 11+ -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.6</version>
</dependency>
<!-- Needed for module path compile, jaxb foo bar needs review -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.0</version>
<scope>runtime</scope>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
<!-- Not strictly required but bring in H2 Driver because we use it so much -->
ebean-test/src/main/java/module-info.java
+1 -1
View File
@@ -20,7 +20,7 @@ open module io.ebean.test {
requires transitive io.ebean.test.containers;
requires transitive org.assertj.core;
requires transitive jakarta.xml.bind;
requires transitive java.xml.bind;
requires transitive com.h2database;
// support testing