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

Jump to bottom

Support Java 14 #3310

Merged
merged 3 commits into from Jun 17, 2020
Merged

Support Java 14 #3310

merged 3 commits into from Jun 17, 2020

Conversation

artembilan
Copy link
Member

  • Provide changes to avoid deprecated Java API
    and have a compatibility back to Java 8
  • Change affected test classes to JUnit 5 whenever it is possible
  • Ignore/Disable some TCP/IP tests which don't pass on Java 14

@artembilan
Support Java 14
b213c68 
* Provide changes to avoid deprecated Java API
and have a compatibility back to Java 8
* Change affected test classes to JUnit 5 whenever it is possible
* Ignore/Disable some TCP/IP tests which don't pass on Java 14
@artembilan
Copy link
Member Author

@garyrussell ,

I need your help with TCP/IP.

It looks like there are some changes in the UDP multicast with their NetworkInterface and joinGroup().
Plus there is no open field in the SocketChannel any more.
See @EnabledOnJre(JRE.JAVA_8) tests.
And SocketSupportTests.testNioClientAndServerSSLDifferentContexts() fails for no reason for me.

Thanks

@artembilan artembilan mentioned this pull request Jun 16, 2020
Closed
@garyrussell
Fix (some) TCP tests on JRE 14
cc94394
@garyrussell
Fix SSL Handshake test - client side handshake is successful with jav…
49fecdf 
…a 14

- change the badClient cert to a badServer cert to force an error on the client side
artembilan
artembilan commented Jun 17, 2020
View reviewed changes
...n-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java Outdated
@@ -518,7 +518,7 @@ public void testNioClientAndServerSSL() throws Exception {
}

@Test
@EnabledOnJre(JRE.JAVA_8)
@EnabledOnJre(JRE.JAVA_8) // Need to wait for write complete on Java 14
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@garyrussell , what does it mean?
Is there a way to do something similar what you have with that if (System.getProperty("java.version").startsWith("1.8")) { ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it in the next commit.

@artembilan
Copy link
Member Author

Gary, I'm OK to merge this, but may be you have some idea about that deprecated MulticastSocket.joinGroup()?
Or you just can't investigate it altogether because your Mac doesn't support multicast?
Thanks

@garyrussell
Copy link
Contributor

Right; I need to test in a Linux VM.

Please open an issue and assign to me so I don't forget about it.

@garyrussell garyrussell merged commit 3f5aba2 into spring-projects:master Jun 17, 2020
@garyrussell
Copy link
Contributor

Should we add a build plan?

@artembilan
Copy link
Member Author

Should we add a build plan?

Sure! On it...

@artembilan artembilan added this to the 5.4 M1 milestone Jun 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garyrussell garyrussell garyrussell approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.4 M1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@artembilan @garyrussell