From 4c10f2995a98f1576e09d52c95f58f57f0336438 Mon Sep 17 00:00:00 2001
From: Daniel Kec <daniel.kec@oracle.com>
Date: Wed, 30 Oct 2019 06:41:59 +0100
Subject: [PATCH] Use Spring Context 4 in the Spring integration test (#4307)

* Spring 4 tests compatibility

Signed-off-by: Daniel Kec <daniel.kec@oracle.com>
---
 tests/integration/spring4/pom.xml                   | 13 -------------
 .../src/main/resources/applicationContext.xml       | 11 ++++++++++-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/integration/spring4/pom.xml b/tests/integration/spring4/pom.xml
index 1d1cdebbda..c1aeb85a53 100644
--- a/tests/integration/spring4/pom.xml
+++ b/tests/integration/spring4/pom.xml
@@ -55,22 +55,9 @@
             <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-spring4</artifactId>
             <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
             <scope>compile</scope>
         </dependency>
 
-        <!-- TODO Use spring-context 4 -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>3.2.16.RELEASE</version>
-        </dependency>
-
         <dependency>
             <groupId>org.glassfish.jersey.test-framework</groupId>
             <artifactId>jersey-test-framework-core</artifactId>
diff --git a/tests/integration/spring4/src/main/resources/applicationContext.xml b/tests/integration/spring4/src/main/resources/applicationContext.xml
index 0cc9127ad2..c7e421eaa3 100644
--- a/tests/integration/spring4/src/main/resources/applicationContext.xml
+++ b/tests/integration/spring4/src/main/resources/applicationContext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,6 +32,15 @@
         </property>
     </bean>
 
+    <!-- Needed since Spring Context 4, was default in Spring Context 3 -->
+    <bean id="customAutowireConfigurer" class="org.springframework.beans.factory.annotation.CustomAutowireConfigurer">
+        <property name="customQualifierTypes">
+            <set>
+                <value>org.springframework.beans.factory.annotation.Qualifier</value>
+            </set>
+        </property>
+    </bean>
+
     <bean name="AccountService-singleton" class="org.glassfish.jersey.server.spring.test.AccountServiceImpl" />
 
     <bean name="AccountService-request-1" class="org.glassfish.jersey.server.spring.test.AccountServiceImpl" scope="request">