From 0e2cf987db92cb8f29545642a68c658ce8b527a0 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Tue, 10 Aug 2021 14:03:40 -0700 Subject: [PATCH 1/2] User version-specific documentation link in jvm.options file --- distribution/build.gradle | 3 ++- distribution/src/config/jvm.options | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distribution/build.gradle b/distribution/build.gradle index 73e5a8b6023cc..942a718acea96 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -9,10 +9,10 @@ import org.apache.tools.ant.filters.FixCrLfFilter import org.apache.tools.ant.filters.ReplaceTokens +import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.internal.ConcatFilesTask import org.elasticsearch.gradle.internal.DependenciesInfoTask import org.elasticsearch.gradle.internal.NoticeTask -import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.internal.info.BuildParams import java.nio.file.Files @@ -486,6 +486,7 @@ subprojects { Map expansions = [ 'project.name': project.name, 'project.version': version, + 'project.minor.version': "${VersionProperties.elasticsearchVersion.major}.${VersionProperties.elasticsearchVersion.minor}", 'path.conf': [ 'deb': '/etc/elasticsearch', diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options index ea9102523ebea..6144c3a26b5aa 100644 --- a/distribution/src/config/jvm.options +++ b/distribution/src/config/jvm.options @@ -26,13 +26,13 @@ ## required, it should be done through a file in jvm.options.d, ## which should be named with .options suffix, and the min and ## max should be set to the same value. For example, to set the -## heap to 4 GB, create a new file in the jvm.options.d +## heap to 4 GB, create a new file in the jvm.options.d ## directory containing these lines: ## ## -Xms4g ## -Xmx4g ## -## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html +## See https://www.elastic.co/guide/en/elasticsearch/reference/@project.minor.version@/heap-size.html ## for more information ## ################################################################ From 53b71fc1557ad46b9f1287d1546ca91f3aefbd69 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 11 Aug 2021 12:05:30 -0700 Subject: [PATCH 2/2] Replace other link as well --- distribution/src/config/jvm.options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options index 6144c3a26b5aa..7a5422219e832 100644 --- a/distribution/src/config/jvm.options +++ b/distribution/src/config/jvm.options @@ -9,7 +9,7 @@ ## should create one or more files in the jvm.options.d ## directory containing your adjustments. ## -## See https://www.elastic.co/guide/en/elasticsearch/reference/current/jvm-options.html +## See https://www.elastic.co/guide/en/elasticsearch/reference/@project.minor.version@/jvm-options.html ## for more information. ## ################################################################