Merge pull request #84 from FrogDevelopment/develop

Merge develop on master

Author: FrogDevelopper

.github/workflows/build.yml

@@ -13,30 +13,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout with all branches and tags
+      - name: Checkout
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
 
-      - name: Setup Java 15
+      - name: Setup Java 11
         uses: joschi/setup-jdk@v2
         with:
-          java-version: '15'
+          java-version: '11'
 
       - name: Compile
         run: ./gradlew classes
 
       - name: Test
         run: ./gradlew test
-
-      - name: Publish
-        run: ./gradlew publish
-        env:
-          USERNAME: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Analyse
-        if: github.ref == 'refs/heads/master'
-        run: ./gradlew version sonarqube -Dsonar.login=${{ secrets.SONAR_LOGIN }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yml

@@ -0,0 +1,32 @@
+name: SonarQube
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Java 11
+        uses: joschi/setup-jdk@v2
+        with:
+          java-version: '11'
+
+      - name: Compile
+        run: ./gradlew classes
+
+      - name: Test
+        run: ./gradlew test
+
+      - name: Analyse
+        if: github.ref == 'refs/heads/master'
+        run: ./gradlew version sonarqube -Dsonar.login=${{ secrets.SONAR_LOGIN }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -0,0 +1,113 @@
+plugins {
+    jacoco
+    `java-library`
+    `maven-publish`
+    id ("org.sonarqube") version "3.3"
+    id("io.freefair.lombok") version "6.2.0"
+}
+
+group = "com.frog-development"
+
+configure<JavaPluginExtension> {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+
+    api("io.jsonwebtoken:jjwt:0.9.1")
+
+    implementation("org.springframework.boot:spring-boot-starter-security:2.5.6")
+    implementation("org.springframework.boot:spring-boot-actuator-autoconfigure:2.5.6")
+    implementation("ch.qos.logback:logback-classic:1.2.6")
+    implementation("javax.servlet:javax.servlet-api:4.0.1")
+    implementation("javax.xml.bind:jaxb-api:2.3.1")
+
+    compileOnly("org.jetbrains:annotations:23.0.0")
+    compileOnly("org.springframework.security:spring-security-test:5.5.3")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test:2.5.6")
+    testImplementation("org.springframework.security:spring-security-test:5.5.3")
+    testImplementation("org.junit.platform:junit-platform-runner:1.8.1")
+}
+
+tasks.named<Test>("test") {
+    reports.html.required.set(false)
+
+    useJUnitPlatform {
+        includeTags("unitTest")
+        excludeTags("integrationTest")
+    }
+
+    finalizedBy(tasks.named("jacocoTestReport"))
+}
+
+tasks.named<JacocoReport>("jacocoTestReport") {
+    dependsOn(tasks.named("test"))
+    reports {
+        xml.required.set(true)
+//        xml.destination file("${buildDir}/reports/jacoco/test.xml")
+        csv.required.set(false)
+        html.required.set(false)
+    }
+}
+
+//tasks.named<JacocoCoverageVerification>("jacocoTestCoverageVerification") {
+//    violationRules {
+//        rule {
+//            limit {
+//                minimum = "0.9".toBigDecimal()
+//            }
+//        }
+//    }
+//}
+
+sonarqube {
+    properties {
+//        property ("sonar.coverage.jacoco.xmlReportPaths", "${buildDir}/reports/jacoco/test.xml")
+        property ("sonar.projectKey", "FrogDevelopment_authorization-jwt-module")
+        property ("sonar.organization", "frogdevelopment")
+        property ("sonar.host.url", "https://sonarcloud.io")
+    }
+}
+
+project.tasks["sonarqube"].dependsOn("jacocoTestReport")
+
+java {
+    withSourcesJar()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJava") {
+            from(components["java"])
+
+            pom {
+                name.set("Authorisation JWT")
+                description.set("Handle Spring Security with JWT")
+                licenses {
+                    license {
+                        name.set("The Apache License, Version 2.0")
+                        url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                    }
+                }
+                developers {
+                    developer {
+                        id.set("legall.benoit")
+                        name.set("Benoît Le Gall")
+                        email.set("legall.benoit@gmail.com")
+                    }
+                }
+            }
+        }
+    }
+}
+
+tasks.wrapper {
+    gradleVersion = "7.2"
+    distributionType = Wrapper.DistributionType.ALL
+}

build.gradle.kts

@@ -0,0 +1,5 @@
+before_install:
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+  - sdk update
+  - sdk install java 11.0.11.hs-adpt
+  - sdk use java 11.0.11.hs-adpt

jitpack.yml

@@ -1,4 +1,3 @@
 # This file is generated by the 'io.freefair.lombok' Gradle plugin
 config.stopBubbling = true
 lombok.addLombokGeneratedAnnotation = true
-lombok.extern.findbugs.addSuppressFBWarnings = true