Merge pull request #32 from aureamunoz/new-aop-module

New aop module
quarkusio · Jun 5, 2024 · 96a0c25 · 96a0c25
2 parents 8674270 + 1b430fd
commit 96a0c25
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <artifactId>quarkus-spring-api</artifactId>
   <version>6.1.SP2-SNAPSHOT</version>
 
-  <name>Spring dependencies for Quarkus Spring DI extension</name>
+  <name>Spring dependencies for Quarkus Spring extensions</name>
   <description>The minimum dependencies to reduce the footprint of Quarkus applications using the Spring DI extension</description>
   <url>https://quarkus.io/</url>
   <developers>
@@ -52,6 +52,7 @@
     <module>quarkus-spring-context-api</module>
     <module>quarkus-spring-web-api</module>
     <module>quarkus-spring-webmvc-api</module>
+    <module>quarkus-spring-aop-api</module>
   </modules>
 
 <dependencyManagement>
@@ -81,6 +82,11 @@
       <artifactId>spring-webmvc</artifactId>
       <version>${spring-framework.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring-framework.version}</version>
+    </dependency>
   </dependencies>
 </dependencyManagement>
 

diff --git a/quarkus-spring-aop-api/pom.xml b/quarkus-spring-aop-api/pom.xml
@@ -0,0 +1,87 @@
+<?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>
+
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-spring-aop-api</artifactId>
+    <version>6.1.SP1-SNAPSHOT</version>
+
+    <parent>
+        <artifactId>quarkus-spring-api</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>6.1.SP2-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.springframework:spring-aop</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.springframework:spring-aop</artifact>
+                                    <includes>
+                                        <!-- Transitive dependencies -->
+                                        <include>org/springframework/aop/framework/ProxyFactory**</include>
+                                        <include>org/springframework/aop/framework/ProxyCreatorSupport**</include>
+                                        <include>org/springframework/aop/framework/AdvisedSupport**</include>
+                                        <include>org/springframework/aop/framework/Advised**</include>
+                                        <include>org/springframework/aop/framework/AdvisorChainFactory**</include>
+                                        <include>org/springframework/aop/framework/DefaultAdvisorChainFactory**</include>
+                                        <include>org/springframework/aop/framework/ProxyConfig**</include>
+                                        <include>org/springframework/aop/framework/AopProxyFactory**</include>
+                                        <include>org/springframework/aop/framework/AdvisedSupportListener**</include>
+                                        <include>org/springframework/aop/framework/DefaultAopProxyFactory**</include>
+                                        <include>org/springframework/aop/framework/AopProxy**</include>
+                                        <include>org/springframework/aop/framework/AopConfigException**</include>
+                                        <include>org/springframework/aop/TargetSource**</include>
+                                        <include>org/springframework/aop/Advisor**</include>
+                                        <include>org/springframework/aop/DynamicIntroductionAdvice**</include>
+                                        <include>org/springframework/aop/IntroductionAdvisor**</include>
+                                        <include>org/springframework/aop/IntroductionInfo**</include>
+                                        <include>org/springframework/aop/Pointcut**</include>
+                                        <include>org/springframework/aop/PointcutAdvisor**</include>
+                                        <include>org/springframework/aop/ClassFilter**</include>
+                                        <include>org/springframework/aop/MethodMatcher**</include>
+                                        <include>org/springframework/aop/TruePointcut**</include>
+                                        <include>org/springframework/aop/TargetSource**</include>
+                                        <include>org/springframework/aop/TargetClassAware**</include>
+                                        <include>org/springframework/aop/support/DefaultIntroductionAdvisor**</include>
+                                        <include>org/springframework/aop/support/DefaultPointcutAdvisor**</include>
+                                        <include>org/springframework/aop/support/AbstractGenericPointcutAdvisor**</include>
+                                        <include>org/springframework/aop/support/AbstractPointcutAdvisor**</include>
+                                        <include>org/springframework/aop/target/EmptyTargetSource**</include>
+                                        <include>org/springframework/aop/target/SingletonTargetSource**</include>
+                                    </includes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/quarkus-spring-aop-api/src/main/java/Dummy.java b/quarkus-spring-aop-api/src/main/java/Dummy.java
@@ -0,0 +1,6 @@
+/***
+ * Dummy class for javadoc
+ *
+ */
+public class Dummy {
+}
diff --git a/quarkus-spring-core-api/pom.xml b/quarkus-spring-core-api/pom.xml
@@ -40,7 +40,6 @@
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>org.springframework:spring-core</artifact>
                                     <includes>
                                         <!-- Transitive dependencies -->
                                         <include>org/springframework/core/BridgeMethodResolver**</include>
@@ -50,6 +49,7 @@
                                         <include>org/springframework/core/ParameterNameDiscoverer**</include>
                                         <include>org/springframework/core/ResolvableType**</include>
                                         <include>org/springframework/core/SerializableTypeWrapper**</include>
+                                        <include>org/springframework/core/CollectionFactory**</include>
                                         <include>org/springframework/core/annotation/AliasFor**</include>
                                         <include>org/springframework/core/annotation/AnnotationAttributes**</include>
                                         <include>org/springframework/core/annotation/AnnotatedElementUtils**</include>
@@ -79,6 +79,7 @@
                                         <include>org/springframework/core/io/Resource**</include>
                                         <include>org/springframework/core/io/support/ResourceRegion**</include>
                                         <include>org/springframework/lang/Nullable**</include>
+                                        <include>org/springframework/lang/NonNull**</include>
                                         <include>org/springframework/util/Assert**</include>
                                         <include>org/springframework/util/InvalidMimeTypeException**class</include>
                                         <include>org/springframework/util/LinkedCaseInsensitiveMap**</include>
@@ -87,6 +88,7 @@
                                         <include>org/springframework/util/PriorityOrdered**</include>
                                         <include>org/springframework/util/ResourceUtils**</include>
                                     </includes>
+                                    <artifact>org.springframework:spring-core</artifact>
                                 </filter>
                             </filters>
                         </configuration>

diff --git a/quarkus-spring-web-api/pom.xml b/quarkus-spring-web-api/pom.xml
@@ -49,6 +49,7 @@
                                         <include>org/springframework/http/HttpMethod**</include>
                                         <include>org/springframework/http/ResponseEntity**</include>
                                         <include>org/springframework/http/ProblemDetail**</include>
+                                        <include>org/springframework/http/DefaultHttpStatusCode**</include>
                                         <include>org/springframework/web/SpringServletContainerInitializer**</include>
                                         <include>org/springframework/web/ErrorResponseException**</include>
                                         <include>org/springframework/web/ErrorResponse**</include>