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.

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

GEODE-3: small java 9 compatibility fixes #2476

Merged
merged 2 commits into from Sep 27, 2018
Merged

Conversation

jinmeiliao
Copy link
Member

@jinmeiliao jinmeiliao commented Sep 14, 2018

  • fix InstallerJUnitTest
  • remove -d64 option
  • PowerMock needs to ignore more modules in PulseControllerJunitTest in java9

Thank you for submitting a contribution to Apache Geode.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?

  • Has your PR been rebased against the latest commit within the target branch (typically develop)?

  • Is your initial contribution a single, squashed commit?

  • Does gradlew build run cleanly?

  • Have you written or updated unit tests to verify your changes?

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.

@@ -391,7 +391,7 @@ private void start(final Properties properties, final File workingDirectory) {

// -d64 is not a valid option for windows and results in failure
final int bits = Integer.getInteger("sun.arch.data.model", 0).intValue();
if (bits == 64 && !(System.getProperty("os.name").toLowerCase().contains("windows"))) {
if (bits == 64 && (System.getProperty("os.name").toLowerCase().contains("solaris"))) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this mean that "-d64" is no longer a valid option for Mac or Linux?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think we can get rid of this option for all the platforms. This is from java9 documentation:

-d32
This option is deprecated and will be removed in a future release.

-d64
This option is deprecated and will be removed in a future release.

Oracle Solaris, Linux, and OS X: Runs the application in a 64-bit environment. If a 64-bit environment isn’t installed or isn’t supported, then an error is reported.

Copy link
Contributor

Choose a reason for hiding this comment

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

Should we just rip this out entirely? Who's running a 32bit OS anyway?

Co-authored-by: Owen Nichols <onichols@pivotal.io>

* fix InstallerJUnitTest
* -64 options will be removed in java9 and later for all platforms (fix DeprecatedAgentLauncherIntegrationTest)
* PowerMock needs to ignore more modules in PulseControllerJunitTest in java9
@@ -389,12 +389,6 @@ private void start(final Properties properties, final File workingDirectory) {
argumentList.add("-classpath");
argumentList.add(manifestJar);

// -d64 is not a valid option for windows and results in failure
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the impact of removing this for Java 8 on Linux?

@dickcav dickcav merged commit 0bd2f5d into apache:develop Sep 27, 2018
@jinmeiliao jinmeiliao deleted the 10-7 branch October 12, 2018 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants