Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 5, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion appserver/common/annotation-framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion nucleus/common/glassfish-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 10 additions & 2 deletions nucleus/common/internal-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion nucleus/core/api-exporter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -88,7 +89,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2</artifactId>
<artifactId>hk2-api</artifactId>
</dependency>
</dependencies>
</project>
5 changes: 3 additions & 2 deletions nucleus/core/context-propagation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion nucleus/grizzly/config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions nucleus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down