From c46222ea158c1397ab7abe0b3b9833209255f7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20Gr=C3=A9au?= <maxime.greau@elastic.co>
Date: Mon, 8 Jan 2018 19:36:33 +0100
Subject: [PATCH] Fix Licenses values for CDDL and Custom URL (#27999)

* Fix license SPDX identifiers (CDDL)
* Fix license type for Custom URL:
  * If the license is identified but not listed as an SPDX identifier, the character `;` is used after the identifier to set the license URL.
---
 .../org/elasticsearch/gradle/DependenciesInfoTask.groovy  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy
index ddd5248396c..eb82b4675f2 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy
@@ -88,7 +88,7 @@ public class DependenciesInfoTask extends DefaultTask {
      * <u>
      *     <li><em>UNKNOWN</em> if LICENSE file is not present for this dependency.</li>
      *     <li><em>one SPDX identifier</em> if the LICENSE content matches with an SPDX license.</li>
-     *     <li><em>Custom:URL</em> if it's not an SPDX license,
+     *     <li><em>Custom;URL</em> if it's not an SPDX license,
      *          URL is the Github URL to the LICENSE file in elasticsearch repository.</li>
      * </ul>
      *
@@ -116,7 +116,7 @@ public class DependenciesInfoTask extends DefaultTask {
                 // As we have the license file, we create a Custom entry with the URL to this license file.
                 final gitBranch = System.getProperty('build.branch', 'master')
                 final String githubBaseURL = "https://raw.githubusercontent.com/elastic/elasticsearch/${gitBranch}/"
-                return "Custom:${license.getCanonicalPath().replaceFirst('.*/elasticsearch/', githubBaseURL)}"
+                return "Custom;${license.getCanonicalPath().replaceFirst('.*/elasticsearch/', githubBaseURL)}"
             }
             return spdx
         } else {
@@ -156,10 +156,10 @@ public class DependenciesInfoTask extends DefaultTask {
                 spdx = 'LGPL-3.0'
                 break
             case ~/.*${CDDL_1_0}.*/:
-                spdx = 'CDDL_1_0'
+                spdx = 'CDDL-1.0'
                 break
             case ~/.*${CDDL_1_1}.*/:
-                spdx = 'CDDL_1_1'
+                spdx = 'CDDL-1.1'
                 break
             case ~/.*${ICU}.*/:
                 spdx = 'ICU'