Better specify HK2 and Spring dependencies (#4221)

* Specify HK2 and Spring dependencies Signed-off-by: Jan Supol <[email protected]>
eclipse-ee4j · Aug 12, 2019 · 3dd8549 · 3dd8549
1 parent 35e581f
commit 3dd8549
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -193,6 +193,11 @@
                 <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-declarative-linking</artifactId>

diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.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
@@ -150,10 +150,6 @@
 
     </dependencies>
 
-    <properties>
-        <spring4.version>4.3.8.RELEASE</spring4.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

diff --git a/ext/spring5/pom.xml b/ext/spring5/pom.xml
@@ -150,10 +150,6 @@
 
     </dependencies>
 
-    <properties>
-        <spring5.version>5.1.5.RELEASE</spring5.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -1502,11 +1502,15 @@
 
             <dependency>
                 <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-bom</artifactId>
+                <artifactId>hk2-locator</artifactId>
                 <version>${hk2.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.hk2</groupId>
+                <artifactId>hk2-utils</artifactId>
+                <version>${hk2.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.glassfish.hk2</groupId>
                 <artifactId>hk2-api</artifactId>
@@ -2125,6 +2129,7 @@
         <simple.version>6.0.1</simple.version>
         <slf4j.version>1.7.21</slf4j.version>
         <spring4.version>4.3.20.RELEASE</spring4.version>
+        <spring5.version>5.1.5.RELEASE</spring5.version>
         <validation.impl.version>6.0.17.Final</validation.impl.version>
         <weld.version>2.2.14.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
         <weld3.version>3.0.0.Final</weld3.version>