keycloak-memoizeit

KEYCLOAK-4950 Remove quote chracters from license names in

7/27/2017 12:04:23 PM

Details

diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
index 9de5603..fd9b83f 100644
--- a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <licenseSummary>
   <dependencies>
     <dependency>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/download-license-files.sh b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/download-license-files.sh
index febd890..998878c 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/download-license-files.sh
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/download-license-files.sh
@@ -14,6 +14,29 @@ echo "==> Deleting old license files in $output_dir" >&2
 
 find "$output_dir" -maxdepth 1 '(' -type f -or -type l ')' -name '*.txt' -print0 | xargs --no-run-if-empty -0 rm
 
+echo "==> Munging $xml to ensure Windows filename compatibility" >&2
+tempfile="$(mktemp)"
+trap "rm -f '$tempfile'" EXIT
+xmlstarlet tr /dev/stdin "$xml" >> "$tempfile" <<EOF
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:template match="/ | @* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()" />
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="licenseSummary/dependencies/dependency/licenses/license/name/text()">
+        <xsl:value-of select="translate(., '&lt;&gt;&quot;:\\|?*', '')"/>
+    </xsl:template>
+
+    <xsl:template match="licenseSummary/others/other/licenses/license/name/text()">
+        <xsl:value-of select="translate(., '&lt;&gt;&quot;:\\|?*', '')"/>
+    </xsl:template>
+</xsl:stylesheet>
+EOF
+cp "$tempfile" "$xml"
+
 echo "==> Downloading license files for $xml into $output_dir" >&2
 
 xmlstarlet sel -T -t -m "/licenseSummary/dependencies/dependency/licenses/license" -v "../../groupId/text()" -o $'\t' -v "../../artifactId/text()" -o $'\t' -v "../../version/text()" -o $'\t' -v "name/text()" -o $'\t' -v "url/text()" --nl "$xml" | \
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
index e5e3ee5..eca72e5 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <licenseSummary>
   <dependencies>
     <dependency>
@@ -667,7 +667,7 @@
       <version>3.5</version>
       <licenses>
         <license>
-          <name>BSD 3-clause "New" or "Revised" License</name>
+          <name>BSD 3-clause New or Revised License</name>
           <url>https://raw.githubusercontent.com/antlr/antlr3/antlr-3.5/runtime/Python/LICENSE</url>
         </license>
       </licenses>
@@ -678,7 +678,7 @@
       <version>1.4.9</version>
       <licenses>
         <license>
-          <name>BSD 3-clause "New" or "Revised" License</name>
+          <name>BSD 3-clause New or Revised License</name>
           <url>https://raw.githubusercontent.com/x-stream/xstream/XSTREAM_1_4_9/LICENSE.txt</url>
         </license>
       </licenses>
@@ -818,7 +818,7 @@
       </locations>
       <licenses>
         <license>
-          <name>BSD 3-clause "New" or "Revised" License</name>
+          <name>BSD 3-clause New or Revised License</name>
           <url>https://raw.githubusercontent.com/ajaxorg/ace-builds/v1.2.3/LICENSE</url>
         </license>
       </licenses>
diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
index 5d65b5e..44f3d40 100644
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/src/main/resources/licenses/rh-sso/licenses.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <licenseSummary>
   <dependencies>
     <dependency>