From 606794a46fca01a83387064844abbc1886ba211c Mon Sep 17 00:00:00 2001 From: Manuel Recena Date: Sun, 15 May 2016 15:58:01 +0200 Subject: [PATCH] [JENKINS-34628] - Bundle "Font Awesome" and "Google Fints: Roboto" dependencies to prevent failures in the offline mode (#2318) * [JENKINS-34628] Remove dependencies with external static resources * [JENKINS-34628] License files were added * [JENKINS-34628] Added references in the About page --- .../resources/hudson/AboutJenkins/index.jelly | 10 +- .../hudson/AboutJenkins/index.properties | 5 +- .../SetupWizard/setupWizardFirstUser.jelly | 8 +- war/package.json | 3 +- war/pom.xml | 2 +- war/src/main/less/pluginSetupWizard.less | 7 +- .../webapp/css/font-awesome/css/LICENSE.txt | 21 + .../css/font-awesome/css/font-awesome.css | 2191 +++++++++++++++++ .../css/font-awesome/css/font-awesome.min.css | 4 + .../css/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 124580 bytes .../webapp/css/font-awesome/fonts/LICENSE.txt | 93 + .../fonts/fontawesome-webfont.eot | Bin 0 -> 76204 bytes .../fonts/fontawesome-webfont.svg | 685 ++++++ .../fonts/fontawesome-webfont.ttf | Bin 0 -> 152364 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 90144 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 71760 bytes .../css/google-fonts/roboto/LICENSE.txt | 13 + .../css/google-fonts/roboto/css/roboto.css | 69 + ...se_cyrillic_greek-ext_cyrillic-ext-300.eot | Bin 0 -> 72735 bytes ...se_cyrillic_greek-ext_cyrillic-ext-300.svg | 314 +++ ...se_cyrillic_greek-ext_cyrillic-ext-300.ttf | Bin 0 -> 162420 bytes ...e_cyrillic_greek-ext_cyrillic-ext-300.woff | Bin 0 -> 82320 bytes ..._cyrillic_greek-ext_cyrillic-ext-300.woff2 | Bin 0 -> 63104 bytes ...se_cyrillic_greek-ext_cyrillic-ext-500.eot | Bin 0 -> 73787 bytes ...se_cyrillic_greek-ext_cyrillic-ext-500.svg | 305 +++ ...se_cyrillic_greek-ext_cyrillic-ext-500.ttf | Bin 0 -> 162588 bytes ...e_cyrillic_greek-ext_cyrillic-ext-500.woff | Bin 0 -> 82804 bytes ..._cyrillic_greek-ext_cyrillic-ext-500.woff2 | Bin 0 -> 63800 bytes ...se_cyrillic_greek-ext_cyrillic-ext-700.eot | Bin 0 -> 73248 bytes ...se_cyrillic_greek-ext_cyrillic-ext-700.svg | 310 +++ ...se_cyrillic_greek-ext_cyrillic-ext-700.ttf | Bin 0 -> 162464 bytes ...e_cyrillic_greek-ext_cyrillic-ext-700.woff | Bin 0 -> 82860 bytes ..._cyrillic_greek-ext_cyrillic-ext-700.woff2 | Bin 0 -> 63396 bytes ...se_cyrillic_greek-ext_cyrillic-ext-900.eot | Bin 0 -> 73626 bytes ...se_cyrillic_greek-ext_cyrillic-ext-900.svg | 304 +++ ...se_cyrillic_greek-ext_cyrillic-ext-900.ttf | Bin 0 -> 163488 bytes ...e_cyrillic_greek-ext_cyrillic-ext-900.woff | Bin 0 -> 83224 bytes ..._cyrillic_greek-ext_cyrillic-ext-900.woff2 | Bin 0 -> 63696 bytes ...yrillic_greek-ext_cyrillic-ext-regular.eot | Bin 0 -> 73045 bytes ...yrillic_greek-ext_cyrillic-ext-regular.svg | 308 +++ ...yrillic_greek-ext_cyrillic-ext-regular.ttf | Bin 0 -> 162876 bytes ...rillic_greek-ext_cyrillic-ext-regular.woff | Bin 0 -> 82560 bytes ...illic_greek-ext_cyrillic-ext-regular.woff2 | Bin 0 -> 63156 bytes .../css/{icons => icomoon/css}/icomoon.css | 10 +- .../icomoon => icomoon/fonts}/icomoon.eot | Bin .../icomoon => icomoon/fonts}/icomoon.svg | 0 .../icomoon => icomoon/fonts}/icomoon.ttf | Bin .../icomoon => icomoon/fonts}/icomoon.woff | Bin 48 files changed, 4644 insertions(+), 18 deletions(-) create mode 100644 war/src/main/webapp/css/font-awesome/css/LICENSE.txt create mode 100644 war/src/main/webapp/css/font-awesome/css/font-awesome.css create mode 100644 war/src/main/webapp/css/font-awesome/css/font-awesome.min.css create mode 100644 war/src/main/webapp/css/font-awesome/fonts/FontAwesome.otf create mode 100644 war/src/main/webapp/css/font-awesome/fonts/LICENSE.txt create mode 100644 war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.eot create mode 100644 war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.svg create mode 100644 war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.ttf create mode 100644 war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.woff create mode 100644 war/src/main/webapp/css/font-awesome/fonts/fontawesome-webfont.woff2 create mode 100644 war/src/main/webapp/css/google-fonts/roboto/LICENSE.txt create mode 100644 war/src/main/webapp/css/google-fonts/roboto/css/roboto.css create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.eot create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.svg create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.ttf create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-300.woff2 create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.eot create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.svg create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.ttf create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-500.woff2 create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.eot create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.svg create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.ttf create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-700.woff2 create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.eot create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.svg create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.ttf create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-900.woff2 create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.eot create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.svg create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.ttf create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff create mode 100644 war/src/main/webapp/css/google-fonts/roboto/fonts/roboto-v15-greek_latin-ext_latin_vietnamese_cyrillic_greek-ext_cyrillic-ext-regular.woff2 rename war/src/main/webapp/css/{icons => icomoon/css}/icomoon.css (95%) rename war/src/main/webapp/css/{icons/icomoon => icomoon/fonts}/icomoon.eot (100%) rename war/src/main/webapp/css/{icons/icomoon => icomoon/fonts}/icomoon.svg (100%) rename war/src/main/webapp/css/{icons/icomoon => icomoon/fonts}/icomoon.ttf (100%) rename war/src/main/webapp/css/{icons/icomoon => icomoon/fonts}/icomoon.woff (100%) diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly index f32a0316ba..68e063af6d 100644 --- a/core/src/main/resources/hudson/AboutJenkins/index.jelly +++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly @@ -34,7 +34,8 @@ THE SOFTWARE.

${%about(app.VERSION)}

${%blurb}

-

${%dependencies}

+

${%dependencies}

+

Mavenized dependencies

@@ -46,7 +47,12 @@ THE SOFTWARE.

${%No information recorded}

 -

${%plugin.dependencies}

+

${%static.dependencies}

+ +

${%plugin.dependencies}

  • diff --git a/core/src/main/resources/hudson/AboutJenkins/index.properties b/core/src/main/resources/hudson/AboutJenkins/index.properties index 907fcc70eb..a4ac4efd1b 100644 --- a/core/src/main/resources/hudson/AboutJenkins/index.properties +++ b/core/src/main/resources/hudson/AboutJenkins/index.properties @@ -23,5 +23,6 @@ about=About Jenkins {0} blurb=Jenkins is a community-developed open-source continuous integration server. -dependencies=Jenkins depends on the following 3rd party libraries. -plugin.dependencies=License and dependency information for plugins: +dependencies=Jenkins depends on the following 3rd party libraries +plugin.dependencies=License and dependency information for plugins +static.dependencies=Static resources diff --git a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly index 34357c9b0a..7d508a3ac0 100644 --- a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly +++ b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly @@ -3,11 +3,13 @@ --> + + + +