andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix java version for java16 (#11243)

Browse Source 
Motivation:

When trying to compile with java16 we should use adopt@1.16*

Modifications:

- Use adopt@1.16.0-1-
- Upgrade to blockhoud 1.0.6 to be able to support java16

Result:

Use correct java version / flavor
This commit is contained in:
Norman Maurer 2021-05-12 14:03:59 +02:00 committed by GitHub
parent c83601167f
commit 52dfe6c2c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose.centos-6.116.yaml
View File

@ -6,7 +6,7 @@ services:
image: netty:centos-6-1.16 image: netty:centos-6-1.16
build: build:
args: args:
java_version : "adopt-openj9@1.16.0-1" java_version : "adopt@1.16.0-1"
build: build:
image: netty:centos-6-1.16 image: netty:centos-6-1.16

4
pom.xml
View File

@ -113,6 +113,8 @@
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<!-- pax-exam does not work on latest Java12 EA 22 build --> <!-- pax-exam does not work on latest Java12 EA 22 build -->
<skipOsgiTestsuite>true</skipOsgiTestsuite> <skipOsgiTestsuite>true</skipOsgiTestsuite>
<!-- doesn't work with java16 -->
<skipJapicmp>true</skipJapicmp>
</properties> </properties>
</profile> </profile>
@ -798,7 +800,7 @@
<dependency> <dependency>
<groupId>io.projectreactor.tools</groupId> <groupId>io.projectreactor.tools</groupId>
<artifactId>blockhound</artifactId> <artifactId>blockhound</artifactId>
<version>1.0.3.RELEASE</version> <version>1.0.6.RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>