From 8136aa1cbd6b61953f803a4115d0e3e0ec25da2b Mon Sep 17 00:00:00 2001 From: Matthias Thieroff Date: Thu, 23 Dec 2021 09:43:32 +0100 Subject: [PATCH] Set the line ending used for license files to LF (#1904) Set line ending explicitly to LF because on Windows using the system line ending does not get along well with our git settings. Co-authored-by: Sebastian Sdorra --- .../com/cloudogu/scm/JavaModulePlugin.groovy | 1 + build.gradle | 14 ++++++++++++++ gradle/changelog/format_liceense_lineendings.yaml | 2 ++ scm-packaging/deb/build.gradle | 3 ++- scm-packaging/docker/build.gradle | 3 ++- scm-packaging/helm/build.gradle | 3 ++- scm-packaging/release-yaml/build.gradle | 4 +++- scm-packaging/rpm/build.gradle | 3 ++- scm-packaging/unix/build.gradle | 3 ++- scm-packaging/windows/build.gradle | 3 ++- scm-ui/build.gradle | 3 ++- 11 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 gradle/changelog/format_liceense_lineendings.yaml diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy index 6ce1582905..18e9aff5b2 100644 --- a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy +++ b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy @@ -111,6 +111,7 @@ class JavaModulePlugin implements Plugin { header project.rootProject.file('LICENSE.txt') newLine = true ignoreNewLine = true + lineEnding = "\n" exclude "**/*.mustache" exclude "**/*.json" diff --git a/build.gradle b/build.gradle index 58fedc7a3e..1793b7b79f 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ plugins { id 'maven-publish' id "org.sonarqube" version "3.0" id "org.scm-manager.changelog" version "0.1.6" + id 'org.scm-manager.license' version "0.7.1" } changelog { @@ -123,6 +124,19 @@ dependencies { } } +license { + header rootProject.file("LICENSE.txt") + newLine = true + ignoreNewLine = true + lineEnding = "\n" + + tasks { + build { + files.from("build.gradle", "settings.gradle", "gradle.properties") + } + } +} + import org.gradle.util.VersionNumber // set build props diff --git a/gradle/changelog/format_liceense_lineendings.yaml b/gradle/changelog/format_liceense_lineendings.yaml new file mode 100644 index 0000000000..a541c0c7f8 --- /dev/null +++ b/gradle/changelog/format_liceense_lineendings.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Set line ending used for license files to LF ([#1904](https://github.com/scm-manager/scm-manager/pull/1904)) diff --git a/scm-packaging/deb/build.gradle b/scm-packaging/deb/build.gradle index c8131f8439..9a2843e0fe 100644 --- a/scm-packaging/deb/build.gradle +++ b/scm-packaging/deb/build.gradle @@ -27,7 +27,7 @@ import org.gradle.util.VersionNumber plugins { id 'nebula.ospackage' version '8.5.6' id 'org.scm-manager.packaging' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } configurations { @@ -169,6 +169,7 @@ artifacts { license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" tasks { build { diff --git a/scm-packaging/docker/build.gradle b/scm-packaging/docker/build.gradle index f33cd8b4b1..6817c82622 100644 --- a/scm-packaging/docker/build.gradle +++ b/scm-packaging/docker/build.gradle @@ -25,7 +25,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' id 'org.scm-manager.packaging' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } import org.gradle.util.VersionNumber @@ -119,6 +119,7 @@ artifacts { license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" tasks { build { diff --git a/scm-packaging/helm/build.gradle b/scm-packaging/helm/build.gradle index 876b08fe78..9b498cf263 100644 --- a/scm-packaging/helm/build.gradle +++ b/scm-packaging/helm/build.gradle @@ -26,7 +26,7 @@ plugins { id 'org.unbroken-dome.helm' version '1.5.0' id 'org.unbroken-dome.helm-publish' version '1.5.0' id 'org.scm-manager.packaging' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } configurations { @@ -97,6 +97,7 @@ task publish { license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" exclude '**/Chart.yaml' exclude '**/*.txt' diff --git a/scm-packaging/release-yaml/build.gradle b/scm-packaging/release-yaml/build.gradle index 3c4449f628..91478734b5 100644 --- a/scm-packaging/release-yaml/build.gradle +++ b/scm-packaging/release-yaml/build.gradle @@ -26,7 +26,7 @@ import com.cloudogu.scm.GitHubUploadTask plugins { id 'org.scm-manager.packaging' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } configurations { @@ -68,6 +68,8 @@ task publish(type: GitHubUploadTask) { license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" + tasks { gradle { files.from('build.gradle') diff --git a/scm-packaging/rpm/build.gradle b/scm-packaging/rpm/build.gradle index fbfcfffbfb..ad228b84fa 100644 --- a/scm-packaging/rpm/build.gradle +++ b/scm-packaging/rpm/build.gradle @@ -49,7 +49,7 @@ buildscript { plugins { id 'nebula.ospackage' version '8.5.6' id 'org.scm-manager.packaging' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } configurations { @@ -183,6 +183,7 @@ artifacts { license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" tasks { build { diff --git a/scm-packaging/unix/build.gradle b/scm-packaging/unix/build.gradle index 9dbde2504c..9fa60b3e55 100644 --- a/scm-packaging/unix/build.gradle +++ b/scm-packaging/unix/build.gradle @@ -28,7 +28,7 @@ plugins { id 'org.scm-manager.packaging' id 'signing' id 'maven-publish' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } configurations { @@ -128,6 +128,7 @@ project.rootProject.publishing.repositories.each { r -> license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" tasks { build { diff --git a/scm-packaging/windows/build.gradle b/scm-packaging/windows/build.gradle index 2a3a4cad71..9fcbc44064 100644 --- a/scm-packaging/windows/build.gradle +++ b/scm-packaging/windows/build.gradle @@ -29,7 +29,7 @@ plugins { id 'org.scm-manager.packaging' id 'signing' id 'maven-publish' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' } configurations { @@ -132,6 +132,7 @@ project.rootProject.publishing.repositories.each { r -> license { header rootProject.file("LICENSE.txt") + lineEnding = "\n" tasks { build { diff --git a/scm-ui/build.gradle b/scm-ui/build.gradle index 3298ad0bb3..1e8b01eed9 100644 --- a/scm-ui/build.gradle +++ b/scm-ui/build.gradle @@ -24,7 +24,7 @@ plugins { id 'com.github.node-gradle.node' version '2.2.4' - id 'org.scm-manager.license' version '0.7.1' + id 'org.scm-manager.license' id 'org.scm-manager.ci' } @@ -244,6 +244,7 @@ license { header rootProject.file("LICENSE.txt") newLine = true ignoreNewLine = true + lineEnding = "\n" style { feature = 'HASH'