Spring 6 module introduction

Signed-off-by: jansupol <jan.supol@oracle.com>
eclipse-ee4j · Apr 1, 2022 · 189a9e1 · 189a9e1
1 parent dfa1169
commit 189a9e1
Show file tree

Hide file tree

Showing 153 changed files with 602 additions and 4,203 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -188,16 +188,11 @@
                 <artifactId>jersey-proxy-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>org.glassfish.jersey.ext</groupId>-->
-<!--                <artifactId>jersey-spring4</artifactId>-->
-<!--                <version>${project.version}</version>-->
-<!--            </dependency>-->
-<!--            <dependency>-->
-<!--                <groupId>org.glassfish.jersey.ext</groupId>-->
-<!--                <artifactId>jersey-spring5</artifactId>-->
-<!--                <version>${project.version}</version>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>org.glassfish.jersey.ext</groupId>
+                <artifactId>jersey-spring6</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.ext</groupId>
                 <artifactId>jersey-declarative-linking</artifactId>

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -51,10 +51,7 @@
         <module>mvc-mustache</module>
         <module>proxy-client</module>
         <module>rx</module>
-        <!-- do not release spring 4 and spring 5 modules with Jersey 3.x
-        <module>spring4</module>
-        <module>spring5</module>
-        -->
+        <module>spring6</module>
         <module>wadl-doclet</module>
         <module>microprofile</module>
     </modules>

diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml
diff --git a/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java b/ext/spring4/src/main/java/org/glassfish/jersey/server/spring/AutowiredInjectResolver.java