From 1fbb5031ed99a65381a0e7ceb681b2fbb552c10d Mon Sep 17 00:00:00 2001 From: Stephan Reichhelm Date: Fri, 1 Dec 2023 17:52:18 +0100 Subject: [PATCH] Change dependencies to Jakarta EE libraries (#1605) * Remove Jersey dependency and migrate WPS WSDL functionality to ResourcesServlet * update namespace to be compliant with jaxb v3 * replace javax dependecies with jakarta for jaxb usage * fix formatting * * replace javax with jakarta dependencies * replace maven-jaxb2-plugin with jaxb-maven-plugin * * change more javax.activation and javax.soap to jakarta * * fix axiom/soap related issues of jakarta migration * * remove javax.* form exceptions of banDuplicateClasses + add banned dependencies for javax.xml.bind javax.activation * - remove JAXB references from main pom * * fix axiom issues * * move to older jakarta.activation-api 1.2.2 (which includes still javax.activation packages) * * include javax.activation and jakarta.activation * * fix dependency versions * * fiex deegree-protocol-wms tests * * fix oracle to use correct jaxb package * fix logging * * fixed formatting * * fix more dependency issues - remove obsolete stuff from pom.xml --------- Co-authored-by: Dirk Stenger Co-authored-by: Kevin van den Bosch --- .../core/validator/FileMimeTypeValidator.java | 2 +- .../org/deegree/wpsclient/gui/ClientBean.java | 2 +- .../pom.xml | 4 +- .../datasource/datasource.xsd | 4 +- deegree-core/deegree-core-3d/pom.xml | 4 +- .../schemas/datasource/3d/batchedmt/file.xsd | 2 +- .../schemas/datasource/3d/renderable/file.xsd | 2 +- .../schemas/datasource/3d/renderable/sql.xsd | 2 +- deegree-core/deegree-core-commons/pom.xml | 21 +++-- .../org/deegree/commons/mail/MailHelper.java | 22 +++--- .../commons/tom/datetime/DateTime.java | 2 +- .../tom/datetime/ISO8601Converter.java | 2 +- .../org/deegree/commons/xml/XMLAdapter.java | 24 ++---- .../deegree/commons/xml/jaxb/JAXBUtils.java | 6 +- .../commons/description/description.xsd | 4 +- .../META-INF/schemas/proxy/proxy.xsd | 4 +- deegree-core/deegree-core-coverage/pom.xml | 6 +- .../pyramid/PyramidCoverageMetadata.java | 2 +- .../datasource/coverage/raster/pyramid.xsd | 2 +- .../datasource/coverage/raster/raster.xsd | 2 +- deegree-core/deegree-core-cs/pom.xml | 8 +- .../deegree/d3/DeegreeCRSStoreProvider.java | 2 +- .../persistence/gml/GMLCRSStoreProvider.java | 2 +- .../proj4/PROJ4CRSStoreProvider.java | 2 +- .../schemas/crs/stores/deegree/deegree.xsd | 4 +- .../schemas/crs/stores/deegree2/deegree2.xsd | 4 +- .../META-INF/schemas/crs/stores/gml/gml.xsd | 4 +- .../schemas/crs/stores/proj4/proj4.xsd | 4 +- deegree-core/deegree-core-db/pom.xml | 4 +- .../resources/META-INF/schemas/jdbc/jdbc.xsd | 4 +- deegree-core/deegree-core-gdal/pom.xml | 4 +- .../deegree/commons/gdal/GdalSettings.java | 2 +- .../META-INF/schemas/commons/gdal/gdal.xsd | 4 +- deegree-core/deegree-core-geometry/pom.xml | 4 +- .../spatialmetadata/spatialmetadata.xsd | 4 +- .../SpatialMetadataConverterTest.java | 6 +- deegree-core/deegree-core-layer/pom.xml | 4 +- .../META-INF/schemas/layers/base/base.xsd | 2 +- .../deegree/layer/config/ConfigUtilsTest.java | 6 +- .../client/WMS111CapabilitiesAdapterTest.java | 5 +- .../client/WMS130CapabilitiesAdapterTest.java | 5 +- .../deegree-remoteows-wfs/pom.xml | 4 +- .../datasource/remoteows/wfs/remotewfs.xsd | 4 +- .../deegree-remoteows-wms/pom.xml | 4 +- .../datasource/remoteows/wms/remotewms.xsd | 4 +- .../schemas/remoteows/wms/remotewms.xsd | 4 +- .../deegree-remoteows-wmts/pom.xml | 4 +- .../remoteows/wmts/RemoteWmtsMetadata.java | 2 +- .../schemas/remoteows/wmts/remotewmts.xsd | 4 +- deegree-core/deegree-core-theme/pom.xml | 4 +- .../META-INF/schemas/themes/themes.xsd | 4 +- .../pom.xml | 4 +- .../OracleGeorasterMetadata.java | 10 ++- .../oraclegeoraster/oraclegeoraster.xsd | 2 +- .../deegree-featurestore-memory/pom.xml | 4 +- .../datasource/feature/memory/memory.xsd | 2 +- .../deegree-featurestore-remotewfs/pom.xml | 4 +- .../feature/remotewfs/remotewfs.xsd | 2 +- .../deegree-featurestore-shape/pom.xml | 4 +- .../datasource/feature/shape/shape.xsd | 4 +- .../deegree-featurestore-simplesql/pom.xml | 4 +- .../feature/simplesql/simplesql.xsd | 2 +- .../deegree-featurestore-sql/pom.xml | 4 +- .../config/AbstractMappedSchemaBuilder.java | 2 +- .../sql/config/MappedSchemaBuilderGML.java | 2 +- .../sql/config/MappedSchemaBuilderTable.java | 2 +- .../config/MappedSchemaBuilderTableOld.java | 2 +- .../schemas/datasource/feature/sql/sql.xsd | 2 +- .../deegree-mdstore-ebrim-eo/pom.xml | 4 +- .../datasource/metadata/ebrim/eo/ebrim-eo.xsd | 2 +- .../deegree-mdstore-iso-memory/pom.xml | 4 +- .../metadata/iso19139/memory/memory.xsd | 2 +- .../deegree-mdstore-iso/pom.xml | 4 +- .../datasource/metadata/iso19115/iso19115.xsd | 2 +- .../persistence/sql/AnyTextHelperTest.java | 6 +- .../deegree-tilestore-cache/pom.xml | 6 +- .../schemas/datasource/tile/cache/cache.xsd | 2 +- .../deegree-tilestore-commons/pom.xml | 4 +- .../tile/tilematrixset/tilematrixset.xsd | 2 +- .../deegree-tilestore-filesystem/pom.xml | 4 +- .../datasource/tile/filesystem/filesystem.xsd | 2 +- .../deegree-tilestore-gdal/pom.xml | 4 +- .../schemas/datasource/tile/gdal/gdal.xsd | 2 +- .../tile/tilematrixset/gdal/gdal.xsd | 2 +- .../deegree-tilestore-geotiff/pom.xml | 4 +- .../datasource/tile/geotiff/geotiff.xsd | 2 +- .../tile/tilematrixset/geotiff/geotiff.xsd | 2 +- .../deegree-tilestore-merge/pom.xml | 4 +- .../schemas/datasource/tile/merge/merge.xsd | 4 +- .../deegree-tilestore-remotewms/pom.xml | 4 +- .../datasource/tile/remotewms/remotewms.xsd | 2 +- .../deegree-tilestore-remotewmts/pom.xml | 4 +- .../RemoteWmtsTileStoreMetadata.java | 2 +- .../datasource/tile/remotewmts/remotewmts.xsd | 2 +- .../deegree-layers-coverage/pom.xml | 4 +- .../schemas/layers/coverage/coverage.xsd | 2 +- deegree-layers/deegree-layers-feature/pom.xml | 4 +- .../schemas/layers/feature/feature.xsd | 2 +- deegree-layers/deegree-layers-gdal/pom.xml | 4 +- .../META-INF/schemas/layers/gdal/gdal.xsd | 2 +- .../deegree-layers-remotewms/pom.xml | 4 +- .../schemas/layers/remotewms/remotewms.xsd | 4 +- deegree-layers/deegree-layers-tile/pom.xml | 4 +- .../META-INF/schemas/layers/tile/tile.xsd | 2 +- .../wps/provider/ExampleProcessProvider.java | 2 +- .../deegree-processprovider-fme/pom.xml | 4 +- .../FMEJobSubmitterInvocationStrategy.java | 2 +- .../fme/FMEProcessProviderBuilder.java | 2 +- .../META-INF/schemas/processes/fme/fme.xsd | 4 +- .../deegree-processprovider-style/pom.xml | 4 +- .../provider/style/StyleProcessProvider.java | 2 +- .../schemas/processes/style/styleProvider.xsd | 2 +- .../deegree-services-commons/pom.xml | 19 ++++- .../controller/OGCFrontController.java | 7 +- .../controller/OwsGlobalConfigLoader.java | 2 +- .../serializer/SOAPExceptionSerializer.java | 8 +- .../security/SecurityConfiguration.java | 6 +- .../DefaultOwsMetadataProviderBuilder.java | 2 +- .../DefaultOwsMetadataProviderMetadata.java | 2 +- .../services/controller/controller.xsd | 4 +- .../schemas/services/metadata/metadata.xsd | 4 +- .../schemas/services/security/security.xsd | 4 +- deegree-services/deegree-services-csw/pom.xml | 4 +- .../services/csw/csw_configuration.xsd | 4 +- deegree-services/deegree-services-wcs/pom.xml | 4 +- .../wcs/ServiceConfigurationXMLAdapter.java | 2 +- .../services/wcs/wcs_configuration.xsd | 2 +- deegree-services/deegree-services-wfs/pom.xml | 4 +- .../services/wfs/WebFeatureService.java | 2 +- .../services/wfs/format/gml/GmlFormat.java | 2 +- .../services/wfs/wfs_configuration.xsd | 2 +- deegree-services/deegree-services-wms/pom.xml | 12 ++- .../wms/controller/WMSController.java | 31 ++++---- .../services/wms/wms_configuration.xsd | 4 +- .../deegree-services-wmts/pom.xml | 4 +- .../META-INF/schemas/services/wmts/wmts.xsd | 4 +- deegree-services/deegree-services-wps/pom.xml | 4 +- .../services/wps/ProcessletOutputs.java | 2 +- .../services/wps/ExecutionManager.java | 2 +- .../DescribeProcessResponseXMLAdapter.java | 2 +- .../wps/execute/ExecuteRequestKVPAdapter.java | 2 +- .../wps/execute/ExecuteRequestXMLAdapter.java | 2 +- .../META-INF/schemas/processes/java/java.xsd | 4 +- .../services/wps/wps_configuration.xsd | 4 +- .../deegree-services-wpvs/pom.xml | 4 +- .../services/wpvs/wpvs_configuration.xsd | 4 +- .../wpvs/wpvs_service_configuration.xsd | 4 +- deegree-services/deegree-webservices/pom.xml | 8 +- .../deegree/console/client/RequestBean.java | 2 +- deegree-tests/deegree-testservice/pom.xml | 8 +- .../deegree-themes-remotewms/pom.xml | 4 +- .../schemas/themes/remotewms/remotewms.xsd | 4 +- deegree-tools/deegree-tools-3d/pom.xml | 4 +- .../tools/rendering/InteractiveWPVS.java | 2 +- deegree-tools/deegree-tools-base/pom.xml | 4 +- .../feature/gml/ApplicationSchemaTool.java | 2 +- deegree-tools/deegree-tools-gml/pom.xml | 4 +- pom.xml | 78 +++++++++---------- uncoupled/deegree-spring/pom.xml | 4 +- .../schemas/spring/3.4.0/bootstrap.xsd | 2 +- .../META-INF/schemas/spring/3.4.0/db.xsd | 4 +- .../META-INF/schemas/spring/3.4.0/generic.xsd | 4 +- .../META-INF/schemas/spring/3.4.0/layer.xsd | 4 +- .../schemas/spring/3.4.0/metadata.xsd | 4 +- .../deegree-core-observation/pom.xml | 4 +- .../observation/contsql/3.0.0/contsql.xsd | 2 +- .../observation/simplesql/3.0.0/simplesql.xsd | 2 +- .../deegree-featurestore-couchbase/pom.xml | 4 +- .../feature/geocouch/3.1.0/geocouch.xsd | 4 +- .../deegree-processprovider-sextante/pom.xml | 4 +- .../processes/sextante/0.1.0/sextante.xsd | 2 +- .../deegree-services-sos/pom.xml | 4 +- .../services/sos/3.0.0/sos_configuration.xsd | 4 +- .../deegree-processprovider-jrxml/pom.xml | 4 +- .../processes/jrxml/0.1.0/jrxmlProcess.xsd | 2 +- .../processes/jrxml/0.1.0/map/0.1.0/map.xsd | 4 +- .../jrxml/0.1.0/map/0.1.0/mapMetadata.xsd | 4 +- .../jrxml/0.1.0/table/0.1.0/table.xsd | 4 +- 178 files changed, 414 insertions(+), 382 deletions(-) diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java index 9029bdaba3..db2242576e 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java @@ -34,10 +34,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.validator; +import jakarta.activation.MimetypesFileTypeMap; import java.util.ArrayList; import java.util.List; -import javax.activation.MimetypesFileTypeMap; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java index 046537d217..cd2a8917fe 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java @@ -36,6 +36,7 @@ import static org.deegree.client.core.utils.MessageUtils.getFacesMessage; +import jakarta.annotation.PostConstruct; import java.io.Serializable; import java.net.MalformedURLException; import java.net.URL; @@ -45,7 +46,6 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.PostConstruct; import javax.faces.application.FacesMessage; import javax.faces.bean.ManagedBean; import javax.faces.bean.ViewScoped; diff --git a/deegree-core/deegree-connectionprovider-datasource/pom.xml b/deegree-core/deegree-connectionprovider-datasource/pom.xml index 1670806e03..4ac090f1bd 100644 --- a/deegree-core/deegree-connectionprovider-datasource/pom.xml +++ b/deegree-core/deegree-connectionprovider-datasource/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/datasource.xsd b/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/datasource.xsd index ca1034f10f..de2af3fad8 100644 --- a/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/datasource.xsd +++ b/deegree-core/deegree-connectionprovider-datasource/src/main/resources/META-INF/schemas/connectionprovider/datasource/datasource.xsd @@ -1,5 +1,5 @@ - + diff --git a/deegree-core/deegree-core-3d/pom.xml b/deegree-core/deegree-core-3d/pom.xml index 73b9313620..d5b0e7775a 100644 --- a/deegree-core/deegree-core-3d/pom.xml +++ b/deegree-core/deegree-core-3d/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/file.xsd b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/file.xsd index ce2fc9f50a..1d613f8f99 100644 --- a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/file.xsd +++ b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/batchedmt/file.xsd @@ -4,7 +4,7 @@ --> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file.xsd b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file.xsd index a9e63ef734..82e8d1c634 100644 --- a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file.xsd +++ b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/file.xsd @@ -4,7 +4,7 @@ --> + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql.xsd b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql.xsd index 93fbdc82e4..188651411c 100644 --- a/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql.xsd +++ b/deegree-core/deegree-core-3d/src/main/resources/META-INF/schemas/datasource/3d/renderable/sql.xsd @@ -4,7 +4,7 @@ --> + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-commons/pom.xml b/deegree-core/deegree-core-commons/pom.xml index 96f58afa43..ddbb2c1d9f 100644 --- a/deegree-core/deegree-core-commons/pom.xml +++ b/deegree-core/deegree-core-commons/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin @@ -30,8 +30,12 @@ jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime + + + jakarta.activation + jakarta.activation-api org.deegree @@ -46,6 +50,11 @@ org.apache.ws.commons.axiom axiom-impl + + + com.sun.activation + jakarta.activation + org.apache.ws.commons.axiom axiom-api @@ -55,8 +64,8 @@ FastInfoset - javax.mail - mail + jakarta.mail + jakarta.mail-api jaxen diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/mail/MailHelper.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/mail/MailHelper.java index e9bcca4f8f..6be60f695d 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/mail/MailHelper.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/mail/MailHelper.java @@ -41,14 +41,14 @@ import java.util.List; import java.util.Properties; -import javax.mail.Message; -import javax.mail.Multipart; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.Message; +import jakarta.mail.Multipart; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,8 +57,8 @@ * A helper class to create and send mail. * * @author Torsten Friebe - * @see javax.mail.Message - * @see javax.mail.internet.MimeMessage + * @see jakarta.mail.Message + * @see jakarta.mail.internet.MimeMessage */ public final class MailHelper { @@ -121,7 +121,7 @@ public static void createAndSendMail(MailMessage eMess, String mailHost, File[] * @param session * @throws SendMailException an exception if the message is undeliverable * - * @see javax.mail.Transport + * @see jakarta.mail.Transport * @see J2EE Mail * Session connection diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/DateTime.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/DateTime.java index 8564ca2896..976a732156 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/DateTime.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/DateTime.java @@ -35,7 +35,7 @@ package org.deegree.commons.tom.datetime; import static java.util.Calendar.getInstance; -import static javax.xml.bind.DatatypeConverter.printDateTime; +import static jakarta.xml.bind.DatatypeConverter.printDateTime; import java.util.Calendar; import java.util.TimeZone; diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/ISO8601Converter.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/ISO8601Converter.java index d557948cda..f1eb7eb72a 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/ISO8601Converter.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/tom/datetime/ISO8601Converter.java @@ -44,7 +44,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; /** * Converts between ISO 8601:2004 diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/XMLAdapter.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/XMLAdapter.java index 82bd0aff59..a5f1a66b4f 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/XMLAdapter.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/XMLAdapter.java @@ -40,6 +40,7 @@ import static javax.xml.stream.XMLStreamConstants.CHARACTERS; import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import static org.apache.axiom.om.OMXMLBuilderFactory.createStAXOMBuilder; import static org.deegree.commons.utils.net.HttpUtils.STREAM; import static org.deegree.commons.utils.net.HttpUtils.get; @@ -58,16 +59,13 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.StringTokenizer; - import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; - import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMContainer; import org.apache.axiom.om.OMDocument; @@ -75,7 +73,8 @@ import org.apache.axiom.om.OMException; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMText; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.apache.axiom.om.xpath.AXIOMXPath; import org.deegree.commons.tom.ows.Version; import org.deegree.commons.xml.stax.XMLStreamReaderDoc; @@ -393,10 +392,10 @@ public void load(InputStream istream, String systemId) throws XMLProcessingExcep // document contains a DOCTYPE definition try { - StAXOMBuilder builder = new StAXOMBuilder(istream); + OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(istream); rootElement = builder.getDocumentElement(); } - catch (XMLStreamException e) { + catch (Exception e) { throw new XMLProcessingException(e.getMessage(), e); } @@ -415,10 +414,10 @@ public void load(InputStream istream, String systemId) throws XMLProcessingExcep */ public void load(XMLStreamReader xmlStream) throws XMLProcessingException { if (xmlStream.getEventType() != XMLStreamConstants.START_DOCUMENT) { - setRootElement(new StAXOMBuilder(new XMLStreamReaderDoc(xmlStream)).getDocumentElement()); + setRootElement(createStAXOMBuilder(new XMLStreamReaderDoc(xmlStream)).getDocumentElement()); } else { - setRootElement(new StAXOMBuilder(xmlStream).getDocumentElement()); + setRootElement(createStAXOMBuilder(xmlStream).getDocumentElement()); } if (xmlStream.getLocation() != null && xmlStream.getLocation().getSystemId() != null) { setSystemId(xmlStream.getLocation().getSystemId()); @@ -489,18 +488,11 @@ public void load(StringReader reader, String systemId) throws XMLProcessingExcep setSystemId(systemId); XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(reader); - StAXOMBuilder builder = new StAXOMBuilder(parser); - rootElement = builder.getDocumentElement(); + rootElement = createStAXOMBuilder(parser).getDocumentElement(); } catch (XMLStreamException e) { throw new XMLProcessingException(e.getMessage(), e); } - catch (OMException e) { - throw new XMLProcessingException(e.getMessage(), e); - } - catch (FactoryConfigurationError e) { - throw new XMLProcessingException(e.getMessage(), e); - } } /** diff --git a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/jaxb/JAXBUtils.java b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/jaxb/JAXBUtils.java index 75b4eecdd7..601ce406ba 100644 --- a/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/jaxb/JAXBUtils.java +++ b/deegree-core/deegree-core-commons/src/main/java/org/deegree/commons/xml/jaxb/JAXBUtils.java @@ -41,9 +41,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/commons/description/description.xsd b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/commons/description/description.xsd index 153502a912..7bf8e1e55e 100644 --- a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/commons/description/description.xsd +++ b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/commons/description/description.xsd @@ -1,8 +1,8 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" targetNamespace="http://www.deegree.org/metadata/description" + elementFormDefault="qualified" jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/proxy.xsd b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/proxy.xsd index d7964942d0..effd167400 100644 --- a/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/proxy.xsd +++ b/deegree-core/deegree-core-commons/src/main/resources/META-INF/schemas/proxy/proxy.xsd @@ -2,8 +2,8 @@ - + diff --git a/deegree-core/deegree-core-coverage/pom.xml b/deegree-core/deegree-core-coverage/pom.xml index d22298fde2..65a5afd35e 100644 --- a/deegree-core/deegree-core-coverage/pom.xml +++ b/deegree-core/deegree-core-coverage/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin @@ -33,6 +33,7 @@ org.ehcache ehcache + jakarta com.sun.media @@ -56,4 +57,3 @@ - diff --git a/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/persistence/pyramid/PyramidCoverageMetadata.java b/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/persistence/pyramid/PyramidCoverageMetadata.java index c895eaa5dc..106ad847d0 100644 --- a/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/persistence/pyramid/PyramidCoverageMetadata.java +++ b/deegree-core/deegree-core-coverage/src/main/java/org/deegree/coverage/persistence/pyramid/PyramidCoverageMetadata.java @@ -42,7 +42,7 @@ Occam Labs UG (haftungsbeschränkt) import static org.deegree.commons.xml.jaxb.JAXBUtils.unmarshall; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.coverage.Coverage; import org.deegree.coverage.persistence.pyramid.jaxb.Pyramid; diff --git a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/pyramid.xsd b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/pyramid.xsd index 36b509b135..05475284d0 100644 --- a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/pyramid.xsd +++ b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/pyramid.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/raster.xsd b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/raster.xsd index c621d4b6a2..f8fdfa6966 100644 --- a/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/raster.xsd +++ b/deegree-core/deegree-core-coverage/src/main/resources/META-INF/schemas/datasource/coverage/raster/raster.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-cs/pom.xml b/deegree-core/deegree-core-cs/pom.xml index b8ed323ae8..b7d0fccc96 100644 --- a/deegree-core/deegree-core-cs/pom.xml +++ b/deegree-core/deegree-core-cs/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin @@ -35,6 +35,10 @@ deegree-core-annotations ${project.version} + + jakarta.activation + jakarta.activation-api + javax.media jai-core diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStoreProvider.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStoreProvider.java index 7a89ba01c7..2b92ff4488 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStoreProvider.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/deegree/d3/DeegreeCRSStoreProvider.java @@ -42,7 +42,7 @@ import java.net.URL; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.commons.utils.net.DURL; import org.deegree.commons.xml.XMLAdapter; diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStoreProvider.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStoreProvider.java index 2f3a11bc18..76b5d584e5 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStoreProvider.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/gml/GMLCRSStoreProvider.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.commons.utils.net.DURL; import org.deegree.commons.xml.XMLAdapter; diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStoreProvider.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStoreProvider.java index fc675c7a01..52b0910c5f 100644 --- a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStoreProvider.java +++ b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/persistence/proj4/PROJ4CRSStoreProvider.java @@ -40,7 +40,7 @@ import java.io.File; import java.net.URL; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.commons.utils.net.DURL; import org.deegree.commons.xml.XMLAdapter; diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/deegree.xsd b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/deegree.xsd index 64e508437d..3a8d5e4791 100644 --- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/deegree.xsd +++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree/deegree.xsd @@ -2,8 +2,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/deegree2.xsd b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/deegree2.xsd index 1b49fa1817..504d792900 100644 --- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/deegree2.xsd +++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/deegree2/deegree2.xsd @@ -2,8 +2,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/gml.xsd b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/gml.xsd index 29c4da8936..c8fe2aa335 100644 --- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/gml.xsd +++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/gml/gml.xsd @@ -2,8 +2,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/proj4.xsd b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/proj4.xsd index 8f0f749443..f47991b61d 100644 --- a/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/proj4.xsd +++ b/deegree-core/deegree-core-cs/src/main/resources/META-INF/schemas/crs/stores/proj4/proj4.xsd @@ -2,8 +2,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-db/pom.xml b/deegree-core/deegree-core-db/pom.xml index a68db3c846..9d93a01c3e 100644 --- a/deegree-core/deegree-core-db/pom.xml +++ b/deegree-core/deegree-core-db/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/jdbc.xsd b/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/jdbc.xsd index 3d44a29781..7e0fa991ed 100644 --- a/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/jdbc.xsd +++ b/deegree-core/deegree-core-db/src/main/resources/META-INF/schemas/jdbc/jdbc.xsd @@ -2,8 +2,8 @@ - + diff --git a/deegree-core/deegree-core-gdal/pom.xml b/deegree-core/deegree-core-gdal/pom.xml index e430b6247a..3df61065cf 100644 --- a/deegree-core/deegree-core-gdal/pom.xml +++ b/deegree-core/deegree-core-gdal/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-gdal/src/main/java/org/deegree/commons/gdal/GdalSettings.java b/deegree-core/deegree-core-gdal/src/main/java/org/deegree/commons/gdal/GdalSettings.java index 31f5f7b76c..76926d1d75 100644 --- a/deegree-core/deegree-core-gdal/src/main/java/org/deegree/commons/gdal/GdalSettings.java +++ b/deegree-core/deegree-core-gdal/src/main/java/org/deegree/commons/gdal/GdalSettings.java @@ -38,7 +38,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.apache.commons.io.IOUtils; import org.deegree.commons.gdal.jaxb.GDALSettings; diff --git a/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/gdal.xsd b/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/gdal.xsd index f5ddcce2ba..bc02d19489 100644 --- a/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/gdal.xsd +++ b/deegree-core/deegree-core-gdal/src/main/resources/META-INF/schemas/commons/gdal/gdal.xsd @@ -1,6 +1,6 @@ + targetNamespace="http://www.deegree.org/gdal" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0" xmlns:gdal="http://www.deegree.org/gdal"> diff --git a/deegree-core/deegree-core-geometry/pom.xml b/deegree-core/deegree-core-geometry/pom.xml index 2981cb709c..298e25b817 100644 --- a/deegree-core/deegree-core-geometry/pom.xml +++ b/deegree-core/deegree-core-geometry/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-geometry/src/main/resources/META-INF/schemas/commons/spatialmetadata/spatialmetadata.xsd b/deegree-core/deegree-core-geometry/src/main/resources/META-INF/schemas/commons/spatialmetadata/spatialmetadata.xsd index 7b7c0a46f1..7326655bef 100644 --- a/deegree-core/deegree-core-geometry/src/main/resources/META-INF/schemas/commons/spatialmetadata/spatialmetadata.xsd +++ b/deegree-core/deegree-core-geometry/src/main/resources/META-INF/schemas/commons/spatialmetadata/spatialmetadata.xsd @@ -1,7 +1,7 @@ - + diff --git a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/metadata/SpatialMetadataConverterTest.java b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/metadata/SpatialMetadataConverterTest.java index 8a73c73784..775eb48a8a 100644 --- a/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/metadata/SpatialMetadataConverterTest.java +++ b/deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/metadata/SpatialMetadataConverterTest.java @@ -38,9 +38,9 @@ import org.deegree.geometry.metadata.jaxb.EnvelopeType; import org.junit.Test; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import java.io.InputStream; diff --git a/deegree-core/deegree-core-layer/pom.xml b/deegree-core/deegree-core-layer/pom.xml index 9e183ff116..1708b698d1 100644 --- a/deegree-core/deegree-core-layer/pom.xml +++ b/deegree-core/deegree-core-layer/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-core/deegree-core-layer/src/main/resources/META-INF/schemas/layers/base/base.xsd b/deegree-core/deegree-core-layer/src/main/resources/META-INF/schemas/layers/base/base.xsd index 0638415eb2..4b984bed6a 100644 --- a/deegree-core/deegree-core-layer/src/main/resources/META-INF/schemas/layers/base/base.xsd +++ b/deegree-core/deegree-core-layer/src/main/resources/META-INF/schemas/layers/base/base.xsd @@ -1,7 +1,7 @@ diff --git a/deegree-core/deegree-core-layer/src/test/java/org/deegree/layer/config/ConfigUtilsTest.java b/deegree-core/deegree-core-layer/src/test/java/org/deegree/layer/config/ConfigUtilsTest.java index 5c62ceecdc..7d60a96cf6 100644 --- a/deegree-core/deegree-core-layer/src/test/java/org/deegree/layer/config/ConfigUtilsTest.java +++ b/deegree-core/deegree-core-layer/src/test/java/org/deegree/layer/config/ConfigUtilsTest.java @@ -48,9 +48,9 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import org.deegree.commons.utils.Pair; diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS111CapabilitiesAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS111CapabilitiesAdapterTest.java index 1a59bc805b..7d70f22b37 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS111CapabilitiesAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS111CapabilitiesAdapterTest.java @@ -44,7 +44,8 @@ import javax.xml.stream.XMLStreamException; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.deegree.commons.tom.ows.Version; import org.deegree.cs.exceptions.UnknownCRSException; import org.deegree.cs.persistence.CRSManager; @@ -78,7 +79,7 @@ protected WMSCapabilitiesAdapter createInspireCapabilities() throws XMLStreamExc private WMSCapabilitiesAdapter createCapabilities(String capabilitiesFile) throws XMLStreamException { InputStream is = WMS111CapabilitiesAdapterTest.class.getResourceAsStream(capabilitiesFile); - StAXOMBuilder builder = new StAXOMBuilder(is); + OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(is); OMElement capabilities = builder.getDocumentElement(); WMSCapabilitiesAdapter adapter = new WMS111CapabilitiesAdapter(capabilities); adapter.parseWMSSpecificCapabilities(adapter.parseOperationsMetadata()); diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS130CapabilitiesAdapterTest.java b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS130CapabilitiesAdapterTest.java index c1f10c2c6a..67e026d172 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS130CapabilitiesAdapterTest.java +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/src/test/java/org/deegree/protocol/wms/client/WMS130CapabilitiesAdapterTest.java @@ -45,7 +45,8 @@ import javax.xml.stream.XMLStreamException; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; import org.deegree.commons.tom.ows.Version; import org.deegree.cs.exceptions.UnknownCRSException; import org.deegree.cs.persistence.CRSManager; @@ -105,7 +106,7 @@ protected WMSCapabilitiesAdapter createInspireCapabilities() throws XMLStreamExc private WMSCapabilitiesAdapter createCapabilities(String capabilitiesFile) throws XMLStreamException { InputStream is = WMS130CapabilitiesAdapterTest.class.getResourceAsStream(capabilitiesFile); - StAXOMBuilder builder = new StAXOMBuilder(is); + OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(is); OMElement capabilities = builder.getDocumentElement(); WMSCapabilitiesAdapter adapter = new WMS130CapabilitiesAdapter(capabilities); adapter.parseWMSSpecificCapabilities(adapter.parseOperationsMetadata()); diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml index 8b4a1ebc0f..b94e307ed1 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/remotewfs.xsd b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/remotewfs.xsd index a898ff85db..02cb8a5909 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/remotewfs.xsd +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wfs/src/main/resources/META-INF/schemas/datasource/remoteows/wfs/remotewfs.xsd @@ -1,7 +1,7 @@ + xmlns:wfs="http://www.deegree.org/datasource/remoteows/wfs" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml index 879337b521..abd356d828 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/remotewms.xsd b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/remotewms.xsd index d8ad556e56..f125435a88 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/remotewms.xsd +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/datasource/remoteows/wms/remotewms.xsd @@ -1,7 +1,7 @@ + xmlns:wms="http://www.deegree.org/datasource/remoteows/wms" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/remotewms.xsd b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/remotewms.xsd index 8782b532a7..186c1bda82 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/remotewms.xsd +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wms/src/main/resources/META-INF/schemas/remoteows/wms/remotewms.xsd @@ -1,7 +1,7 @@ + xmlns:wms="http://www.deegree.org/remoteows/wms" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml index 653e08eaa6..3152c4ad37 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/java/org/deegree/remoteows/wmts/RemoteWmtsMetadata.java b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/java/org/deegree/remoteows/wmts/RemoteWmtsMetadata.java index 8df36c81f4..80934adf81 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/java/org/deegree/remoteows/wmts/RemoteWmtsMetadata.java +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/java/org/deegree/remoteows/wmts/RemoteWmtsMetadata.java @@ -29,7 +29,7 @@ import java.io.InputStream; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.commons.xml.jaxb.JAXBUtils; import org.deegree.remoteows.RemoteOWS; diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/remotewmts.xsd b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/remotewmts.xsd index ac26d409a4..07e2280fe6 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/remotewmts.xsd +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/src/main/resources/META-INF/schemas/remoteows/wmts/remotewmts.xsd @@ -1,7 +1,7 @@ + xmlns:wmts="http://www.deegree.org/remoteows/wmts" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-core/deegree-core-theme/pom.xml b/deegree-core/deegree-core-theme/pom.xml index 6a21e115d3..3ba299918f 100644 --- a/deegree-core/deegree-core-theme/pom.xml +++ b/deegree-core/deegree-core-theme/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/themes.xsd b/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/themes.xsd index 7f2778af0a..3e4f8dc2e4 100644 --- a/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/themes.xsd +++ b/deegree-core/deegree-core-theme/src/main/resources/META-INF/schemas/themes/themes.xsd @@ -1,6 +1,6 @@ + targetNamespace="http://www.deegree.org/themes/standard" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0" xmlns:d="http://www.deegree.org/metadata/description" xmlns:g="http://www.deegree.org/metadata/spatial"> diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml index c348f4318d..1cc49e8a06 100644 --- a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml +++ b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterMetadata.java b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterMetadata.java index a178ce210c..167d4c16ae 100644 --- a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterMetadata.java +++ b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/java/org/deegree/coverage/raster/io/oraclegeoraster/OracleGeorasterMetadata.java @@ -29,9 +29,9 @@ package org.deegree.coverage.raster.io.oraclegeoraster; import static org.deegree.commons.xml.jaxb.JAXBUtils.unmarshall; +import static org.slf4j.LoggerFactory.getLogger; -import javax.xml.bind.JAXBException; - +import jakarta.xml.bind.JAXBException; import org.deegree.coverage.Coverage; import org.deegree.coverage.persistence.oraclegeoraster.jaxb.OracleGeorasterConfig; import org.deegree.coverage.raster.io.oraclegeoraster.utils.OracleGeorasterBuilder; @@ -42,6 +42,7 @@ import org.deegree.workspace.standard.AbstractResourceMetadata; import org.deegree.workspace.standard.AbstractResourceProvider; import org.deegree.workspace.standard.DefaultResourceIdentifier; +import org.slf4j.Logger; /** * Metadata for Oracle GeoRaster coverages @@ -51,6 +52,8 @@ */ public class OracleGeorasterMetadata extends AbstractResourceMetadata { + private static final Logger LOG = getLogger(OracleGeorasterMetadata.class); + public OracleGeorasterMetadata(Workspace workspace, ResourceLocation location, AbstractResourceProvider provider) { super(workspace, location, provider); @@ -69,8 +72,7 @@ public OracleGeorasterBuilder prepare() { return new OracleGeorasterBuilder(config, this, workspace); } catch (JAXBException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOG.debug(e.getMessage(), e); } return null; } diff --git a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd index 36d8e37e84..129a121157 100644 --- a/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd +++ b/deegree-datastores/deegree-coveragestores/deegree-coveragestore-oracle-georaster/src/main/resources/META-INF/schemas/datasource/coverage/oraclegeoraster/oraclegeoraster.xsd @@ -1,6 +1,6 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml index 98e4d217d4..fb26ccd80f 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/memory.xsd b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/memory.xsd index 88d8ec6d53..e333e50ecc 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/memory.xsd +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/src/main/resources/META-INF/schemas/datasource/feature/memory/memory.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml index ec3d45cd47..51d701bad5 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/remotewfs.xsd b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/remotewfs.xsd index 1416f138d0..d9168c73c2 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/remotewfs.xsd +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-remotewfs/src/main/resources/META-INF/schemas/datasource/feature/remotewfs/remotewfs.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml index 7692bae688..a1bbf84dd8 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/shape.xsd b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/shape.xsd index f4243a0018..5b2cb00bc8 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/shape.xsd +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-shape/src/main/resources/META-INF/schemas/datasource/feature/shape/shape.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/datasource/feature/shape" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml index dd7a287a31..2d57c34739 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/simplesql.xsd b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/simplesql.xsd index 1949f13fad..bf52384060 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/simplesql.xsd +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-simplesql/src/main/resources/META-INF/schemas/datasource/feature/simplesql/simplesql.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml index dcd4c25a2a..5201421e3a 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml @@ -29,8 +29,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/AbstractMappedSchemaBuilder.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/AbstractMappedSchemaBuilder.java index 860c541917..7f22911864 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/AbstractMappedSchemaBuilder.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/AbstractMappedSchemaBuilder.java @@ -51,7 +51,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CommonTokenStream; diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderGML.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderGML.java index 8c6a0c5d65..a8da2f498d 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderGML.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderGML.java @@ -56,7 +56,7 @@ import java.util.stream.Collectors; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTable.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTable.java index 2cb83ae693..b8d27b25b5 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTable.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTable.java @@ -57,7 +57,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.deegree.commons.jdbc.SQLIdentifier; diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTableOld.java b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTableOld.java index 7cb1de886e..64de80aaaf 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTableOld.java +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/java/org/deegree/feature/persistence/sql/config/MappedSchemaBuilderTableOld.java @@ -54,7 +54,7 @@ import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.deegree.commons.jdbc.SQLIdentifier; diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/sql.xsd b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/sql.xsd index 158e514786..0ccd090033 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/sql.xsd +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/src/main/resources/META-INF/schemas/datasource/feature/sql/sql.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml index e1b2fc3644..f81b6986db 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/ebrim-eo.xsd b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/ebrim-eo.xsd index 81f778c8ca..fead281bb0 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/ebrim-eo.xsd +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/src/main/resources/META-INF/schemas/datasource/metadata/ebrim/eo/ebrim-eo.xsd @@ -2,7 +2,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml index caf3cff811..86318b4c9b 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/memory.xsd b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/memory.xsd index 025b47d2dc..0682018130 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/memory.xsd +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/src/main/resources/META-INF/schemas/datasource/metadata/iso19139/memory/memory.xsd @@ -2,7 +2,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml index 6ab14483b1..21604ba8fe 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/iso19115.xsd b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/iso19115.xsd index 9366f44919..d861939c84 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/iso19115.xsd +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/main/resources/META-INF/schemas/datasource/metadata/iso19115/iso19115.xsd @@ -2,7 +2,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/java/org/deegree/metadata/iso/persistence/sql/AnyTextHelperTest.java b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/java/org/deegree/metadata/iso/persistence/sql/AnyTextHelperTest.java index f9b39a0b63..84cdce07cb 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/java/org/deegree/metadata/iso/persistence/sql/AnyTextHelperTest.java +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/src/test/java/org/deegree/metadata/iso/persistence/sql/AnyTextHelperTest.java @@ -37,9 +37,9 @@ import java.net.URL; import java.util.TimeZone; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.deegree.commons.xml.XMLAdapter; import org.deegree.metadata.MetadataRecordFactory; diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml index ef4c14e547..cefb1b668a 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin @@ -33,7 +33,7 @@ org.ehcache ehcache + jakarta - diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/cache.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/cache.xsd index 34270794f0..e6a90415a9 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/cache.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-cache/src/main/resources/META-INF/schemas/datasource/tile/cache/cache.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml index bbebf3db14..378fde0f70 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/tilematrixset.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/tilematrixset.xsd index ea6e65e007..e00f8b0312 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/tilematrixset.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/tilematrixset.xsd @@ -1,6 +1,6 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml index fa82f065cc..843267dc6b 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/filesystem.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/filesystem.xsd index 67841573d6..a646ead973 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/filesystem.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/src/main/resources/META-INF/schemas/datasource/tile/filesystem/filesystem.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml index 1909c99385..4d25e1f79e 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/pom.xml @@ -13,8 +13,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/gdal.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/gdal.xsd index e81a36574c..3bab5f7273 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/gdal.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/gdal/gdal.xsd @@ -1,6 +1,6 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/gdal/gdal.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/gdal/gdal.xsd index 14d62944fc..426bd26c35 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/gdal/gdal.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-gdal/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/gdal/gdal.xsd @@ -1,6 +1,6 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml index 254c2b581b..0a219f260f 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/geotiff.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/geotiff.xsd index 040de61aa6..606a52fadb 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/geotiff.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/geotiff/geotiff.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/geotiff.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/geotiff.xsd index 457661ed58..9f247e7669 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/geotiff.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-geotiff/src/main/resources/META-INF/schemas/datasource/tile/tilematrixset/geotiff/geotiff.xsd @@ -1,6 +1,6 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml index e4aadcaf50..33bec75647 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/merge.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/merge.xsd index 64ae71713a..2aaf689586 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/merge.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/merge.xsd @@ -1,6 +1,6 @@ + targetNamespace="http://www.deegree.org/datasource/tile/merge" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml index 34a23df518..e9feb7f3ca 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/remotewms.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/remotewms.xsd index 3646d611bb..c1a75e2d8b 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/remotewms.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/src/main/resources/META-INF/schemas/datasource/tile/remotewms/remotewms.xsd @@ -1,7 +1,7 @@ + xmlns:r="http://www.deegree.org/datasource/tile/remotewms" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml index cb7a5dd539..c51273d848 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml @@ -17,8 +17,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/java/org/deegree/tile/persistence/remotewmts/RemoteWmtsTileStoreMetadata.java b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/java/org/deegree/tile/persistence/remotewmts/RemoteWmtsTileStoreMetadata.java index 6ff912af8f..1530d6b1f3 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/java/org/deegree/tile/persistence/remotewmts/RemoteWmtsTileStoreMetadata.java +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/java/org/deegree/tile/persistence/remotewmts/RemoteWmtsTileStoreMetadata.java @@ -29,7 +29,7 @@ import static org.deegree.commons.xml.jaxb.JAXBUtils.unmarshall; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.remoteows.RemoteOWS; import org.deegree.remoteows.RemoteOWSProvider; diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/remotewmts.xsd b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/remotewmts.xsd index c8e0aa4211..1d13e8f43f 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/remotewmts.xsd +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/src/main/resources/META-INF/schemas/datasource/tile/remotewmts/remotewmts.xsd @@ -1,7 +1,7 @@ + xmlns:r="http://www.deegree.org/datasource/tile/remotewmts" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-layers/deegree-layers-coverage/pom.xml b/deegree-layers/deegree-layers-coverage/pom.xml index 1aa9508a4b..54d7ecd171 100644 --- a/deegree-layers/deegree-layers-coverage/pom.xml +++ b/deegree-layers/deegree-layers-coverage/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/coverage.xsd b/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/coverage.xsd index cb4b112d2f..2c63bee033 100644 --- a/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/coverage.xsd +++ b/deegree-layers/deegree-layers-coverage/src/main/resources/META-INF/schemas/layers/coverage/coverage.xsd @@ -1,7 +1,7 @@ diff --git a/deegree-layers/deegree-layers-feature/pom.xml b/deegree-layers/deegree-layers-feature/pom.xml index 514c98d196..5e2a0794c3 100644 --- a/deegree-layers/deegree-layers-feature/pom.xml +++ b/deegree-layers/deegree-layers-feature/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/feature.xsd b/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/feature.xsd index 3e5ffbc24c..346bb4064f 100644 --- a/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/feature.xsd +++ b/deegree-layers/deegree-layers-feature/src/main/resources/META-INF/schemas/layers/feature/feature.xsd @@ -1,7 +1,7 @@ diff --git a/deegree-layers/deegree-layers-gdal/pom.xml b/deegree-layers/deegree-layers-gdal/pom.xml index 5bb92fb62c..3d08414d90 100644 --- a/deegree-layers/deegree-layers-gdal/pom.xml +++ b/deegree-layers/deegree-layers-gdal/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/gdal.xsd b/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/gdal.xsd index baa98fad18..632e7d1838 100644 --- a/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/gdal.xsd +++ b/deegree-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/gdal.xsd @@ -1,7 +1,7 @@ diff --git a/deegree-layers/deegree-layers-remotewms/pom.xml b/deegree-layers/deegree-layers-remotewms/pom.xml index ad704f92ab..b0be9113f9 100644 --- a/deegree-layers/deegree-layers-remotewms/pom.xml +++ b/deegree-layers/deegree-layers-remotewms/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/remotewms.xsd b/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/remotewms.xsd index 651a6d6518..7ecdaf1dc2 100644 --- a/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/remotewms.xsd +++ b/deegree-layers/deegree-layers-remotewms/src/main/resources/META-INF/schemas/layers/remotewms/remotewms.xsd @@ -1,8 +1,8 @@ + xmlns:s="http://www.deegree.org/metadata/spatial" xmlns:b="http://www.deegree.org/layers/base" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-layers/deegree-layers-tile/pom.xml b/deegree-layers/deegree-layers-tile/pom.xml index dad76077ee..59475fb868 100644 --- a/deegree-layers/deegree-layers-tile/pom.xml +++ b/deegree-layers/deegree-layers-tile/pom.xml @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/tile.xsd b/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/tile.xsd index aadf3a620a..7edbc591d3 100644 --- a/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/tile.xsd +++ b/deegree-layers/deegree-layers-tile/src/main/resources/META-INF/schemas/layers/tile/tile.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0" xmlns:l="http://www.deegree.org/layers/base"> diff --git a/deegree-processproviders/deegree-processprovider-example/src/main/java/org/deegree/services/wps/provider/ExampleProcessProvider.java b/deegree-processproviders/deegree-processprovider-example/src/main/java/org/deegree/services/wps/provider/ExampleProcessProvider.java index 52118b1d60..38c2659f35 100644 --- a/deegree-processproviders/deegree-processprovider-example/src/main/java/org/deegree/services/wps/provider/ExampleProcessProvider.java +++ b/deegree-processproviders/deegree-processprovider-example/src/main/java/org/deegree/services/wps/provider/ExampleProcessProvider.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.deegree.commons.tom.ows.CodeType; diff --git a/deegree-processproviders/deegree-processprovider-fme/pom.xml b/deegree-processproviders/deegree-processprovider-fme/pom.xml index e938b9fac4..d782560fab 100644 --- a/deegree-processproviders/deegree-processprovider-fme/pom.xml +++ b/deegree-processproviders/deegree-processprovider-fme/pom.xml @@ -12,8 +12,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEJobSubmitterInvocationStrategy.java b/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEJobSubmitterInvocationStrategy.java index 6e87f0e4ef..ff27f4267a 100755 --- a/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEJobSubmitterInvocationStrategy.java +++ b/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEJobSubmitterInvocationStrategy.java @@ -34,7 +34,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.services.wps.provider.fme; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.deegree.process.jaxb.java.ComplexFormatType; diff --git a/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEProcessProviderBuilder.java b/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEProcessProviderBuilder.java index c55fcfcbf8..98cfb118a2 100644 --- a/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEProcessProviderBuilder.java +++ b/deegree-processproviders/deegree-processprovider-fme/src/main/java/org/deegree/services/wps/provider/fme/FMEProcessProviderBuilder.java @@ -45,7 +45,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.apache.http.HttpResponse; import org.deegree.commons.json.JSONAdapter; diff --git a/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/schemas/processes/fme/fme.xsd b/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/schemas/processes/fme/fme.xsd index d33e6e1e16..a32d99174e 100644 --- a/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/schemas/processes/fme/fme.xsd +++ b/deegree-processproviders/deegree-processprovider-fme/src/main/resources/META-INF/schemas/processes/fme/fme.xsd @@ -1,8 +1,8 @@ + elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-processproviders/deegree-processprovider-style/pom.xml b/deegree-processproviders/deegree-processprovider-style/pom.xml index 99838c285e..c09081d1a0 100644 --- a/deegree-processproviders/deegree-processprovider-style/pom.xml +++ b/deegree-processproviders/deegree-processprovider-style/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-processproviders/deegree-processprovider-style/src/main/java/org/deegree/services/wps/provider/style/StyleProcessProvider.java b/deegree-processproviders/deegree-processprovider-style/src/main/java/org/deegree/services/wps/provider/style/StyleProcessProvider.java index f62a712015..0e48f40de7 100644 --- a/deegree-processproviders/deegree-processprovider-style/src/main/java/org/deegree/services/wps/provider/style/StyleProcessProvider.java +++ b/deegree-processproviders/deegree-processprovider-style/src/main/java/org/deegree/services/wps/provider/style/StyleProcessProvider.java @@ -39,7 +39,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.deegree.commons.tom.ows.CodeType; diff --git a/deegree-processproviders/deegree-processprovider-style/src/main/resources/META-INF/schemas/processes/style/styleProvider.xsd b/deegree-processproviders/deegree-processprovider-style/src/main/resources/META-INF/schemas/processes/style/styleProvider.xsd index 9747712c5d..7e1ea9bdfe 100644 --- a/deegree-processproviders/deegree-processprovider-style/src/main/resources/META-INF/schemas/processes/style/styleProvider.xsd +++ b/deegree-processproviders/deegree-processprovider-style/src/main/resources/META-INF/schemas/processes/style/styleProvider.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-commons/pom.xml b/deegree-services/deegree-services-commons/pom.xml index a97b19469e..c5e8b305c7 100644 --- a/deegree-services/deegree-services-commons/pom.xml +++ b/deegree-services/deegree-services-commons/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo @@ -59,6 +59,12 @@ ${project.version} provided + javax.servlet javax.servlet-api @@ -75,6 +81,11 @@ org.apache.ws.commons.axiom axiom-impl + + + com.sun.activation + jakarta.activation + junit junit @@ -99,6 +110,10 @@ org.objenesis objenesis + + jakarta.xml.soap + jakarta.xml.soap-api + diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java index ce0512e718..f7c6c7d45b 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java @@ -34,7 +34,6 @@ ----------------------------------------------------------------------------*/ package org.deegree.services.controller; -import static java.io.File.createTempFile; import static java.util.Collections.emptyList; import static org.deegree.commons.ows.exception.OWSException.NOT_FOUND; import static org.deegree.commons.ows.exception.OWSException.NO_APPLICABLE_CODE; @@ -81,9 +80,10 @@ import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; -import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder; +import org.apache.axiom.soap.SOAPModelBuilder; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.FileUploadException; @@ -922,8 +922,7 @@ private void dispatchSOAPRequest( XMLStreamReader xmlStream, HttpServletRequest factory = OMAbstractFactory.getSOAP12Factory(); } - StAXSOAPModelBuilder soap = new StAXSOAPModelBuilder( root.getXMLStreamReaderWithoutCaching(), factory, - factory.getSoapVersionURI() ); + SOAPModelBuilder soap = OMXMLBuilderFactory.createStAXSOAPModelBuilder( root.getXMLStreamReaderWithoutCaching() ); SOAPEnvelope env = soap.getSOAPEnvelope(); diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/OwsGlobalConfigLoader.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/OwsGlobalConfigLoader.java index 72b780f3aa..a0fbb46f7c 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/OwsGlobalConfigLoader.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/OwsGlobalConfigLoader.java @@ -34,7 +34,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.URL; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.deegree.commons.utils.net.DURL; import org.deegree.commons.xml.jaxb.JAXBUtils; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/exception/serializer/SOAPExceptionSerializer.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/exception/serializer/SOAPExceptionSerializer.java index 6dc74a4a3a..16735268f5 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/exception/serializer/SOAPExceptionSerializer.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/exception/serializer/SOAPExceptionSerializer.java @@ -45,7 +45,8 @@ import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.serialize.StreamingOMSerializer; +import org.apache.axiom.om.OMSerializable; +import org.apache.axiom.om.OMXMLBuilderFactory; import org.apache.axiom.soap.SOAPBody; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; @@ -260,8 +261,9 @@ private void writeHeader(XMLStreamWriter writer, SOAPHeader header) throws XMLSt if (header == null) { return; } - StreamingOMSerializer ser = new StreamingOMSerializer(); - ser.serialize(header.getXMLStreamReader(), writer); + OMSerializable serializable = OMXMLBuilderFactory.createStAXOMBuilder(header.getXMLStreamReader()) + .getDocument(); + serializable.serializeAndConsume(writer); } private void writeAttributes(XMLStreamWriter writer, OMElement elem) throws XMLStreamException { diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecurityConfiguration.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecurityConfiguration.java index 202ba3d008..69dd959c04 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecurityConfiguration.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecurityConfiguration.java @@ -46,9 +46,9 @@ import java.util.HashMap; import java.util.ServiceLoader; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderBuilder.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderBuilder.java index b41fbace69..622c2fe40f 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderBuilder.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderBuilder.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderMetadata.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderMetadata.java index b59ab74f94..814b29d3e0 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderMetadata.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/metadata/provider/DefaultOwsMetadataProviderMetadata.java @@ -29,7 +29,7 @@ import static org.deegree.commons.xml.jaxb.JAXBUtils.unmarshall; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.deegree.services.jaxb.metadata.DeegreeServicesMetadataType; import org.deegree.services.metadata.OWSMetadataProvider; diff --git a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/controller.xsd b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/controller.xsd index 3e28de0319..51f03380a9 100644 --- a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/controller.xsd +++ b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/controller/controller.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/controller" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/metadata.xsd b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/metadata.xsd index ce334db5c9..3b4e2efdae 100644 --- a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/metadata.xsd +++ b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/metadata/metadata.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/metadata" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/security/security.xsd b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/security/security.xsd index 1c8a531b7c..824cad258f 100644 --- a/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/security/security.xsd +++ b/deegree-services/deegree-services-commons/src/main/resources/META-INF/schemas/services/security/security.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/security" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-csw/pom.xml b/deegree-services/deegree-services-csw/pom.xml index 70bdf64f07..92e8238ae2 100644 --- a/deegree-services/deegree-services-csw/pom.xml +++ b/deegree-services/deegree-services-csw/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/csw_configuration.xsd b/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/csw_configuration.xsd index 0c66f8055f..65f7e0987b 100644 --- a/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/csw_configuration.xsd +++ b/deegree-services/deegree-services-csw/src/main/resources/META-INF/schemas/services/csw/csw_configuration.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wcs/pom.xml b/deegree-services/deegree-services-wcs/pom.xml index 593bf2ef96..6034e81522 100644 --- a/deegree-services/deegree-services-wcs/pom.xml +++ b/deegree-services/deegree-services-wcs/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/ServiceConfigurationXMLAdapter.java b/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/ServiceConfigurationXMLAdapter.java index 9efe2a7441..879a693857 100644 --- a/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/ServiceConfigurationXMLAdapter.java +++ b/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/ServiceConfigurationXMLAdapter.java @@ -36,7 +36,7 @@ import static org.deegree.commons.xml.jaxb.JAXBUtils.unmarshall; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.deegree.commons.xml.XMLAdapter; import org.deegree.commons.xml.XMLProcessingException; diff --git a/deegree-services/deegree-services-wcs/src/main/resources/META-INF/schemas/services/wcs/wcs_configuration.xsd b/deegree-services/deegree-services-wcs/src/main/resources/META-INF/schemas/services/wcs/wcs_configuration.xsd index 9c089c18d1..380c9dc903 100644 --- a/deegree-services/deegree-services-wcs/src/main/resources/META-INF/schemas/services/wcs/wcs_configuration.xsd +++ b/deegree-services/deegree-services-wcs/src/main/resources/META-INF/schemas/services/wcs/wcs_configuration.xsd @@ -1,7 +1,7 @@ + jaxb:version="3.0" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"> diff --git a/deegree-services/deegree-services-wfs/pom.xml b/deegree-services/deegree-services-wfs/pom.xml index 8de5bef616..77ebb3dc3e 100644 --- a/deegree-services/deegree-services-wfs/pom.xml +++ b/deegree-services/deegree-services-wfs/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java b/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java index a381388fe2..0494a2da37 100644 --- a/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java +++ b/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java @@ -154,7 +154,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormat.java b/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormat.java index 4f3aa08b4e..ba26a1dced 100644 --- a/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormat.java +++ b/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormat.java @@ -42,7 +42,7 @@ import java.net.URL; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; diff --git a/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/wfs_configuration.xsd b/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/wfs_configuration.xsd index 3afe92e1d5..912087727b 100644 --- a/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/wfs_configuration.xsd +++ b/deegree-services/deegree-services-wfs/src/main/resources/META-INF/schemas/services/wfs/wfs_configuration.xsd @@ -1,6 +1,6 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wms/pom.xml b/deegree-services/deegree-services-wms/pom.xml index 5c1b2ac11b..260c45049f 100644 --- a/deegree-services/deegree-services-wms/pom.xml +++ b/deegree-services/deegree-services-wms/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin @@ -79,6 +79,7 @@ javax.servlet javax.servlet-api + commons-beanutils commons-beanutils @@ -107,6 +109,10 @@ org.xmlunit xmlunit-matchers + + + jakarta.mail + jakarta.mail-api + - diff --git a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java index 40dbf0b0b6..859f78b03d 100644 --- a/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java +++ b/deegree-services/deegree-services-wms/src/main/java/org/deegree/services/wms/controller/WMSController.java @@ -50,6 +50,19 @@ import static org.deegree.services.metadata.MetadataUtils.convertFromJAXB; import static org.slf4j.LoggerFactory.getLogger; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.mail.util.ByteArrayDataSource; +import jakarta.xml.soap.AttachmentPart; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.Name; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPBodyElement; +import jakarta.xml.soap.SOAPConstants; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPMessage; +import jakarta.xml.soap.SOAPPart; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -66,26 +79,13 @@ import java.util.ServiceLoader; import java.util.TreeMap; import java.util.UUID; -import javax.activation.DataHandler; -import javax.activation.DataSource; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPConstants; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMSource; -import org.apache.axiom.attachments.ByteArrayDataSource; import org.apache.axiom.om.OMElement; import org.apache.axiom.soap.SOAP11Version; import org.apache.axiom.soap.SOAPVersion; @@ -763,7 +763,7 @@ public void doSOAP(org.apache.axiom.soap.SOAPEnvelope soapDoc, HttpServletReques } catch (SOAPException e) { // TODO Auto-generated catch block - e.printStackTrace(); + LOG.debug(e.getMessage(), e); } } @@ -1185,7 +1185,8 @@ private SOAPMessage createSoapMessage(SOAPVersion soapVersion, String contentId) private AttachmentPart createAttachment(GetMap getMap, ByteArrayOutputStream stream, SOAPMessage message, String contentId) { - DataSource ds = new ByteArrayDataSource(stream.toByteArray()); + // NOTE Axiom was preferred from ByteArrayDataSource but was still using javax + DataSource ds = new ByteArrayDataSource(stream.toByteArray(), null); DataHandler dataHandler = new DataHandler(ds); AttachmentPart attachmentPart = message.createAttachmentPart(dataHandler); attachmentPart.setContentId(contentId); diff --git a/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/wms_configuration.xsd b/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/wms_configuration.xsd index d4510132c4..11551ad834 100644 --- a/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/wms_configuration.xsd +++ b/deegree-services/deegree-services-wms/src/main/resources/META-INF/schemas/services/wms/wms_configuration.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/wms" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wmts/pom.xml b/deegree-services/deegree-services-wmts/pom.xml index 63f0b9fea0..2e833ec589 100644 --- a/deegree-services/deegree-services-wmts/pom.xml +++ b/deegree-services/deegree-services-wmts/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/wmts.xsd b/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/wmts.xsd index e34da452e3..12cbde3043 100644 --- a/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/wmts.xsd +++ b/deegree-services/deegree-services-wmts/src/main/resources/META-INF/schemas/services/wmts/wmts.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/wmts" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wps/pom.xml b/deegree-services/deegree-services-wps/pom.xml index d68b09c6a4..1662a01654 100644 --- a/deegree-services/deegree-services-wps/pom.xml +++ b/deegree-services/deegree-services-wps/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/ProcessletOutputs.java b/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/ProcessletOutputs.java index baf15495c5..b5a3fe5659 100644 --- a/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/ProcessletOutputs.java +++ b/deegree-services/deegree-services-wps/src/api/java/org/deegree/services/wps/ProcessletOutputs.java @@ -41,7 +41,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.deegree.commons.tom.ows.CodeType; import org.deegree.process.jaxb.java.BoundingBoxOutputDefinition; diff --git a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/ExecutionManager.java b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/ExecutionManager.java index 6a519448a1..a546590830 100644 --- a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/ExecutionManager.java +++ b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/ExecutionManager.java @@ -52,7 +52,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/describeprocess/DescribeProcessResponseXMLAdapter.java b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/describeprocess/DescribeProcessResponseXMLAdapter.java index 70bb2b8d2c..556e44ec4b 100644 --- a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/describeprocess/DescribeProcessResponseXMLAdapter.java +++ b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/describeprocess/DescribeProcessResponseXMLAdapter.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestKVPAdapter.java b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestKVPAdapter.java index 7d481605cd..0d92ce656a 100644 --- a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestKVPAdapter.java +++ b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestKVPAdapter.java @@ -46,7 +46,7 @@ import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.tom.ows.CodeType; diff --git a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestXMLAdapter.java b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestXMLAdapter.java index d99e0c3ddb..a28894b2de 100644 --- a/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestXMLAdapter.java +++ b/deegree-services/deegree-services-wps/src/main/java/org/deegree/services/wps/execute/ExecuteRequestXMLAdapter.java @@ -50,7 +50,7 @@ import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; diff --git a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/java.xsd b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/java.xsd index 4968f85f99..05e457c602 100644 --- a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/java.xsd +++ b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/processes/java/java.xsd @@ -1,7 +1,7 @@ + elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/wps_configuration.xsd b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/wps_configuration.xsd index f4f107eacf..bb269ed9e4 100644 --- a/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/wps_configuration.xsd +++ b/deegree-services/deegree-services-wps/src/main/resources/META-INF/schemas/services/wps/wps_configuration.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/wps" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wpvs/pom.xml b/deegree-services/deegree-services-wpvs/pom.xml index 74b1281c2e..30a085d699 100644 --- a/deegree-services/deegree-services-wpvs/pom.xml +++ b/deegree-services/deegree-services-wpvs/pom.xml @@ -18,8 +18,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_configuration.xsd b/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_configuration.xsd index 04198991be..0f8cd95aa9 100644 --- a/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_configuration.xsd +++ b/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_configuration.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/wpvs" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_service_configuration.xsd b/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_service_configuration.xsd index 75fad39288..e39dfb9f13 100644 --- a/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_service_configuration.xsd +++ b/deegree-services/deegree-services-wpvs/src/main/resources/META-INF/schemas/services/wpvs/wpvs_service_configuration.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/wpvs" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/deegree-services/deegree-webservices/pom.xml b/deegree-services/deegree-webservices/pom.xml index 8225c33964..067cf84af7 100644 --- a/deegree-services/deegree-webservices/pom.xml +++ b/deegree-services/deegree-webservices/pom.xml @@ -311,12 +311,12 @@ javax.servlet.jsp-api - javax.mail - mail + jakarta.mail + jakarta.mail-api - javax.activation - activation + jakarta.activation + jakarta.activation-api junit diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java index daaa0ac908..bae9cd10cc 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java @@ -64,7 +64,7 @@ import java.util.TreeMap; import java.util.TreeSet; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.faces.application.FacesMessage; import javax.faces.bean.ManagedBean; import javax.faces.bean.RequestScoped; diff --git a/deegree-tests/deegree-testservice/pom.xml b/deegree-tests/deegree-testservice/pom.xml index f5a9d73e5c..fd826ed626 100644 --- a/deegree-tests/deegree-testservice/pom.xml +++ b/deegree-tests/deegree-testservice/pom.xml @@ -169,12 +169,12 @@ javax.servlet.jsp-api - javax.mail - mail + jakarta.mail + jakarta.mail-api - javax.activation - activation + jakarta.activation + jakarta.activation-api \ No newline at end of file diff --git a/deegree-themes/deegree-themes-remotewms/pom.xml b/deegree-themes/deegree-themes-remotewms/pom.xml index f82cfc2168..abcdabd98b 100644 --- a/deegree-themes/deegree-themes-remotewms/pom.xml +++ b/deegree-themes/deegree-themes-remotewms/pom.xml @@ -19,8 +19,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.deegree diff --git a/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/remotewms.xsd b/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/remotewms.xsd index 0bdce7c2be..4d1f83a1b7 100644 --- a/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/remotewms.xsd +++ b/deegree-themes/deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/remotewms.xsd @@ -1,8 +1,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:md="http://www.deegree.org/metadata/description" + jaxb:version="3.0"> diff --git a/deegree-tools/deegree-tools-3d/pom.xml b/deegree-tools/deegree-tools-3d/pom.xml index d1af3834f2..f377a43d31 100644 --- a/deegree-tools/deegree-tools-3d/pom.xml +++ b/deegree-tools/deegree-tools-3d/pom.xml @@ -22,8 +22,8 @@ jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime commons-cli diff --git a/deegree-tools/deegree-tools-3d/src/main/java/org/deegree/tools/rendering/InteractiveWPVS.java b/deegree-tools/deegree-tools-3d/src/main/java/org/deegree/tools/rendering/InteractiveWPVS.java index 64a6b78ede..02c8441518 100644 --- a/deegree-tools/deegree-tools-3d/src/main/java/org/deegree/tools/rendering/InteractiveWPVS.java +++ b/deegree-tools/deegree-tools-3d/src/main/java/org/deegree/tools/rendering/InteractiveWPVS.java @@ -61,7 +61,7 @@ import javax.swing.JFrame; import javax.vecmath.Point3d; import javax.vecmath.Vector3d; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/deegree-tools/deegree-tools-base/pom.xml b/deegree-tools/deegree-tools-base/pom.xml index 9e3b5087e1..f234ff676b 100644 --- a/deegree-tools/deegree-tools-base/pom.xml +++ b/deegree-tools/deegree-tools-base/pom.xml @@ -22,8 +22,8 @@ jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime org.deegree diff --git a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java index 982e5a8ac7..e0f521e7ad 100644 --- a/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java +++ b/deegree-tools/deegree-tools-base/src/main/java/org/deegree/tools/feature/gml/ApplicationSchemaTool.java @@ -56,7 +56,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import org.apache.commons.cli.Option; diff --git a/deegree-tools/deegree-tools-gml/pom.xml b/deegree-tools/deegree-tools-gml/pom.xml index b1ec6dce04..027631bf5b 100755 --- a/deegree-tools/deegree-tools-gml/pom.xml +++ b/deegree-tools/deegree-tools-gml/pom.xml @@ -181,8 +181,8 @@ jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime runtime diff --git a/pom.xml b/pom.xml index 00450dba00..473ab1c0f9 100644 --- a/pom.xml +++ b/pom.xml @@ -87,9 +87,9 @@ 1.5.3 - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.15.3 + org.jvnet.jaxb + jaxb-maven-plugin + 4.0.0 @@ -109,7 +109,7 @@ org.deegree deegree-jaxb-resolver - 1.1 + 1.2 @@ -356,11 +356,9 @@ + - javax.activation.* - javax.xml.* - javax.annotation.* com.ctc.wstx.* com.sun.istack.* com.sun.media.jai.* @@ -376,6 +374,8 @@ + javax.xml.bind + javax.activation commons-logging:commons-logging @@ -429,34 +429,22 @@ - + jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 - - - com.sun.xml.bind - jaxb-impl - 2.3.9 - runtime + 4.0.1 - - jakarta.xml.ws - jakarta.xml.ws-api - 2.3.3 - - - com.sun.xml.ws - jaxws-rt - 2.3.7 + org.glassfish.jaxb + jaxb-runtime + 4.0.4 runtime jakarta.annotation jakarta.annotation-api - 1.3.5 + 2.1.1 @@ -638,6 +626,13 @@ jsf-impl 2.2.20 + org.apache.logging.log4j @@ -732,6 +727,12 @@ + + + com.sun.activation + jakarta.activation + 1.2.2 + com.sun.xml.fastinfoset FastInfoset @@ -1073,12 +1074,7 @@ org.ehcache ehcache 3.10.8 - - - org.glassfish.jaxb - jaxb-runtime - - + jakarta org.apache.derby @@ -1168,16 +1164,20 @@ 20230513 - javax.mail - mail - 1.4.7 + jakarta.mail + jakarta.mail-api + 2.0.1 provided - javax.activation - activation - 1.1.1 - provided + jakarta.activation + jakarta.activation-api + 2.1.2 + + + jakarta.xml.soap + jakarta.xml.soap-api + 3.0.1 jfree @@ -1228,7 +1228,7 @@ 4.3.10 5.3.31 1.17 - 1.2.22 + 1.4.0 2.7.0 diff --git a/uncoupled/deegree-spring/pom.xml b/uncoupled/deegree-spring/pom.xml index 901c766ba4..07a12a1439 100644 --- a/uncoupled/deegree-spring/pom.xml +++ b/uncoupled/deegree-spring/pom.xml @@ -12,8 +12,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/bootstrap.xsd b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/bootstrap.xsd index 8152c98329..dd7282b870 100644 --- a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/bootstrap.xsd +++ b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/bootstrap.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/db.xsd b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/db.xsd index 412032db50..1895ad0c72 100644 --- a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/db.xsd +++ b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/db.xsd @@ -1,8 +1,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/generic.xsd b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/generic.xsd index 84d25070c1..28e6b54382 100644 --- a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/generic.xsd +++ b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/generic.xsd @@ -1,8 +1,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/layer.xsd b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/layer.xsd index bddad16284..a7dc0471c8 100644 --- a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/layer.xsd +++ b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/layer.xsd @@ -1,9 +1,9 @@ + jaxb:version="3.0"> diff --git a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/metadata.xsd b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/metadata.xsd index 8cf8bea0d9..3121a24bba 100644 --- a/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/metadata.xsd +++ b/uncoupled/deegree-spring/src/main/resources/META-INF/schemas/spring/3.4.0/metadata.xsd @@ -1,9 +1,9 @@ + jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.2/deegree-core-observation/pom.xml b/uncoupled/orphaned-after-3.2/deegree-core-observation/pom.xml index 4d700451cf..b0c48eab87 100644 --- a/uncoupled/orphaned-after-3.2/deegree-core-observation/pom.xml +++ b/uncoupled/orphaned-after-3.2/deegree-core-observation/pom.xml @@ -32,8 +32,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.antlr diff --git a/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/contsql/3.0.0/contsql.xsd b/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/contsql/3.0.0/contsql.xsd index d60713275a..fc65fd0740 100644 --- a/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/contsql/3.0.0/contsql.xsd +++ b/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/contsql/3.0.0/contsql.xsd @@ -1,6 +1,6 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/simplesql/3.0.0/simplesql.xsd b/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/simplesql/3.0.0/simplesql.xsd index 50f366d94b..a72d5fbe00 100644 --- a/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/simplesql/3.0.0/simplesql.xsd +++ b/uncoupled/orphaned-after-3.2/deegree-core-observation/src/main/resources/META-INF/schemas/datasource/observation/simplesql/3.0.0/simplesql.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/pom.xml b/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/pom.xml index 161988eb2b..76c6638d09 100644 --- a/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/pom.xml +++ b/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/pom.xml @@ -32,8 +32,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/src/main/resources/META-INF/schemas/datasource/feature/geocouch/3.1.0/geocouch.xsd b/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/src/main/resources/META-INF/schemas/datasource/feature/geocouch/3.1.0/geocouch.xsd index f83c56e860..558d90d8c5 100644 --- a/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/src/main/resources/META-INF/schemas/datasource/feature/geocouch/3.1.0/geocouch.xsd +++ b/uncoupled/orphaned-after-3.2/deegree-featurestore-couchbase/src/main/resources/META-INF/schemas/datasource/feature/geocouch/3.1.0/geocouch.xsd @@ -1,8 +1,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/pom.xml b/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/pom.xml index d52384ec8f..f43e8bceac 100644 --- a/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/pom.xml +++ b/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/pom.xml @@ -32,8 +32,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/main/resources/META-INF/schemas/processes/sextante/0.1.0/sextante.xsd b/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/main/resources/META-INF/schemas/processes/sextante/0.1.0/sextante.xsd index 970b3ce0b5..6b9e1fe725 100644 --- a/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/main/resources/META-INF/schemas/processes/sextante/0.1.0/sextante.xsd +++ b/uncoupled/orphaned-after-3.2/deegree-processprovider-sextante/src/main/resources/META-INF/schemas/processes/sextante/0.1.0/sextante.xsd @@ -2,7 +2,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.2/deegree-services-sos/pom.xml b/uncoupled/orphaned-after-3.2/deegree-services-sos/pom.xml index 6380ae62e9..b334483dc0 100644 --- a/uncoupled/orphaned-after-3.2/deegree-services-sos/pom.xml +++ b/uncoupled/orphaned-after-3.2/deegree-services-sos/pom.xml @@ -32,8 +32,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/uncoupled/orphaned-after-3.2/deegree-services-sos/src/main/resources/META-INF/schemas/services/sos/3.0.0/sos_configuration.xsd b/uncoupled/orphaned-after-3.2/deegree-services-sos/src/main/resources/META-INF/schemas/services/sos/3.0.0/sos_configuration.xsd index 6e544ec480..c89cc1ca96 100644 --- a/uncoupled/orphaned-after-3.2/deegree-services-sos/src/main/resources/META-INF/schemas/services/sos/3.0.0/sos_configuration.xsd +++ b/uncoupled/orphaned-after-3.2/deegree-services-sos/src/main/resources/META-INF/schemas/services/sos/3.0.0/sos_configuration.xsd @@ -1,7 +1,7 @@ + targetNamespace="http://www.deegree.org/services/sos" elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/pom.xml b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/pom.xml index ab07f8d735..52016efb3f 100644 --- a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/pom.xml +++ b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/pom.xml @@ -31,8 +31,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/jrxmlProcess.xsd b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/jrxmlProcess.xsd index e10bbfba55..bfaec61bc3 100644 --- a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/jrxmlProcess.xsd +++ b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/jrxmlProcess.xsd @@ -1,7 +1,7 @@ + xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/map.xsd b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/map.xsd index 7a62feb389..dd90f5823f 100644 --- a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/map.xsd +++ b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/map.xsd @@ -2,8 +2,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/mapMetadata.xsd b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/mapMetadata.xsd index fe996d5c3d..b4a1ec5908 100644 --- a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/mapMetadata.xsd +++ b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/map/0.1.0/mapMetadata.xsd @@ -1,8 +1,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0"> diff --git a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/table/0.1.0/table.xsd b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/table/0.1.0/table.xsd index 14b7248ad4..8a1231da6d 100644 --- a/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/table/0.1.0/table.xsd +++ b/uncoupled/orphaned-after-3.3/deegree-processprovider-jrxml/src/main/resources/META-INF/schemas/processes/jrxml/0.1.0/table/0.1.0/table.xsd @@ -3,8 +3,8 @@ + elementFormDefault="qualified" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" + jaxb:version="3.0">