Skip to content

Commit

Permalink
Merge pull request fujitsu#50 from tnagao7/update-hk2
Browse files Browse the repository at this point in the history
Update HK2 from 3.0.2 to 3.0.3
  • Loading branch information
tnagao7 authored Jun 6, 2022
2 parents 9f52af9 + 6a81f29 commit a03e9a8
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 0 deletions.
92 changes: 92 additions & 0 deletions launcher-impl/glassfish/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,98 @@
<packaging>jar</packaging>

<dependencies>
<!-- Use HK2 3.0.3 since the source code of HK2 3.0.2 is lost.
https://github.com/eclipse-ee4j/glassfish-hk2/issues/553 -->
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-core</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-runlevel</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>class-model</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-utils</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgi-adapter</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- The following jersey 3.0.4 modules (inserted before
'glassfish-embedded-web') are introduced because the MP
rest client (jersey-mp-rest-client) requires them but the
Expand Down
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<logging-annotation-processor.version>1.9</logging-annotation-processor.version>
<exousia.version>1.0.0</exousia.version>
<glassfish-corba.version>4.2.4</glassfish-corba.version>
<hk2.version>3.0.3</hk2.version>
<jersey.version>3.0.4</jersey.version>
<jaxb-api.version>3.0.1</jaxb-api.version>
<jaxb.version>3.0.2</jaxb.version>
Expand Down Expand Up @@ -288,6 +289,14 @@
<artifactId>rmic</artifactId>
<version>${glassfish-corba.version}</version>
</dependency>
<!-- hk2 -->
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-bom</artifactId>
<version>${hk2.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- jersey -->
<dependency>
<groupId>org.glassfish.jersey</groupId>
Expand Down

0 comments on commit a03e9a8

Please sign in to comment.