Clean up schemas and other stuff... (#237)

* Clean up schemas and other stuff... Signed-off-by: Ivar Grimstad <ivar.grimstad@eclipse-foundation.org> * rollback wrong removal of encoding Signed-off-by: Ivar Grimstad <ivar.grimstad@eclipse-foundation.org> * Limit travis resouces. TCK jobs are set up at the Krazo Jenkins instance Signed-off-by: Ivar Grimstad <ivar.grimstad@eclipse-foundation.org>
eclipse-ee4j · Nov 16, 2020 · fe5f06d · fe5f06d
1 parent 2aa9c3e
commit fe5f06d
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -49,20 +49,20 @@ jobs:
 #    - stage: test
 #      env: TYPE=tck-wildfly19
 #      script: .travis/tests.sh ${TYPE}
-    - stage: test
-      env: TYPE=tck-wildfly22
-      script: .travis/tests.sh ${TYPE}
+#    - stage: test
+#      env: TYPE=tck-wildfly22
+#      script: .travis/tests.sh ${TYPE}
 #    - stage: test
 #      env: TYPE=tck-tomee
 #      script: .travis/tests.sh ${TYPE}
-    - stage: test
-      env: TYPE=tck-liberty
-      script: .travis/tests.sh ${TYPE}
+#    - stage: test
+#      env: TYPE=tck-liberty
+#      script: .travis/tests.sh ${TYPE}
 #    - stage: test
 #      env: TYPE=dependency-check
 #      script: mvn org.owasp:dependency-check-maven:aggregate ${BUILD_PROFILE}
   allow_failures:
 #    - env: TYPE=tck-tomee
-    - env: TYPE=tck-liberty
+#    - env: TYPE=tck-liberty
 #    - env: TYPE=glassfish-module
 #    - env: TYPE=testsuite-liberty
diff --git a/archetype/pom.xml b/archetype/pom.xml
@@ -28,12 +28,12 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>krazo-jakartaee8-archetype</artifactId>
+    <artifactId>krazo-jakartaee9-archetype</artifactId>
     <packaging>maven-archetype</packaging>
-    <name>Archetype for Jakarta EE 8 with Eclipse Krazo</name>
+    <name>Archetype for Jakarta EE 9 with Eclipse Krazo</name>
 
     <description>
-        Archetype for basic Jakarta EE 8 App with the MVC API and Eclipse Krazo
+        Archetype for basic Jakarta EE 9 App with the MVC API and Eclipse Krazo
     </description>
 
     <build>

diff --git a/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,7 +23,7 @@
             http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
     xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    name="jee8-archetype">
+    name="krazo-jakartaee9-archetype">
     <fileSets>
         <fileSet filtered="true" packaged="true">
             <directory>src/main/java</directory>

diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,7 @@
     <name>\${artifactId}</name>
 
     <properties>
-        <jakartaee-api.version>8.0.0</jakartaee-api.version>
+        <jakartaee-api.version>9.0.0</jakartaee-api.version>
         <krazo.version>${project.version}</krazo.version>
         <jakarta.mvc-api.version>${spec.version}</jakarta.mvc-api.version>
         <junit.version>4.12</junit.version>

diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-       bean-discovery-mode="all" version="2.0">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       bean-discovery-mode="all" version="3.0">
 </beans>
diff --git a/core/src/main/resources/META-INF/web-fragment.xml b/core/src/main/resources/META-INF/web-fragment.xml
@@ -19,9 +19,9 @@
     SPDX-License-Identifier: Apache-2.0
 
 -->
-<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
-              version="3.1">
+<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
+              version="5.0">
 
     <name>krazo</name>
 
@@ -32,4 +32,4 @@
         </after>
     </ordering>
 
-</web-fragment>
+</web-fragment>
diff --git a/documentation/src/main/asciidoc/_quickstart.adoc b/documentation/src/main/asciidoc/_quickstart.adoc
@@ -275,10 +275,10 @@ Make sure to add an empty `beans.xml` file in your `/src/main/webapp/WEB-INF` fo
 [source,xml]
 ----
 <?xml version="1.0"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-       version="2.0" bean-discovery-mode="all">
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       version="3.0" bean-discovery-mode="all">
 
 </beans>
 ----
@@ -305,9 +305,9 @@ The file to create is called `web.xml` and should be placed in the `src/main/web
 [source,xml]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_4_0.xsd"
          version="4.0" metadata-complete="true">
 
   <listener>

diff --git a/examples/facelets/src/main/webapp/WEB-INF/web.xml b/examples/facelets/src/main/webapp/WEB-INF/web.xml
@@ -20,10 +20,10 @@
 
 -->
 <web-app
-    version="3.1"
-    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    version="5.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>

diff --git a/examples/requestDispatcher/src/main/webapp/WEB-INF/web.xml b/examples/requestDispatcher/src/main/webapp/WEB-INF/web.xml
@@ -19,7 +19,7 @@
     SPDX-License-Identifier: Apache-2.0
 
 -->
-<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+<web-app version="5.0" xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
     <servlet>
         <servlet-name>RequestDispatcherServlet</servlet-name>
         <servlet-class>org.eclipse.krazo.test.requestdispatcher.RequestDispatcherServlet</servlet-class>

diff --git a/examples/view-annotation/src/main/webapp/WEB-INF/web.xml b/examples/view-annotation/src/main/webapp/WEB-INF/web.xml
@@ -20,10 +20,10 @@
 
 -->
 <web-app
-    version="3.1" 
-    xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+    version="5.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
     <error-page>
         <location>/error.html</location>
     </error-page>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -45,11 +45,13 @@
         <dependency>
             <groupId>jakarta.mvc.tck</groupId>
             <artifactId>mvc-tck-api</artifactId>
+            <version>${tck.version}</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.mvc.tck</groupId>
             <artifactId>mvc-tck-tests</artifactId>
+            <version>${tck.version}</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/testsuite/src/main/resources/encoding/web.xml b/testsuite/src/main/resources/encoding/web.xml
@@ -19,10 +19,10 @@
 
 -->
 <web-app
-    version="3.1"
-    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    version="5.0"
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>