chore: Bump version - dependencies updates

gregoranders · gregoranders · commit 2dace4546832 · 2022-08-28T19:14:08.000+02:00
Signed-off-by: Gregor Anders &lt;gregor.anders@gmail.com&gt;
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
@@ -34,13 +34,13 @@ jobs:
       - name: Echo JAVA version
         run: java --version
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,13 +34,13 @@ jobs:
       - name: Echo JAVA version
         run: java --version
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -111,7 +111,7 @@ jobs:
           name: gh-pages
           path: gh-pages-artifact
       - name: Get cached gems
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: gh-pages-artifact
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,13 +34,13 @@ jobs:
       - name: Echo JAVA version
         run: java --version
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v3.0.8
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### Following the principle of *convention over configuration* this Gradle plugin provides default configurations for various plugins of a Gradle JVM project so that you do not need to copy boilerplate code throughout your projects.
 
-#### Compiled using JAVA 17 with 1.8 as target and Gradle 7.5
+#### Compiled using JAVA 17 with 1.8 as target and Gradle 7.5.1
 
 [![Release][release-image]][release-url]
 
@@ -35,7 +35,7 @@
 ### Using the plugins DSL
 ```groovy
 plugins {
-  id "io.github.gregoranders.project-configuration" version "0.0.8"
+  id "io.github.gregoranders.project-configuration" version "0.0.7"
 }
 ```
 
@@ -48,7 +48,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "io.github.gregoranders:project-configuration:0.0.8"
+    classpath "io.github.gregoranders:project-configuration:0.0.7"
   }
 }
 
diff --git a/SECURITY.md b/SECURITY.md
@@ -4,7 +4,7 @@
 
 | Version | Supported           |
 |---------|---------------------|
-| 0.0.8   | :white_check_mark:  |
+| 0.0.7   | :white_check_mark:  |
 
 ## Reporting a Vulnerability
 
diff --git a/build.gradle b/build.gradle
@@ -11,9 +11,9 @@ plugins {
   id 'signing'
   id 'project-report'
   id 'build-dashboard'
-  id 'com.gradle.plugin-publish' version '1.0.0'
-  id 'com.github.spotbugs' version '5.0.9'
-  id 'org.owasp.dependencycheck' version '7.1.1'
+  id 'com.gradle.plugin-publish' version '0.21.0'
+  id 'com.github.spotbugs' version '5.0.10'
+  id 'org.owasp.dependencycheck' version '7.1.2'
   id 'org.sonarqube' version '3.4.0.2513'
 }
 
@@ -246,7 +246,7 @@ gradlePlugin {
     projectConfigurationPlugin {
       id = 'io.github.gregoranders.project-configuration'
       implementationClass = 'io.github.gregoranders.gradle.project.ProjectConfigurationPlugin'
-      displayName = project.property('pluginDisplayName')
+//      displayName = project.property('pluginDisplayName')
     }
   }
 }
@@ -257,9 +257,16 @@ pluginBundle {
 
   description = project.property('pluginDescription')
 
-  pluginTags = [
-    projectConfigurationPlugin: ['project', 'configuration', 'java', 'checkstyle', 'pmd', 'spotbugs', 'jacoco', 'dependencycheck']
-  ]
+  plugins {
+    projectConfigurationPlugin {
+      //noinspection GroovyAssignabilityCheck
+      displayName = project.property('pluginDisplayName')
+      tags = ['project', 'configuration', 'java', 'checkstyle', 'pmd', 'spotbugs', 'jacoco', 'dependencycheck']
+    }
+  }
+//  pluginTags = [
+//    projectConfigurationPlugin: ['project', 'configuration', 'java', 'checkstyle', 'pmd', 'spotbugs', 'jacoco', 'dependencycheck']
+//  ]
 }
 
 test {
diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ description=Gradle JAVA Project Configuration Plugin
 pluginDisplayName=JAVA Project Configuration
 pluginDescription=Following the principle of convention over configuration this Gradle plugin provides default configurations for various plugins of a Gradle JVM project so that you do not need to copy boilerplate code throughout your projects.
 
-version=0.0.8
+version=0.0.7
 
 url=https://github.com/gregoranders/gradle-project-configuration
 ghpUrl=https://maven.pkg.github.com/gregoranders/gradle-project-configuration
@@ -55,7 +55,7 @@ spockReportsVersion=2.1.1-groovy-3.0
 checkstyleVersion=10.3.2
 pmdVersion=6.48.0
 jacocoVersion=0.8.8
-dependencyCheckVersion=7.1.1
+dependencyCheckVersion=7.1.2
 spotbugsVersion=4.7.1
 spotbugsAnnotationsVersion=4.7.1
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
-distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -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 execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/src/test/groovy/io/github/gregoranders/gradle/project/configuration/ProjectConfigurationPluginSpec.groovy b/src/test/groovy/io/github/gregoranders/gradle/project/configuration/ProjectConfigurationPluginSpec.groovy
@@ -209,7 +209,7 @@ class ProjectConfigurationPluginSpec extends Specification {
         then: 'a exception is thrown'
             UnexpectedBuildFailure exception = thrown()
         and: ''
-            exception.getMessage().contains('Copy/Paste analysis')
+            exception.getMessage().contains('Copy/Paste analysis found 6')
     }
 
     def getGradleJVMArgs() {
diff --git a/src/test/resources/simple-project-with-duplications/build.gradle b/src/test/resources/simple-project-with-duplications/build.gradle
@@ -12,8 +12,8 @@ plugins {
   id 'signing'
   id 'project-report'
   id 'build-dashboard'
-//  id 'com.github.spotbugs' version '5.0.9'
-  id 'org.owasp.dependencycheck' version '7.1.1'
+  id 'com.github.spotbugs' version '5.0.10'
+  id 'org.owasp.dependencycheck' version '7.1.2'
   id 'org.sonarqube' version '3.4.0.2513'
   id 'io.github.gregoranders.project-configuration'
 }
diff --git a/src/test/resources/simple-project-with-duplications/gradle.properties b/src/test/resources/simple-project-with-duplications/gradle.properties
@@ -44,7 +44,7 @@ spockVersion=2.2-M1-groovy-3.0
 checkstyleVersion=10.3.2
 pmdVersion=6.48.0
 jacocoVersion=0.8.8
-dependencyCheckVersion=7.1.1
+dependencyCheckVersion=7.1.2
 spotbugsVersion=4.7.1
 spotbugsAnnotationsVersion=4.7.1
 
diff --git a/src/test/resources/simple-project/build.gradle b/src/test/resources/simple-project/build.gradle
@@ -12,8 +12,8 @@ plugins {
   id 'signing'
   id 'project-report'
   id 'build-dashboard'
-  id 'com.github.spotbugs' version '5.0.9'
-  id 'org.owasp.dependencycheck' version '7.1.1'
+  id 'com.github.spotbugs' version '5.0.10'
+  id 'org.owasp.dependencycheck' version '7.1.2'
   id 'org.sonarqube' version '3.4.0.2513'
   id 'io.github.gregoranders.project-configuration'
 }
diff --git a/src/test/resources/simple-project/gradle.properties b/src/test/resources/simple-project/gradle.properties
@@ -44,7 +44,7 @@ spockVersion=2.2-M1-groovy-3.0
 checkstyleVersion=10.3.2
 pmdVersion=6.48.0
 jacocoVersion=0.8.8
-dependencyCheckVersion=7.1.1
+dependencyCheckVersion=7.1.2
 spotbugsVersion=4.7.1
 spotbugsAnnotationsVersion=4.7.1
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`### Following the principle of convention over configuration this Gradle plugin provides default configurations for various plugins of a Gradle JVM project so that you do not need to copy boilerplate code throughout your projects.`
`4`	`4`
`5`		`-#### Compiled using JAVA 17 with 1.8 as target and Gradle 7.5`
	`5`	`+#### Compiled using JAVA 17 with 1.8 as target and Gradle 7.5.1`
`6`	`6`
`7`	`7`	`[![Release][release-image]][release-url]`
`8`	`8`
`@@ -35,7 +35,7 @@`
`35`	`35`	`### Using the plugins DSL`
`36`	`36`	```groovy
`37`	`37`	`plugins {`
`38`		`- id "io.github.gregoranders.project-configuration" version "0.0.8"`
	`38`	`+ id "io.github.gregoranders.project-configuration" version "0.0.7"`
`39`	`39`	`}`
`40`	`40`	```
`41`	`41`
`@@ -48,7 +48,7 @@ buildscript {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`dependencies {`
`51`		`- classpath "io.github.gregoranders:project-configuration:0.0.8"`
	`51`	`+ classpath "io.github.gregoranders:project-configuration:0.0.7"`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`