Merge pull request #42 from FrogDevelopment/feature/token_string

Feature/token string

Author: FrogDevelopper

.github/workflows/build.yml

@@ -13,18 +13,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - name: Prepare repository
-        run: git checkout "${GITHUB_REF:11}"
-      - name: Setup Java environment based on AdoptOpenJDK
-        uses: joschi/[email protected]
+      - uses: actions/checkout@v2
+
+      - name: Setup Java 14
+        uses: joschi/setup-jdk@v2
         with:
-          java-version: openjdk11
-          openjdk_impl: openj9
+          java-version: '14'
+
       - name: Compile
         run: ./gradlew classes
+
       - name: Test
         run: ./gradlew test
+
       - name: Analyse
         if: github.ref == 'refs/heads/master'
         run: ./gradlew sonarqube -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Djgitver.branch=${GITHUB_REF:11}

.gitignore

@@ -6,22 +6,22 @@ plugins {
     id 'io.freefair.lombok' version '5.3.0'
     id 'fr.brouillard.oss.gradle.jgitver' version '0.9.1'
     id 'org.springframework.boot' version '2.3.5.RELEASE'
-    id 'io.spring.dependency-management' version "1.0.10.RELEASE"
+    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 }
 
 group = 'com.frog-development'
 description = 'authorization-jwt-module'
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = JavaVersion.VERSION_14
+targetCompatibility = JavaVersion.VERSION_14
 
 repositories {
     jcenter()
 }
 
 dependencyManagement {
     imports {
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR8"
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR9'
     }
 }
 
@@ -74,14 +74,14 @@ jacocoTestReport {
 
 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"
+        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"
+project.tasks['sonarqube'].dependsOn 'jacocoTestReport'
 
 task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
@@ -118,6 +118,6 @@ jar {
 }
 
 wrapper {
-    gradleVersion = "6.6.1"
+    gradleVersion = '6.7'
     distributionType = Wrapper.DistributionType.ALL
 }

LICENSE

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

README.md

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

build.gradle

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell