From bc9ddf899ddbd48961fdf9befecda91e2a75501b Mon Sep 17 00:00:00 2001
From: aurea munoz <amunozhe@redhat.com>
Date: Thu, 5 Mar 2020 14:12:00 +0100
Subject: [PATCH] feat: add somme more classes and dependencies and refactor
 repo name

---
 README.md                                     |   2 +-
 pom.xml                                       |  22 +++-
 quarkus-spring-beans-api/pom.xml              |   6 +-
 quarkus-spring-context-api/pom.xml            |  10 +-
 quarkus-spring-core-api/pom.xml               |  27 ++++-
 quarkus-spring-web-api/pom.xml                | 103 ++++++++++++++++++
 .../src/main/java/Dummy.java                  |   6 +
 quarkus-spring-webmvc-api/pom.xml             |  59 ++++++++++
 .../src/main/java/Dummy.java                  |   6 +
 9 files changed, 226 insertions(+), 15 deletions(-)
 create mode 100644 quarkus-spring-web-api/pom.xml
 create mode 100644 quarkus-spring-web-api/src/main/java/Dummy.java
 create mode 100644 quarkus-spring-webmvc-api/pom.xml
 create mode 100644 quarkus-spring-webmvc-api/src/main/java/Dummy.java

diff --git a/README.md b/README.md
index 84874dc..c13a9bb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# quarkus-spring-di-api
+# quarkus-spring-api
 
 This is a Spring Dependency API only dependency. The idea is to have only the classes used by Quarkus (and the transitive dependencies)
 This absolutely minimum dependencies would be a great benefit to reduce the footprint of Quarkus applications using the spring modules.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 206098f..3331ddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.quarkus</groupId>
-  <artifactId>quarkus-spring-di-api</artifactId>
-  <version>5.3.Alpha1-SNAPSHOT</version>
+  <artifactId>quarkus-spring-api</artifactId>
+  <version>5.2.Alpha2-SNAPSHOT</version>
 
   <name>Spring dependencies for Quarkus Spring DI extension</name>
   <description>The minimum dependencies to reduce the footprint of Quarkus applications using the Spring DI extension</description>
@@ -27,9 +27,9 @@
   </licenses>
 
   <scm>
-    <url>/~https://github.com/quarkusio/quarkus-spring-di-api</url>
-    <connection>scm:git:git@github.com:quarkusio/quarkus-spring-di-api.git</connection>
-    <developerConnection>scm:git:git@github.com:quarkusio/quarkus-spring-di-api.git</developerConnection>
+    <url>/~https://github.com/quarkusio/quarkus-spring-api</url>
+    <connection>scm:git:git@github.com:quarkusio/quarkus-spring-api.git</connection>
+    <developerConnection>scm:git:git@github.com:quarkusio/quarkus-spring-api.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
@@ -49,6 +49,8 @@
     <module>quarkus-spring-core-api</module>
     <module>quarkus-spring-beans-api</module>
     <module>quarkus-spring-context-api</module>
+    <module>quarkus-spring-web-api</module>
+    <module>quarkus-spring-webmvc-api</module>
   </modules>
 
 <dependencyManagement>
@@ -68,6 +70,16 @@
       <artifactId>spring-context</artifactId>
       <version>${spring-framework.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-framework.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring-framework.version}</version>
+    </dependency>
   </dependencies>
 </dependencyManagement>
 
diff --git a/quarkus-spring-beans-api/pom.xml b/quarkus-spring-beans-api/pom.xml
index c368823..eca24a6 100644
--- a/quarkus-spring-beans-api/pom.xml
+++ b/quarkus-spring-beans-api/pom.xml
@@ -4,12 +4,12 @@
 
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-spring-beans-api</artifactId>
-    <version>5.3.Alpha1-SNAPSHOT</version>
+    <version>5.2.Alpha2-SNAPSHOT</version>
 
     <parent>
-        <artifactId>quarkus-spring-di-api</artifactId>
+        <artifactId>quarkus-spring-api</artifactId>
         <groupId>io.quarkus</groupId>
-        <version>5.3.Alpha1-SNAPSHOT</version>
+        <version>5.2.Alpha2-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/quarkus-spring-context-api/pom.xml b/quarkus-spring-context-api/pom.xml
index 421832f..ac12d7b 100644
--- a/quarkus-spring-context-api/pom.xml
+++ b/quarkus-spring-context-api/pom.xml
@@ -3,15 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-spring-di-api</artifactId>
+        <artifactId>quarkus-spring-api</artifactId>
         <groupId>io.quarkus</groupId>
-        <version>5.3.Alpha1-SNAPSHOT</version>
+        <version>5.2.Alpha2-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-spring-context-api</artifactId>
-    <version>5.3.Alpha1-SNAPSHOT</version>
+    <version>5.2.Alpha2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -50,6 +50,7 @@
                                         <include>org/springframework/stereotype/Indexed**</include>
                                         <include>org/springframework/stereotype/Repository**</include>
                                         <include>org/springframework/stereotype/Service**</include>
+                                        <include>org/springframework/ui/Model**</include>
                                         <!-- Transitive dependencies -->
                                         <include>org/springframework/context/ApplicationContext**</include>
                                         <include>org/springframework/context/ApplicationEvent**</include>
@@ -57,6 +58,9 @@
                                         <include>org/springframework/context/MessageSource**</include>
                                         <include>org/springframework/context/NoSuchMessageException**</include>
                                         <include>org/springframework/context/annotation/ScopedProxyMode**</include>
+                                        <include>org/springframework/ui/ModelMap**</include>
+                                        <include>org/springframework/stereotype/Controller**</include>
+                                        <include>org/springframework/context/annotation/ScopedProxyMode**</include>
                                     </includes>
                                 </filter>
                             </filters>
diff --git a/quarkus-spring-core-api/pom.xml b/quarkus-spring-core-api/pom.xml
index feb96b0..c50e487 100644
--- a/quarkus-spring-core-api/pom.xml
+++ b/quarkus-spring-core-api/pom.xml
@@ -3,15 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-spring-di-api</artifactId>
+        <artifactId>quarkus-spring-api</artifactId>
         <groupId>io.quarkus</groupId>
-        <version>5.3.Alpha1-SNAPSHOT</version>
+        <version>5.2.Alpha2-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-spring-core-api</artifactId>
-    <version>5.3.Alpha1-SNAPSHOT</version>
+    <version>5.2.Alpha2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -62,6 +62,27 @@
                                         <include>org/springframework/util/ObjectUtils**</include>
                                         <include>org/springframework/util/ReflectionUtils**</include>
                                         <include>org/springframework/util/StringUtils**</include>
+                                        <include>org/springframework/core/Conventions**</include>
+                                        <include>org/springframework/core/DecoratingProxy**</include>
+                                        <include>org/springframework/core/NestedIOException**</include>
+                                        <include>org/springframework/core/Ordered**</include>
+                                        <include>org/springframework/core/OrderComparator**</include>
+                                        <include>org/springframework/core/annotation/AnnotationAwareOrderComparator**</include>
+                                        <include>org/springframework/core/annotation/AnnotationUtils**</include>
+                                        <include>org/springframework/core/annotation/OrderUtils**</include>
+                                        <include>org/springframework/core/io/AbstractResource**</include>
+                                        <include>org/springframework/core/io/InputStreamResource**</include>
+                                        <include>org/springframework/core/io/InputStreamSource**</include>
+                                        <include>org/springframework/core/io/Resource**</include>
+                                        <include>org/springframework/core/io/support/ResourceRegion**</include>
+                                        <include>org/springframework/lang/Nullable**</include>
+                                        <include>org/springframework/util/Assert**</include>
+                                        <include>org/springframework/util/InvalidMimeTypeException**class</include>
+                                        <include>org/springframework/util/LinkedCaseInsensitiveMap**</include>
+                                        <include>org/springframework/util/MimeType**</include>
+                                        <include>org/springframework/util/MimeTypeUtils**</include>
+                                        <include>org/springframework/util/PriorityOrdered**</include>
+                                        <include>org/springframework/util/ResourceUtils**</include>
                                     </includes>
                                 </filter>
                             </filters>
diff --git a/quarkus-spring-web-api/pom.xml b/quarkus-spring-web-api/pom.xml
new file mode 100644
index 0000000..1464c3c
--- /dev/null
+++ b/quarkus-spring-web-api/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-spring-api</artifactId>
+        <version>5.2.Alpha2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-spring-web-api</artifactId>
+    <version>5.2.Alpha2-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.springframework:spring-web</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.springframework:spring-web</artifact>
+                                    <includes>
+                                        <!-- Used in Quarkus -->
+                                        <include>org/springframework/http/HttpEntity**</include>
+                                        <include>org/springframework/http/HttpHeaders**</include>
+                                        <include>org/springframework/http/HttpStatus**</include>
+                                        <include>org/springframework/http/ResponseEntity**</include>
+                                        <include>org/springframework/web/SpringServletContainerInitializer**</include>
+                                        <include>org/springframework/web/context/annotation/RequestScope**</include>
+                                        <include>org/springframework/web/bind/annotation/CookieValue**</include>
+                                        <include>org/springframework/web/bind/annotation/DeleteMapping**</include>
+                                        <include>org/springframework/web/bind/annotation/ExceptionHandler**</include>
+                                        <include>org/springframework/web/bind/annotation/GetMapping**</include>
+                                        <include>org/springframework/web/bind/annotation/RestController**</include>
+                                        <include>org/springframework/web/bind/annotation/RequestMapping**</include>
+                                        <include>org/springframework/web/bind/annotation/PathVariable**</include>
+                                        <include>org/springframework/web/bind/annotation/MatrixVariable**</include>
+                                        <include>org/springframework/web/bind/annotation/PatchMapping**</include>
+                                        <include>org/springframework/web/bind/annotation/PostMapping**</include>
+                                        <include>org/springframework/web/bind/annotation/PutMapping**</include>
+                                        <include>org/springframework/web/bind/annotation/RequestBody**</include>
+                                        <include>org/springframework/web/bind/annotation/RequestHeader**</include>
+                                        <include>org/springframework/web/bind/annotation/RequestParam**</include>
+                                        <include>org/springframework/web/bind/annotation/ResponseStatus**</include>
+                                        <include>org/springframework/web/bind/annotation/RestControllerAdvice**
+                                        </include>
+                                        <!-- Transitive dependencies -->
+                                        <include>org/springframework/http/CacheControl**</include>
+                                        <include>org/springframework/http/ContentDisposition**</include>
+                                        <include>org/springframework/http/HttpInputMessage**</include>
+                                        <include>org/springframework/http/HttpMessage**</include>
+                                        <include>org/springframework/http/HttpOutputMessage**</include>
+                                        <include>org/springframework/http/HttpRange**</include>
+                                        <include>org/springframework/http/InvalidMediaTypeException**</include>
+                                        <include>org/springframework/http/ReadOnlyHttpHeaders**</include>
+                                        <include>org/springframework/http/RequestEntity**</include>
+                                        <include>org/springframework/http/MediaType**</include>
+                                        <include>org/springframework/http/converter/HttpMessageConversionException**
+                                        </include>
+                                        <include>org/springframework/http/converter/HttpMessageConverter**</include>
+                                        <include>org/springframework/http/converter/HttpMessageNotReadableException**
+                                        </include>
+                                        <include>org/springframework/http/converter/HttpMessageNotWritableException**
+                                        </include>
+                                        <include>org/springframework/web/WebApplicationInitializer**</include>
+                                        <include>org/springframework/web/bind/annotation/ControllerAdvice**</include>
+                                        <include>org/springframework/web/bind/annotation/RequestMethod**</include>
+                                        <include>org/springframework/web/bind/annotation/ResponseBody**</include>
+                                        <include>org/springframework/web/context/WebApplicationContext**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/quarkus-spring-web-api/src/main/java/Dummy.java b/quarkus-spring-web-api/src/main/java/Dummy.java
new file mode 100644
index 0000000..ebc944f
--- /dev/null
+++ b/quarkus-spring-web-api/src/main/java/Dummy.java
@@ -0,0 +1,6 @@
+/***
+ * Dummy class for javadoc
+ *
+ */
+public class Dummy {
+}
diff --git a/quarkus-spring-webmvc-api/pom.xml b/quarkus-spring-webmvc-api/pom.xml
new file mode 100644
index 0000000..7148176
--- /dev/null
+++ b/quarkus-spring-webmvc-api/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-spring-api</artifactId>
+        <version>5.2.Alpha2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-spring-webmvc-api</artifactId>
+    <version>5.2.Alpha2-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.springframework:spring-webmvc</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.springframework:spring-webmvc</artifact>
+                                    <includes>
+                                        <!-- Used in Quarkus -->
+                                        <include>org/springframework/web/servlet/ModelAndView**</include>
+                                        <include>org/springframework/web/servlet/View**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/quarkus-spring-webmvc-api/src/main/java/Dummy.java b/quarkus-spring-webmvc-api/src/main/java/Dummy.java
new file mode 100644
index 0000000..ebc944f
--- /dev/null
+++ b/quarkus-spring-webmvc-api/src/main/java/Dummy.java
@@ -0,0 +1,6 @@
+/***
+ * Dummy class for javadoc
+ *
+ */
+public class Dummy {
+}