From: David Rautureau Date: Wed, 14 Mar 2018 15:18:20 +0000 (+0100) Subject: Fix incremental build of sonar web X-Git-Tag: 7.5~1536 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b7497deb41ba42c4b9c626de66108d0fed216a07;p=sonarqube.git Fix incremental build of sonar web --- diff --git a/.gitignore b/.gitignore index 36df787872f..eeaa0bc6f63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,3 @@ -# The following should be moved in related sub-directories -server/sonar-web/src/main/webapp/stylesheets/sonar-colorizer.css -server/sonar-web/src/main/webapp/deploy/plugins -server/sonar-web/src/main/webapp/deploy/bootstrap -server/sonar-web/src/main/webapp/deploy/maven/org -server/sonar-web/src/main/webapp/WEB-INF/log/ -server/sonar-web/src/main/webapp/deploy/*.jar -server/sonar-web/src/main/webapp/deploy/jdbc-driver.txt - # ---- Gradle build/ .gradle/ diff --git a/server/sonar-web/.gitignore b/server/sonar-web/.gitignore index 54edd2e381a..bc02f6cecbc 100644 --- a/server/sonar-web/.gitignore +++ b/server/sonar-web/.gitignore @@ -16,13 +16,6 @@ yarn-error.log #webpack .awcache/ -# build -build/ -src/main/webapp/js/ -src/main/webapp/css/ -src/main/webapp/index.html -src/main/webapp/WEB-INF/lib/*.jar - # tests src/test/json/**/*.png lcov.info diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle index ee71411cf03..131b5fb406b 100644 --- a/server/sonar-web/build.gradle +++ b/server/sonar-web/build.gradle @@ -9,7 +9,6 @@ sonarqube { } apply plugin: 'com.moowork.node' -apply plugin: 'war' configurations { branding @@ -17,13 +16,37 @@ configurations { dependencies { branding 'com.sonarsource:sonarsource-branding:1.3.0.307@war' } + +def webappDir = "${buildDir}/webapp" +def brandingDir = "${buildDir}/branding" + task unzipBranding(type: Copy) { - into projectDir from { zipTree(configurations.branding.singleFile) } + into brandingDir +} +task copyBrandingSrc(type: Copy, dependsOn: unzipBranding) { + into projectDir + from file(brandingDir) include '**/*.js' + includeEmptyDirs = false +} +task copyBrandingWebapp(type: Copy, dependsOn: unzipBranding) { + into "${projectDir}/public" + from file("${brandingDir}/src/main/webapp") include '**/*.svg' includeEmptyDirs = false } +task copyBrandingFile(type: Copy, dependsOn: unzipBranding) { + into "${projectDir}/public" + from file(brandingDir) + include '**/branding' + includeEmptyDirs = false +} +task copyBranding() { + dependsOn copyBrandingSrc + dependsOn copyBrandingWebapp + dependsOn copyBrandingFile +} node { version = '8.5.0' @@ -32,13 +55,17 @@ node { } yarn_run { - if (release) { dependsOn unzipBranding } + if (release) { dependsOn copyBranding } + inputs.dir('config') + inputs.dir('public') inputs.dir('scripts') - inputs.dir('src/main/js') + inputs.dir('src') + inputs.file('.babelrc') inputs.file('build.gradle') - outputs.dir('src/main/webapp') + inputs.file('package.json') + inputs.file('tsconfig.json') + inputs.file('yarn.lock') + outputs.dir(webappDir) args = ['build'] } - -war.dependsOn yarn_run diff --git a/server/sonar-web/config/paths.js b/server/sonar-web/config/paths.js index 5b380588750..9bb3c591122 100644 --- a/server/sonar-web/config/paths.js +++ b/server/sonar-web/config/paths.js @@ -45,14 +45,14 @@ const nodePaths = (process.env.NODE_PATH || '') // config after eject: we're in ./config/ module.exports = { - appBuild: resolveApp('src/main/webapp'), + appBuild: resolveApp('build/webapp'), appPublic: resolveApp('public'), appHtml: resolveApp('public/index.html'), appPackageJson: resolveApp('package.json'), appSrc: resolveApp('src/main/js'), - jsBuild: resolveApp('src/main/webapp/js'), - cssBuild: resolveApp('src/main/webapp/css'), - htmlBuild: resolveApp('src/main/webapp/index.html'), + jsBuild: resolveApp('build/webapp/js'), + cssBuild: resolveApp('build/webapp/css'), + htmlBuild: resolveApp('build/webapp/index.html'), appNodeModules: resolveApp('node_modules'), ownNodeModules: resolveApp('node_modules'), nodePaths diff --git a/server/sonar-web/public/.htaccess b/server/sonar-web/public/.htaccess new file mode 100644 index 00000000000..d3c9983451f --- /dev/null +++ b/server/sonar-web/public/.htaccess @@ -0,0 +1,40 @@ +# General Apache options +AddHandler fastcgi-script .fcgi +AddHandler cgi-script .cgi +Options +FollowSymLinks +ExecCGI + +# If you don't want Rails to look in certain directories, +# use the following rewrite rules so that Apache won't rewrite certain requests +# +# Example: +# RewriteCond %{REQUEST_URI} ^/notrails.* +# RewriteRule .* - [L] + +# Redirect all requests not available on the filesystem to Rails +# By default the cgi dispatcher is used which is very slow +# +# For better performance replace the dispatcher with the fastcgi one +# +# Example: +# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] +RewriteEngine On + +# If your Rails application is accessed via an Alias directive, +# then you MUST also set the RewriteBase in this htaccess file. +# +# Example: +# Alias /myrailsapp /path/to/myrailsapp/public +# RewriteBase /myrailsapp + +RewriteRule ^$ index.html [QSA] +RewriteRule ^([^.]+)$ $1.html [QSA] +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ dispatch.cgi [QSA,L] + +# In case Rails experiences terminal errors +# Instead of displaying this message you can supply a file here which will be rendered instead +# +# Example: +# ErrorDocument 500 /500.html + +ErrorDocument 500 "

Application error

Rails application failed to start properly" \ No newline at end of file diff --git a/server/sonar-web/public/WEB-INF/web.xml b/server/sonar-web/public/WEB-INF/web.xml new file mode 100644 index 00000000000..0079ac0ed10 --- /dev/null +++ b/server/sonar-web/public/WEB-INF/web.xml @@ -0,0 +1,152 @@ + + + + SonarQube + + + ServletFilters + org.sonar.server.platform.web.MasterServletFilter + + + UserSessionFilter + org.sonar.server.user.UserSessionFilter + + + SetCharacterEncodingFilter + org.apache.catalina.filters.SetCharacterEncodingFilter + + encoding + UTF-8 + + + + SecurityFilter + org.sonar.server.platform.web.SecurityServletFilter + + + RootFilter + org.sonar.server.platform.web.RootFilter + + + RedirectFilter + org.sonar.server.platform.web.RedirectFilter + + + RequestUidFilter + org.sonar.server.platform.web.requestid.RequestIdFilter + + + WebPagesFilter + org.sonar.server.platform.web.WebPagesFilter + + + + + SetCharacterEncodingFilter + /* + + + RootFilter + /* + + + RequestUidFilter + /* + + + RedirectFilter + /* + + + SecurityFilter + /* + + + UserSessionFilter + /* + + + ServletFilters + /* + + + WebPagesFilter + /* + + + + static + org.sonar.server.plugins.StaticResourcesServlet + + + + static + /static/* + + + + org.sonar.server.platform.web.PlatformServletContextListener + + + + css + text/css + + + xml + text/xml + + + gif + image/gif + + + jpeg + image/jpeg + + + jpg + image/jpeg + + + htm + text/html + + + html + text/html + + + jar + application/java-archive + + + pdf + application/pdf + + + png + image/png + + + ico + image/x-icon + + + txt + text/plain + + + csv + text/plain + + + woff + application/font-woff + + diff --git a/server/sonar-web/public/apple-touch-icon-114x114.png b/server/sonar-web/public/apple-touch-icon-114x114.png new file mode 100644 index 00000000000..d3bf726f9a2 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-114x114.png differ diff --git a/server/sonar-web/public/apple-touch-icon-120x120.png b/server/sonar-web/public/apple-touch-icon-120x120.png new file mode 100644 index 00000000000..21dd9adace9 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-120x120.png differ diff --git a/server/sonar-web/public/apple-touch-icon-144x144.png b/server/sonar-web/public/apple-touch-icon-144x144.png new file mode 100644 index 00000000000..a8859d94fc0 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-144x144.png differ diff --git a/server/sonar-web/public/apple-touch-icon-152x152.png b/server/sonar-web/public/apple-touch-icon-152x152.png new file mode 100644 index 00000000000..ed12b023481 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-152x152.png differ diff --git a/server/sonar-web/public/apple-touch-icon-180x180.png b/server/sonar-web/public/apple-touch-icon-180x180.png new file mode 100644 index 00000000000..167bb46f082 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-180x180.png differ diff --git a/server/sonar-web/public/apple-touch-icon-57x57.png b/server/sonar-web/public/apple-touch-icon-57x57.png new file mode 100644 index 00000000000..821e1e4cce7 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-57x57.png differ diff --git a/server/sonar-web/public/apple-touch-icon-60x60.png b/server/sonar-web/public/apple-touch-icon-60x60.png new file mode 100644 index 00000000000..1f10bb20da1 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-60x60.png differ diff --git a/server/sonar-web/public/apple-touch-icon-72x72.png b/server/sonar-web/public/apple-touch-icon-72x72.png new file mode 100644 index 00000000000..371814b6a03 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-72x72.png differ diff --git a/server/sonar-web/public/apple-touch-icon-76x76.png b/server/sonar-web/public/apple-touch-icon-76x76.png new file mode 100644 index 00000000000..9dfb1e66de4 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-76x76.png differ diff --git a/server/sonar-web/public/apple-touch-icon-precomposed.png b/server/sonar-web/public/apple-touch-icon-precomposed.png new file mode 100644 index 00000000000..21dd9adace9 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon-precomposed.png differ diff --git a/server/sonar-web/public/apple-touch-icon.png b/server/sonar-web/public/apple-touch-icon.png new file mode 100644 index 00000000000..21dd9adace9 Binary files /dev/null and b/server/sonar-web/public/apple-touch-icon.png differ diff --git a/server/sonar-web/public/favicon.ico b/server/sonar-web/public/favicon.ico new file mode 100644 index 00000000000..15b647af1c2 Binary files /dev/null and b/server/sonar-web/public/favicon.ico differ diff --git a/server/sonar-web/public/fonts/sonar-5.2.eot b/server/sonar-web/public/fonts/sonar-5.2.eot new file mode 100755 index 00000000000..fbc4d06cfa3 Binary files /dev/null and b/server/sonar-web/public/fonts/sonar-5.2.eot differ diff --git a/server/sonar-web/public/fonts/sonar-5.2.svg b/server/sonar-web/public/fonts/sonar-5.2.svg new file mode 100755 index 00000000000..1d648b7b456 --- /dev/null +++ b/server/sonar-web/public/fonts/sonar-5.2.svg @@ -0,0 +1,89 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/sonar-web/public/fonts/sonar-5.2.ttf b/server/sonar-web/public/fonts/sonar-5.2.ttf new file mode 100755 index 00000000000..fa26fd2b826 Binary files /dev/null and b/server/sonar-web/public/fonts/sonar-5.2.ttf differ diff --git a/server/sonar-web/public/fonts/sonar-5.2.woff b/server/sonar-web/public/fonts/sonar-5.2.woff new file mode 100755 index 00000000000..1e9e0d823fc Binary files /dev/null and b/server/sonar-web/public/fonts/sonar-5.2.woff differ diff --git a/server/sonar-web/public/images/loading.gif b/server/sonar-web/public/images/loading.gif new file mode 100644 index 00000000000..60834b831fa Binary files /dev/null and b/server/sonar-web/public/images/loading.gif differ diff --git a/server/sonar-web/public/images/logo.svg b/server/sonar-web/public/images/logo.svg new file mode 100644 index 00000000000..2f200d9d8e2 --- /dev/null +++ b/server/sonar-web/public/images/logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/server/sonar-web/public/images/project_badges/sonarcloud-black.svg b/server/sonar-web/public/images/project_badges/sonarcloud-black.svg new file mode 100644 index 00000000000..1ff05edc822 --- /dev/null +++ b/server/sonar-web/public/images/project_badges/sonarcloud-black.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/sonar-web/public/images/project_badges/sonarcloud-orange.svg b/server/sonar-web/public/images/project_badges/sonarcloud-orange.svg new file mode 100644 index 00000000000..1a53be8e449 --- /dev/null +++ b/server/sonar-web/public/images/project_badges/sonarcloud-orange.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/sonar-web/public/images/project_badges/sonarcloud-white.svg b/server/sonar-web/public/images/project_badges/sonarcloud-white.svg new file mode 100644 index 00000000000..475ef13f68e --- /dev/null +++ b/server/sonar-web/public/images/project_badges/sonarcloud-white.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/sonar-web/public/images/scanner-logos/ant.svg b/server/sonar-web/public/images/scanner-logos/ant.svg new file mode 100644 index 00000000000..697ae4dc56a --- /dev/null +++ b/server/sonar-web/public/images/scanner-logos/ant.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/server/sonar-web/public/images/scanner-logos/gradle.svg b/server/sonar-web/public/images/scanner-logos/gradle.svg new file mode 100644 index 00000000000..0d178e1acc3 --- /dev/null +++ b/server/sonar-web/public/images/scanner-logos/gradle.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/server/sonar-web/public/images/scanner-logos/jenkins.svg b/server/sonar-web/public/images/scanner-logos/jenkins.svg new file mode 100644 index 00000000000..284455cf12a --- /dev/null +++ b/server/sonar-web/public/images/scanner-logos/jenkins.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Jenkins + + + diff --git a/server/sonar-web/public/images/scanner-logos/maven.svg b/server/sonar-web/public/images/scanner-logos/maven.svg new file mode 100644 index 00000000000..9f7fcaa9f76 --- /dev/null +++ b/server/sonar-web/public/images/scanner-logos/maven.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/server/sonar-web/public/images/scanner-logos/msbuild.svg b/server/sonar-web/public/images/scanner-logos/msbuild.svg new file mode 100644 index 00000000000..811245afe89 --- /dev/null +++ b/server/sonar-web/public/images/scanner-logos/msbuild.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/server/sonar-web/public/images/scanner-logos/sonarqube.svg b/server/sonar-web/public/images/scanner-logos/sonarqube.svg new file mode 100644 index 00000000000..ad6cebddc28 --- /dev/null +++ b/server/sonar-web/public/images/scanner-logos/sonarqube.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/server/sonar-web/public/images/select2.png b/server/sonar-web/public/images/select2.png new file mode 100755 index 00000000000..1d804ffb996 Binary files /dev/null and b/server/sonar-web/public/images/select2.png differ diff --git a/server/sonar-web/public/images/select2x2.png b/server/sonar-web/public/images/select2x2.png new file mode 100755 index 00000000000..4bdd5c961d4 Binary files /dev/null and b/server/sonar-web/public/images/select2x2.png differ diff --git a/server/sonar-web/public/mstile-512x512.png b/server/sonar-web/public/mstile-512x512.png new file mode 100644 index 00000000000..b644063292d Binary files /dev/null and b/server/sonar-web/public/mstile-512x512.png differ diff --git a/server/sonar-web/public/robots.txt b/server/sonar-web/public/robots.txt new file mode 100644 index 00000000000..06fde6d0680 --- /dev/null +++ b/server/sonar-web/public/robots.txt @@ -0,0 +1,3 @@ +# We don't want robots to click all Sonar links +User-agent: * +Disallow: / \ No newline at end of file diff --git a/server/sonar-web/scripts/build.js b/server/sonar-web/scripts/build.js index 321cb71c30c..c3469f538c3 100644 --- a/server/sonar-web/scripts/build.js +++ b/server/sonar-web/scripts/build.js @@ -37,14 +37,8 @@ function clean() { // if you're in it, you don't end up in Trash console.log(chalk.cyan.bold('Cleaning output directories and files...')); - console.log(paths.jsBuild + '/*'); - rimrafSync(paths.jsBuild + '/*'); - - console.log(paths.cssBuild + '/*'); - rimrafSync(paths.cssBuild + '/*'); - - console.log(paths.htmlBuild); - rimrafSync(paths.htmlBuild); + console.log(paths.appBuild + '/*'); + rimrafSync(paths.appBuild + '/*'); console.log(); } diff --git a/server/sonar-web/src/main/webapp/.htaccess b/server/sonar-web/src/main/webapp/.htaccess deleted file mode 100644 index d3c9983451f..00000000000 --- a/server/sonar-web/src/main/webapp/.htaccess +++ /dev/null @@ -1,40 +0,0 @@ -# General Apache options -AddHandler fastcgi-script .fcgi -AddHandler cgi-script .cgi -Options +FollowSymLinks +ExecCGI - -# If you don't want Rails to look in certain directories, -# use the following rewrite rules so that Apache won't rewrite certain requests -# -# Example: -# RewriteCond %{REQUEST_URI} ^/notrails.* -# RewriteRule .* - [L] - -# Redirect all requests not available on the filesystem to Rails -# By default the cgi dispatcher is used which is very slow -# -# For better performance replace the dispatcher with the fastcgi one -# -# Example: -# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] -RewriteEngine On - -# If your Rails application is accessed via an Alias directive, -# then you MUST also set the RewriteBase in this htaccess file. -# -# Example: -# Alias /myrailsapp /path/to/myrailsapp/public -# RewriteBase /myrailsapp - -RewriteRule ^$ index.html [QSA] -RewriteRule ^([^.]+)$ $1.html [QSA] -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^(.*)$ dispatch.cgi [QSA,L] - -# In case Rails experiences terminal errors -# Instead of displaying this message you can supply a file here which will be rendered instead -# -# Example: -# ErrorDocument 500 /500.html - -ErrorDocument 500 "

Application error

Rails application failed to start properly" \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/WEB-INF/web.xml b/server/sonar-web/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 0079ac0ed10..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - SonarQube - - - ServletFilters - org.sonar.server.platform.web.MasterServletFilter - - - UserSessionFilter - org.sonar.server.user.UserSessionFilter - - - SetCharacterEncodingFilter - org.apache.catalina.filters.SetCharacterEncodingFilter - - encoding - UTF-8 - - - - SecurityFilter - org.sonar.server.platform.web.SecurityServletFilter - - - RootFilter - org.sonar.server.platform.web.RootFilter - - - RedirectFilter - org.sonar.server.platform.web.RedirectFilter - - - RequestUidFilter - org.sonar.server.platform.web.requestid.RequestIdFilter - - - WebPagesFilter - org.sonar.server.platform.web.WebPagesFilter - - - - - SetCharacterEncodingFilter - /* - - - RootFilter - /* - - - RequestUidFilter - /* - - - RedirectFilter - /* - - - SecurityFilter - /* - - - UserSessionFilter - /* - - - ServletFilters - /* - - - WebPagesFilter - /* - - - - static - org.sonar.server.plugins.StaticResourcesServlet - - - - static - /static/* - - - - org.sonar.server.platform.web.PlatformServletContextListener - - - - css - text/css - - - xml - text/xml - - - gif - image/gif - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - htm - text/html - - - html - text/html - - - jar - application/java-archive - - - pdf - application/pdf - - - png - image/png - - - ico - image/x-icon - - - txt - text/plain - - - csv - text/plain - - - woff - application/font-woff - - diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png b/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png deleted file mode 100644 index d3bf726f9a2..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-114x114.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png b/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png deleted file mode 100644 index 21dd9adace9..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-120x120.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png b/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png deleted file mode 100644 index a8859d94fc0..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-144x144.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png b/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png deleted file mode 100644 index ed12b023481..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-152x152.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png b/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png deleted file mode 100644 index 167bb46f082..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-180x180.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png b/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png deleted file mode 100644 index 821e1e4cce7..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-57x57.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png b/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png deleted file mode 100644 index 1f10bb20da1..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-60x60.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png b/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png deleted file mode 100644 index 371814b6a03..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-72x72.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png b/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png deleted file mode 100644 index 9dfb1e66de4..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-76x76.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png b/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png deleted file mode 100644 index 21dd9adace9..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon-precomposed.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/apple-touch-icon.png b/server/sonar-web/src/main/webapp/apple-touch-icon.png deleted file mode 100644 index 21dd9adace9..00000000000 Binary files a/server/sonar-web/src/main/webapp/apple-touch-icon.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/favicon.ico b/server/sonar-web/src/main/webapp/favicon.ico deleted file mode 100644 index 15b647af1c2..00000000000 Binary files a/server/sonar-web/src/main/webapp/favicon.ico and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.eot b/server/sonar-web/src/main/webapp/fonts/sonar-5.2.eot deleted file mode 100755 index fbc4d06cfa3..00000000000 Binary files a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.eot and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.svg b/server/sonar-web/src/main/webapp/fonts/sonar-5.2.svg deleted file mode 100755 index 1d648b7b456..00000000000 --- a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.svg +++ /dev/null @@ -1,89 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.ttf b/server/sonar-web/src/main/webapp/fonts/sonar-5.2.ttf deleted file mode 100755 index fa26fd2b826..00000000000 Binary files a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.ttf and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.woff b/server/sonar-web/src/main/webapp/fonts/sonar-5.2.woff deleted file mode 100755 index 1e9e0d823fc..00000000000 Binary files a/server/sonar-web/src/main/webapp/fonts/sonar-5.2.woff and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/images/loading.gif b/server/sonar-web/src/main/webapp/images/loading.gif deleted file mode 100644 index 60834b831fa..00000000000 Binary files a/server/sonar-web/src/main/webapp/images/loading.gif and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/images/logo.svg b/server/sonar-web/src/main/webapp/images/logo.svg deleted file mode 100644 index 2f200d9d8e2..00000000000 --- a/server/sonar-web/src/main/webapp/images/logo.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-black.svg b/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-black.svg deleted file mode 100644 index 1ff05edc822..00000000000 --- a/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-black.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-orange.svg b/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-orange.svg deleted file mode 100644 index 1a53be8e449..00000000000 --- a/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-orange.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-white.svg b/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-white.svg deleted file mode 100644 index 475ef13f68e..00000000000 --- a/server/sonar-web/src/main/webapp/images/project_badges/sonarcloud-white.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/sonar-web/src/main/webapp/images/scanner-logos/ant.svg b/server/sonar-web/src/main/webapp/images/scanner-logos/ant.svg deleted file mode 100644 index 697ae4dc56a..00000000000 --- a/server/sonar-web/src/main/webapp/images/scanner-logos/ant.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/server/sonar-web/src/main/webapp/images/scanner-logos/gradle.svg b/server/sonar-web/src/main/webapp/images/scanner-logos/gradle.svg deleted file mode 100644 index 0d178e1acc3..00000000000 --- a/server/sonar-web/src/main/webapp/images/scanner-logos/gradle.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/server/sonar-web/src/main/webapp/images/scanner-logos/jenkins.svg b/server/sonar-web/src/main/webapp/images/scanner-logos/jenkins.svg deleted file mode 100644 index 284455cf12a..00000000000 --- a/server/sonar-web/src/main/webapp/images/scanner-logos/jenkins.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Jenkins - - - diff --git a/server/sonar-web/src/main/webapp/images/scanner-logos/maven.svg b/server/sonar-web/src/main/webapp/images/scanner-logos/maven.svg deleted file mode 100644 index 9f7fcaa9f76..00000000000 --- a/server/sonar-web/src/main/webapp/images/scanner-logos/maven.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/server/sonar-web/src/main/webapp/images/scanner-logos/msbuild.svg b/server/sonar-web/src/main/webapp/images/scanner-logos/msbuild.svg deleted file mode 100644 index 811245afe89..00000000000 --- a/server/sonar-web/src/main/webapp/images/scanner-logos/msbuild.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/server/sonar-web/src/main/webapp/images/scanner-logos/sonarqube.svg b/server/sonar-web/src/main/webapp/images/scanner-logos/sonarqube.svg deleted file mode 100644 index ad6cebddc28..00000000000 --- a/server/sonar-web/src/main/webapp/images/scanner-logos/sonarqube.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/server/sonar-web/src/main/webapp/images/select2.png b/server/sonar-web/src/main/webapp/images/select2.png deleted file mode 100755 index 1d804ffb996..00000000000 Binary files a/server/sonar-web/src/main/webapp/images/select2.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/images/select2x2.png b/server/sonar-web/src/main/webapp/images/select2x2.png deleted file mode 100755 index 4bdd5c961d4..00000000000 Binary files a/server/sonar-web/src/main/webapp/images/select2x2.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/mstile-512x512.png b/server/sonar-web/src/main/webapp/mstile-512x512.png deleted file mode 100644 index b644063292d..00000000000 Binary files a/server/sonar-web/src/main/webapp/mstile-512x512.png and /dev/null differ diff --git a/server/sonar-web/src/main/webapp/robots.txt b/server/sonar-web/src/main/webapp/robots.txt deleted file mode 100644 index 06fde6d0680..00000000000 --- a/server/sonar-web/src/main/webapp/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# We don't want robots to click all Sonar links -User-agent: * -Disallow: / \ No newline at end of file diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index aad5006205f..f737e0dd07c 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -9,7 +9,6 @@ configurations { jsw scanner server - webapp jdbc_mssql { transitive = false } @@ -40,7 +39,6 @@ dependencies { jsw 'tanukisoft:wrapper:3.2.3' scanner project(path: ':sonar-scanner-engine-shaded', configuration: 'shadow') server project(':server:sonar-server') - webapp project(path: ':server:sonar-web', configuration: 'archives') jdbc_h2 'com.h2database:h2' jdbc_mssql 'com.microsoft.sqlserver:mssql-jdbc' @@ -103,11 +101,8 @@ task zip(type: Zip) { into("${archiveDir}/lib/common/") { from configurations.ce + configurations.server + configurations.compile } - dependsOn configurations.webapp into("${archiveDir}/web/") { - from { - configurations.webapp.files.collect { zipTree(it) } - } + from tasks.getByPath(':server:sonar-web:yarn_run').outputs } into("${archiveDir}/lib/jdbc/mssql/") { from configurations.jdbc_mssql