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

Remove no-jdk distributions #76896

Merged
merged 3 commits into from
Aug 25, 2021

Conversation

mark-vieira
Copy link
Contributor

Starting with Elasticsearch 8.0 we will no longer build separate "no-jdk" distributions. All distributions now include by default a bundled JDK and users can configure an alternative JDK distribution via ES_JAVA_HOME.

I've left some references to no-jdk distribution handling code to make future backports easier but all the build scripts under distribution/ have had conditional jdk logic stripped out. Additionally, there was a lot of lingering code related to OSS distributions which no longer exist which has been removed as well and will be separately backported to 7.x.

Closes #65109

@mark-vieira mark-vieira added >non-issue :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts labels Aug 24, 2021
@elasticmachine elasticmachine added the Team:Delivery Meta label for Delivery team label Aug 24, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@mark-vieira
Copy link
Contributor Author

@elasticmachine run elasticsearch-ci/packaging-tests-windows

@mark-vieira mark-vieira merged commit 8a9ea85 into elastic:master Aug 25, 2021
@mark-vieira mark-vieira deleted the remove_no-jdk_distribution branch August 25, 2021 16:52
Copy link
Contributor

@breskeby breskeby left a comment

Choose a reason for hiding this comment

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

nice cleanup! lgtm

Copy link
Contributor

@breskeby breskeby left a comment

Choose a reason for hiding this comment

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

lgtm

}
}
currentDistros.add(
createDistro(distributions, architecture, type, null, bundledJdk, VersionProperties.getElasticsearch())
Copy link
Contributor

Choose a reason for hiding this comment

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

we can probably remove the bundleJdk parameter from the createDistro

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I purposefully didn't to make backports easier. That might be wishful thinking though.

rjernst added a commit to rjernst/elasticsearch that referenced this pull request Apr 8, 2022
The no-jdk distributions exist in 7.x and before. They were removed with
8.0. This commit removes the remaining deprecation messages for using
the no-jdk distribution. Note that when talking with an older node, we
drop the bundledJdk attribute. This is ok because it is only possible
for this to not be true when talking with a 7.17 node, during an upgrade,
and the usingBundledJdk is retained, which is the important thing if
debugging a problem.

relates elastic#76896
relates elastic#85758
rjernst added a commit that referenced this pull request Apr 11, 2022
The no-jdk distributions exist in 7.x and before. They were removed with
8.0. This commit removes the remaining deprecation messages for using
the no-jdk distribution. Note that when talking with an older node, we
drop the bundledJdk attribute. This is ok because it is only possible
for this to not be true when talking with a 7.17 node, during an upgrade,
and the usingBundledJdk is retained, which is the important thing if
debugging a problem.

relates #76896
relates #85758
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>breaking :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team v8.0.0-alpha2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove no-jdk distributions for 8.0 release
6 participants