Skip to content

Commit 0f699ea

Browse files
committed
[refactor] Switch to Jakarta EE 9 Namespace and Schemas. Resolves a peer-review comment from @reinhapa
1 parent c7083be commit 0f699ea

File tree

17 files changed

+641
-721
lines changed

17 files changed

+641
-721
lines changed

exist-core/src/test/resources/standalone-webapp/WEB-INF/web.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
2424
-->
2525
<web-app
26-
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
26+
xmlns="https://jakarta.ee/xml/ns/jakartaee"
2727
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
28-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-app_4_0.xsd"
28+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
2929
metadata-complete="false"
3030
version="5.0">
3131

exist-distribution/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,12 @@
338338
<exclude>src/main/config/**</exclude> <!-- config files shipped with eXist-db don't need copyright headers -->
339339
<exclude>src/main/scripts/codesign-jansi-mac.sh</exclude>
340340
<exclude>src/main/xslt/configure_10_0.dtd</exclude>
341-
<exclude>src/main/xslt/web-app_3_1.xsd</exclude>
342-
<exclude>src/main/xslt/javaee_web_services_client_1_4.xsd</exclude>
343-
<exclude>src/main/xslt/jsp_2_3.xsd</exclude>
341+
<exclude>src/main/xslt/web-app_5_0.xsd</exclude>
342+
<exclude>src/main/xslt/jakartaee_web_services_client_2_0.xsd</exclude>
343+
<exclude>src/main/xslt/jsp_3_0.xsd</exclude>
344344
<exclude>src/main/xslt/xml.xsd</exclude>
345-
<exclude>src/main/xslt/web-common_3_1.xsd</exclude>
346-
<exclude>src/main/xslt/javaee_7.xsd</exclude>
345+
<exclude>src/main/xslt/web-common_5_0.xsd</exclude>
346+
<exclude>src/main/xslt/jakartaee_9.xsd</exclude>
347347
</excludes>
348348
</licenseSet>
349349

exist-distribution/src/main/xslt/catalog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
2525
<system systemId="https://www.eclipse.org/jetty/configure_10_0.dtd"
2626
uri="configure_9_3.dtd"/>
27-
<uri name="http://xmlns.jcp.org/xml/ns/javaee" uri="web-app_3_1.xsd"/>
27+
<uri name="https://jakarta.ee/xml/ns/jakartae" uri="web-app_5_0.xsd"/>
2828
<uri name="http://www.w3.org/XML/1998/namespace" uri="xml.xsd"/>
2929
</catalog>

0 commit comments

Comments
 (0)