From 8c0bc944808d9a609b12f4a7f87ba1ff8a4e9f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Tue, 1 Mar 2022 10:32:14 +0100 Subject: [PATCH] HHH-15094 Remove duplicate DTD descriptor --- .../jaxb/internal/stax/LocalXmlResourceResolver.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java index 3275e64284..424e0b782c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java @@ -84,11 +84,6 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver { return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - if ( LEGACY2_MAPPING_DTD.matches( publicID, systemID ) ) { - DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY2_MAPPING_DTD.getIdentifierBase(), MAPPING_DTD.getIdentifierBase() ); - return openUrlStream( MAPPING_DTD.localSchemaUrl ); - } - if ( CFG_DTD.matches( publicID, systemID ) ) { return openUrlStream( CFG_DTD.localSchemaUrl ); } @@ -143,11 +138,6 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver { ); public static final DtdDescriptor LEGACY_MAPPING_DTD = new DtdDescriptor( - "www.hibernate.org/dtd/hibernate-mapping", - "org/hibernate/hibernate-mapping-3.0.dtd" - ); - - public static final DtdDescriptor LEGACY2_MAPPING_DTD = new DtdDescriptor( "hibernate.sourceforge.net/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" );