From 7fcb7b8f33c989b8cbcb2d4e23536a0bdc330d03 Mon Sep 17 00:00:00 2001
From: Swell <5782559+sultan@users.noreply.github.com>
Date: Sun, 18 Dec 2022 17:01:48 +0100
Subject: [PATCH] [TOMEE-4128] Jakarta MVC API and Krazo (Impl.)

---
 pom.xml                          |  1 +
 tck/mvc-tck/pom.xml              | 98 ++++++++++++++++++++++++++++++++
 tck/pom.xml                      |  1 +
 tomee/tomee-plume-webapp/pom.xml | 11 ++++
 tomee/tomee-plus-webapp/pom.xml  | 11 ++++
 5 files changed, 122 insertions(+)
 create mode 100644 tck/mvc-tck/pom.xml

diff --git a/pom.xml b/pom.xml
index 8c7bc371678..5067efae138 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,6 +226,7 @@
     <!-- Other API and Impl. not in Jakarta EE -->
     <version.ehcache>2.10.6</version.ehcache>
     <version.geronimo-jcache_1.0_spec>1.0-alpha-1</version.geronimo-jcache_1.0_spec>
+    <version.mvc>1.1.0</version.mvc>
     <version.krazo>1.1.1</version.krazo>
     <version.deltaspike>1.9.6</version.deltaspike>
 
diff --git a/tck/mvc-tck/pom.xml b/tck/mvc-tck/pom.xml
new file mode 100644
index 00000000000..6ebf268d269
--- /dev/null
+++ b/tck/mvc-tck/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.tomee</groupId>
+    <artifactId>tck</artifactId>
+    <version>8.0.14-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>mvc-tck</artifactId>
+  <name>TomEE :: TCK :: Jakarta MVC TCK</name>
+
+  <profiles>
+    <profile>
+      <id>mvc-tck</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>tomee-plus</id>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables combine.children="append">
+                    <arquillian.launch>tomee-plus</arquillian.launch>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tomee-plume</id>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables combine.children="append">
+                    <arquillian.launch>tomee-plume</arquillian.launch>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>jakarta.mvc.tck</groupId>
+      <artifactId>mvc-tck-api</artifactId>
+      <version>${version.mvc}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.mvc.tck</groupId>
+      <artifactId>mvc-tck-tests</artifactId>
+      <version>${version.mvc}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.mvc.tck</groupId>
+      <artifactId>mvc-tck-docs</artifactId>
+      <version>${version.mvc}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.mvc.tck</groupId>
+      <artifactId>mvc-tck-sigtest</artifactId>
+      <version>${version.mvc}</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+</project>
diff --git a/tck/pom.xml b/tck/pom.xml
index f1dac362d22..0c8af712841 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -43,6 +43,7 @@
     <module>bval-tomee</module>
     <module>bval-signature-test</module>
     <module>microprofile-tck</module>
+    <module>mvc-tck</module>
   </modules>
 
   <repositories>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 85d2c29f0b8..e9bc219caf5 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -447,6 +447,17 @@
       <artifactId>jakarta.faces</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <!-- Jakarta MVC -->
+    <dependency>
+      <groupId>jakarta.mvc</groupId>
+      <artifactId>jakarta.mvc-api</artifactId>
+      <version>${version.mvc}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.krazo</groupId>
+      <artifactId>krazo-cxf</artifactId>
+      <version>${version.krazo}</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 68158cb5842..09a8606c2f4 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -485,6 +485,17 @@
       <version>3.2</version>
       <scope>test</scope>
     </dependency>
+    <!-- Jakarta MVC -->
+    <dependency>
+      <groupId>jakarta.mvc</groupId>
+      <artifactId>jakarta.mvc-api</artifactId>
+      <version>${version.mvc}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.krazo</groupId>
+      <artifactId>krazo-cxf</artifactId>
+      <version>${version.krazo}</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>