Skip to content

Commit

Permalink
Fix java version for java16 (netty#11243)
Browse files Browse the repository at this point in the history
Motivation:

When trying to compile with java16 we should use [email protected]*

Modifications:

- Use [email protected]
- Upgrade to blockhoud 1.0.6 to be able to support java16

Result:

Use correct java version / flavor
  • Loading branch information
normanmaurer authored May 12, 2021
1 parent c836011 commit 52dfe6c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/docker-compose.centos-6.116.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
image: netty:centos-6-1.16
build:
args:
java_version : "adopt-openj9@1.16.0-1"
java_version : "[email protected]"

build:
image: netty:centos-6-1.16
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@
<maven.compiler.target>1.7</maven.compiler.target>
<!-- pax-exam does not work on latest Java12 EA 22 build -->
<skipOsgiTestsuite>true</skipOsgiTestsuite>
<!-- doesn't work with java16 -->
<skipJapicmp>true</skipJapicmp>
</properties>
</profile>

Expand Down Expand Up @@ -798,7 +800,7 @@
<dependency>
<groupId>io.projectreactor.tools</groupId>
<artifactId>blockhound</artifactId>
<version>1.0.3.RELEASE</version>
<version>1.0.6.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 52dfe6c

Please sign in to comment.