Merge branch '5.0-jdk11'

# Conflicts:
#	README.md
#	site/src/pages/configuration.vue
#	site/src/pages/getting-started.vue
#	site/src/pages/index.vue
#	site/yarn.lock
#	sonar-project.properties

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ Actual results: ...
 - OS: [e.g. Ubuntu 18.04.1, Windows 10 Pro, Mac OS X]
 - JDK: [e.g. Oracle JDK 11 64 bits]
 - Gradle: [e.g. Gradle 6.6]
-- Frontend Gradle plugin: [e.g. 4.0.1]
+- Frontend Gradle plugin: [e.g. 5.0.0 JDK 11]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

.github/workflows/gradle.yml

@@ -0,0 +1,85 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ 'master', '*.*-jdk*', 'fix/*', 'feature/*', 'task/*' ]
+  pull_request:
+    branches: [ 'master', '*.*-jdk*' ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build plugin
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-latest, windows-2019]
+
+    steps:
+      - name: Init Ubuntu environment
+        if: matrix.os == 'ubuntu-20.04'
+        run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/npx /usr/bin/yarn
+
+      - name: Init MacOS environment
+        if: matrix.os == 'macos-latest'
+        run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/npx /usr/bin/yarn /Users/runner/.yarn/bin/yarn
+
+      - name: Init Windows environment
+        if: matrix.os == 'windows-2019'
+        run: rm -r -fo "C:\Program Files\nodejs" && rm -r -fo "C:\npm"
+
+      - name: Git checkout for source code analysis
+        uses: actions/checkout@v2
+        if: matrix.os == 'ubuntu-20.04'
+        with:
+          fetch-depth: 0
+
+      - name: Git checkout
+        uses: actions/checkout@v2
+        if: matrix.os != 'ubuntu-20.04'
+        with:
+          fetch-depth: 1
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+          java-package: jdk
+          architecture: x64
+
+      - name: Cache Gradle's cache and wrapper
+        uses: actions/cache@v2.1.3
+        with:
+          path: |
+            - ~/.gradle/caches/
+            - ~/.gradle/wrapper/
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+
+      - name: Cache Sonar's cache
+        uses: actions/cache@v2.1.3
+        if: matrix.os == 'ubuntu-20.04'
+        with:
+          path: |
+            - ~/.sonar/cache/
+          key: ${{ runner.os }}-sonar-${{ hashFiles('**/*.gradle*') }}
+
+      - name: Grant executable permission
+        run: chmod +x gradlew src/intTest/resources/*/bin/*
+
+      - name: Build plugin with test coverage
+        if: matrix.os == 'ubuntu-20.04'
+        run: ./gradlew build jacocoTestReport --console=plain
+
+      - name: Build plugin
+        if: matrix.os != 'ubuntu-20.04'
+        run: ./gradlew :build --console=plain
+
+      - name: Scan source code and test results
+        uses: SonarSource/sonarcloud-github-action@v1.4
+        if: matrix.os == 'ubuntu-20.04'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -3,6 +3,7 @@
 /out/
 /site/dist/
 /site/node_modules/
+/site/.yarn/
 .idea/
 .gradle/
 build/

README.md

@@ -1,6 +1,6 @@
 <h2 align="center">Frontend Gradle plugin - Integrated <a href="https://nodejs.org/" title="Node.js">Node.js</a>, <a href="https://www.npmjs.com/" title="npm">npm</a>, <a href="https://yarnpkg.com/" title="Yarn">Yarn</a> builds</h2> 
 <p align="center">
-    <a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v4.0.1"><img src="https://img.shields.io/badge/Latest%20release-4.0.1-blue.svg" alt="Latest release 4.0.1"/></a>
+    <a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v5.0.0"><img src="https://img.shields.io/badge/Latest%20release-5.0.0-blue.svg" alt="Latest release 5.0.0"/></a>
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-green.svg" alt="License Apache 2.0"/></a>
     <br/>
     <a href="https://travis-ci.com/siouan/frontend-gradle-plugin"><img src="https://travis-ci.com/siouan/frontend-gradle-plugin.svg?branch=master" alt="Build status"/></a>
@@ -53,7 +53,8 @@ With their feedback, plugin improvement is possible. Special thanks to:
 @[nitzan-n](https://github.com/nitzan-n),
 @[nuth](https://github.com/nuth),
 @[rolaca11](https://github.com/rolaca11),
-@[TapaiBalazs](https://github.com/TapaiBalazs)
+@[stephanebastian](https://github.com/stephanebastian),
+@[TapaiBalazs](https://github.com/TapaiBalazs),
 @[trohr](https://github.com/trohr)
 
 [contributing]: <CONTRIBUTING.md> (Contributing to this project)

build.gradle.kts

@@ -32,36 +32,67 @@ java {
     withSourcesJar()
 }
 
+sourceSets {
+    create("intTest") {
+        compileClasspath += sourceSets.main.get().output + sourceSets.test.get().output
+        runtimeClasspath += sourceSets.main.get().output + sourceSets.test.get().output
+    }
+}
+
+val intTestImplementation: Configuration by configurations.getting {
+    extendsFrom(configurations.implementation.get())
+    extendsFrom(configurations.testImplementation.get())
+}
+
+configurations["intTestRuntimeOnly"]
+    .extendsFrom(configurations.runtimeOnly.get())
+    .extendsFrom(configurations.testRuntimeOnly.get())
+
 dependencies {
     implementation(gradleApi())
-    implementation("org.apache.httpcomponents:httpclient:4.5.13")
+    implementation("org.apache.httpcomponents.client5:httpclient5:5.0.3")
     implementation("org.apache.commons:commons-compress:1.20")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.0")
     testImplementation("org.mockito:mockito-core:3.6.0")
     testImplementation("org.mockito:mockito-junit-jupiter:3.6.0")
     testImplementation("org.assertj:assertj-core:3.18.0")
-    testImplementation("com.github.tomakehurst:wiremock:2.27.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+
+    intTestImplementation("com.github.tomakehurst:wiremock:2.27.2")
 }
 
 tasks.named<Wrapper>("wrapper") {
     distributionType = Wrapper.DistributionType.ALL
 }
 
-tasks.named<Test>("test") {
+tasks.register<Test>("integrationTest") {
+    description = "Runs integration tests."
+    group = "verification"
+    testClassesDirs = sourceSets["intTest"].output.classesDirs
+    classpath = sourceSets["intTest"].runtimeClasspath
+    shouldRunAfter("test")
+}
+
+tasks.withType<Test> {
     useJUnitPlatform()
-    gradle.addListener(GradleTestListener(logger))
+}
+
+tasks.named<Task>("check") {
+    dependsOn(tasks.named("integrationTest"))
 }
 
 tasks.named<JacocoReport>("jacocoTestReport") {
+    executionData.setFrom(file("${project.buildDir}/jacoco/test.exec"), file("${project.buildDir}/jacoco/integrationTest.exec"))
     reports {
-        xml.setEnabled(true)
-        xml.setDestination(file("${buildDir}/reports/jacoco/report.xml"))
+        xml.isEnabled = true
+        xml.destination = file("${buildDir}/reports/jacoco/report.xml")
     }
 }
 
+gradle.addListener(GradleTestListener(logger))
+
 gradlePlugin {
     plugins {
         create("frontendPlugin") {

docs/200.html

@@ -1,9 +1,9 @@
 <!doctype html>
 <html>
   <head>
-    <meta data-n-head="1" charset="utf-8"><meta data-n-head="1" http-equiv="X-UA-Compatible" content="IE=edge"><meta data-n-head="1" http-equiv="content-type" content="text/html"><meta data-n-head="1" http-equiv="Cache-Control" content="no-cache,no-store,must-revalidate"><meta data-n-head="1" http-equiv="Pragma" content="no-cache"><meta data-n-head="1" http-equiv="Expires" content="-1"><meta data-n-head="1" name="viewport" content="width=device-width,initial-scale=1"><meta data-n-head="1" name="robots" content="index,follow"><meta data-n-head="1" name="og:locale" content="en_US"><meta data-n-head="1" name="og:type" content="website"><meta data-n-head="1" name="og:url" content=""><meta data-n-head="1" name="og:site_name" content=""><meta data-n-head="1" name="google" content="nositelinkssearchbox"><link data-n-head="1" rel="icon" type="image/x-icon" href="siouan-icon.png"><base href="/frontend-gradle-plugin/"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/4632c90.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/ccc9a0f.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/3399320.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/c31c0b4.js" as="script">
+    <meta data-n-head="1" charset="utf-8"><meta data-n-head="1" http-equiv="X-UA-Compatible" content="IE=edge"><meta data-n-head="1" http-equiv="content-type" content="text/html"><meta data-n-head="1" http-equiv="Cache-Control" content="no-cache,no-store,must-revalidate"><meta data-n-head="1" http-equiv="Pragma" content="no-cache"><meta data-n-head="1" http-equiv="Expires" content="-1"><meta data-n-head="1" name="viewport" content="width=device-width,initial-scale=1"><meta data-n-head="1" name="robots" content="index,follow"><meta data-n-head="1" name="og:locale" content="en_US"><meta data-n-head="1" name="og:type" content="website"><meta data-n-head="1" name="og:url" content=""><meta data-n-head="1" name="og:site_name" content=""><meta data-n-head="1" name="google" content="nositelinkssearchbox"><link data-n-head="1" rel="icon" type="image/x-icon" href="siouan-icon.png"><base href="/frontend-gradle-plugin/"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/bf04268.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/06e4957.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/5af5ec9.js" as="script"><link rel="preload" href="/frontend-gradle-plugin/_nuxt/d0845ff.js" as="script">
   </head>
   <body>
-    <div id="__nuxt"><style>#nuxt-loading{background:#fff;visibility:hidden;opacity:0;position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;flex-direction:column;animation:nuxtLoadingIn 10s ease;-webkit-animation:nuxtLoadingIn 10s ease;animation-fill-mode:forwards;overflow:hidden}@keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}@-webkit-keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}#nuxt-loading>div,#nuxt-loading>div:after{border-radius:50%;width:5rem;height:5rem}#nuxt-loading>div{font-size:10px;position:relative;text-indent:-9999em;border:.5rem solid #f5f5f5;border-left:.5rem solid #000;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:nuxtLoading 1.1s infinite linear;animation:nuxtLoading 1.1s infinite linear}#nuxt-loading.error>div{border-left:.5rem solid #ff4500;animation-duration:5s}@-webkit-keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}</style><script>window.addEventListener("error",function(){var e=document.getElementById("nuxt-loading");e&&(e.className+=" error")})</script><div id="nuxt-loading" aria-live="polite" role="status"><div>Loading...</div></div></div><script>window.__NUXT__={config:{},staticAssetsBase:"/_nuxt/static/1604238702"}</script>
-  <script src="/frontend-gradle-plugin/_nuxt/4632c90.js"></script><script src="/frontend-gradle-plugin/_nuxt/ccc9a0f.js"></script><script src="/frontend-gradle-plugin/_nuxt/3399320.js"></script><script src="/frontend-gradle-plugin/_nuxt/c31c0b4.js"></script></body>
+    <div id="__nuxt"><style>#nuxt-loading{background:#fff;visibility:hidden;opacity:0;position:absolute;left:0;right:0;top:0;bottom:0;display:flex;justify-content:center;align-items:center;flex-direction:column;animation:nuxtLoadingIn 10s ease;-webkit-animation:nuxtLoadingIn 10s ease;animation-fill-mode:forwards;overflow:hidden}@keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}@-webkit-keyframes nuxtLoadingIn{0%{visibility:hidden;opacity:0}20%{visibility:visible;opacity:0}100%{visibility:visible;opacity:1}}#nuxt-loading>div,#nuxt-loading>div:after{border-radius:50%;width:5rem;height:5rem}#nuxt-loading>div{font-size:10px;position:relative;text-indent:-9999em;border:.5rem solid #f5f5f5;border-left:.5rem solid #000;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:nuxtLoading 1.1s infinite linear;animation:nuxtLoading 1.1s infinite linear}#nuxt-loading.error>div{border-left:.5rem solid #ff4500;animation-duration:5s}@-webkit-keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes nuxtLoading{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}</style><script>window.addEventListener("error",function(){var e=document.getElementById("nuxt-loading");e&&(e.className+=" error")})</script><div id="nuxt-loading" aria-live="polite" role="status"><div>Loading...</div></div></div><script>window.__NUXT__={config:{},staticAssetsBase:"/frontend-gradle-plugin/_nuxt/static/1610723749"}</script>
+  <script src="/frontend-gradle-plugin/_nuxt/bf04268.js"></script><script src="/frontend-gradle-plugin/_nuxt/06e4957.js"></script><script src="/frontend-gradle-plugin/_nuxt/5af5ec9.js"></script><script src="/frontend-gradle-plugin/_nuxt/d0845ff.js"></script></body>
 </html>