PAYARA-1812-Upgrade-HK2-to-2.5.0.b38 (#1734)

payara · Jul 5, 2017 · ae2be05 · ae2be05
1 parent 8fdd719
commit ae2be05
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 10 deletions.
diff --git a/appserver/common/annotation-framework/pom.xml b/appserver/common/annotation-framework/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!--"Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates]" -->
 
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -88,7 +89,7 @@
     <dependencies>
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>class-model</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>

diff --git a/nucleus/common/glassfish-api/pom.xml b/nucleus/common/glassfish-api/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!--"Portions Copyright [2017] [Payara Foundation and/or its affiliates]" -->
 
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -80,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>hk2-runlevel</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.grizzly</groupId>

diff --git a/nucleus/common/internal-api/pom.xml b/nucleus/common/internal-api/pom.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- // Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates] -->
 
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -90,7 +90,15 @@
     <dependencies>
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>hk2-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>config-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>class-model</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>

diff --git a/nucleus/core/api-exporter/pom.xml b/nucleus/core/api-exporter/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!--"Portions Copyright [2017] [Payara Foundation and/or its affiliates]" -->
 
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -88,7 +89,7 @@
     <dependencies>
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>hk2-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/nucleus/core/context-propagation/pom.xml b/nucleus/core/context-propagation/pom.xml
@@ -40,7 +40,8 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016] [Payara Foundation] -->
+<!--"Portions Copyright [2016-2017] [Payara Foundation and/or its affiliates]" -->
+
 <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/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.glassfish.main.core</groupId>
@@ -90,7 +91,7 @@
     <dependencies>
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>hk2-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.core</groupId>

diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml
@@ -85,7 +85,11 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>hk2-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>config-types</artifactId>
         </dependency>
         <dependency>
             <groupId>stax</groupId>

diff --git a/nucleus/pom.xml b/nucleus/pom.xml
@@ -168,8 +168,8 @@
         <servlet-api.version>3.1.0</servlet-api.version>
         <grizzly.version>2.3.31</grizzly.version>
         <saaj-api.version>1.3.4</saaj-api.version>
-        <hk2.version>2.5.0-b36</hk2.version>
-        <hk2.plugin.version>2.5.0-b36</hk2.plugin.version>
+        <hk2.version>2.5.0-b38</hk2.version>
+        <hk2.plugin.version>2.5.0-b38</hk2.plugin.version>
         <hibernate.validator.version>5.2.4.Final</hibernate.validator.version>
         <javax.validation.version>1.1.0.Final</javax.validation.version>
         <classmate.version>1.3.3</classmate.version>