Revert "Migrate to Jakarta JAXB (jakarta.xml.bind <- javax.xml.bind)"

This commit is contained in:
Rob Bygrave authored and GitHub committed 2022-08-15 15:14:57 +12:00
1 parent 6a4cfb231d
commit 73bc9e516e
70 files changed
+174 -178

No files matched your search

+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 -->
@@ -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");
}
}
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
import java.math.BigInteger;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -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;
@@ -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;
/**
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -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;
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -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;
/**
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.migration;
import jakarta.xml.bind.annotation.*;
import javax.xml.bind.annotation.*;
/**
@@ -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;
@@ -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;
@@ -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;
@@ -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;
/**
@@ -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;
@@ -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;
@@ -1,6 +1,6 @@
package io.ebeaninternal.extraddl.model;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.bind.annotation.XmlRegistry;
/**
@@ -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;
@@ -7,7 +7,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;