This is an automated email from the ASF dual-hosted git repository.
mpochatkin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 2a82becbabf IGNITE-28224 Fix line endings in start scripts when built
on Windows (#7776)
2a82becbabf is described below
commit 2a82becbabfc5e2ac95c43286de859af4edae507
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Tue Mar 24 06:01:00 2026 +0300
IGNITE-28224 Fix line endings in start scripts when built on Windows (#7776)
---
packaging/build.gradle | 2 ++
packaging/cli/build.gradle | 3 +++
packaging/db/build.gradle | 9 +++++++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/packaging/build.gradle b/packaging/build.gradle
index a005cb8f6e4..57b07874624 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -30,6 +30,7 @@ java {
import com.github.jk1.license.filter.LicenseBundleNormalizer
import com.github.jk1.license.render.InventoryHtmlReportRenderer
+import org.apache.tools.ant.filters.FixCrLfFilter
import org.apache.tools.ant.filters.ReplaceTokens
import org.gradle.crypto.checksum.Checksum
@@ -150,6 +151,7 @@ def replaceVars = tasks.register('replaceVars', Copy) {
from "$rootDir/packaging/docker/$tokens.BOOTSTRAP_FILE_NAME"
from "$rootDir/packaging/docker/docker-entrypoint.sh"
filter(ReplaceTokens, tokens: tokens)
+ filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance("lf"))
into "$buildDir/docker"
}
diff --git a/packaging/cli/build.gradle b/packaging/cli/build.gradle
index 0b6c55dbdfc..5ea75ed6244 100644
--- a/packaging/cli/build.gradle
+++ b/packaging/cli/build.gradle
@@ -30,6 +30,7 @@ java {
targetCompatibility = JavaVersion.VERSION_11
}
+import org.apache.tools.ant.filters.FixCrLfFilter
import org.apache.tools.ant.filters.ReplaceTokens
import org.gradle.crypto.checksum.Checksum
@@ -69,6 +70,7 @@ def zipTokens = tokens + [
def replaceScriptVarsZip = tasks.register('replaceScriptVarsZip', Copy) {
from 'start.sh'
filter(ReplaceTokens, tokens: zipTokens)
+ filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance("lf"))
into "$buildDir/zip"
rename {
'ignite3'
@@ -150,6 +152,7 @@ def replaceScriptVarsLinux =
tasks.register('replaceScriptVarsLinux', Copy) {
from 'start.sh'
from 'postInstall.sh'
filter(ReplaceTokens, tokens: linuxTokens)
+ filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance("lf"))
into "$buildDir/linux"
}
diff --git a/packaging/db/build.gradle b/packaging/db/build.gradle
index 391182f3495..f67adbc9a3b 100644
--- a/packaging/db/build.gradle
+++ b/packaging/db/build.gradle
@@ -32,6 +32,7 @@ java {
targetCompatibility = JavaVersion.VERSION_11
}
+import org.apache.tools.ant.filters.FixCrLfFilter
import org.apache.tools.ant.filters.ReplaceTokens
import org.gradle.crypto.checksum.Checksum
@@ -117,6 +118,7 @@ def replaceZipScriptVarsLin =
tasks.register('replaceZipScriptVarsLin', Copy) {
from 'zip/linux'
filter(ReplaceTokens, tokens: zipStartScriptTokensLin)
+ filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance("lf"))
into "$buildDir/zip/"
}
@@ -151,11 +153,13 @@ def generateConfigDefaults =
tasks.register('generateConfigDefaults', JavaExec)
def generateClasspathFile = tasks.register('generateClasspathFile') {
def outputFile = layout.buildDirectory.file("${tokensLin.CLASS_PATH_FILE}")
+ inputs.files(configurations.dbArtifacts).withPropertyName("dbArtifacts")
outputs.file(outputFile)
doLast {
- outputFile.get().asFile.withPrintWriter {writer ->
- configurations.dbArtifacts.forEach {writer.println it.name }
+ outputFile.get().asFile.withWriter {writer ->
+ // Classpath file is used only on Linux distributions
+ configurations.dbArtifacts.forEach {writer.write it.name + '\n' }
}
}
}
@@ -243,6 +247,7 @@ def replacePackageScriptVars =
tasks.register('replacePackageScriptVars', Copy)
from 'ignite.java.util.logging.properties'
from "$rootDir/packaging/common/linux"
filter(ReplaceTokens, tokens: packageTokens)
+ filter(FixCrLfFilter, eol: FixCrLfFilter.CrLf.newInstance("lf"))
into "$buildDir/linux"
}