diff --git a/.github/workflows/determine-release-type.yml b/.github/workflows/determine-release-type.yml index 0e5f534..5615189 100644 --- a/.github/workflows/determine-release-type.yml +++ b/.github/workflows/determine-release-type.yml @@ -15,7 +15,7 @@ jobs: release_type: ${{ steps.get-type.outputs.release_type }} steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index 3bf8d7d..7a03d45 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -55,13 +55,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 diff --git a/.github/workflows/sedr-library-build.yml b/.github/workflows/sedr-library-build.yml index 234a651..a70c998 100644 --- a/.github/workflows/sedr-library-build.yml +++ b/.github/workflows/sedr-library-build.yml @@ -37,13 +37,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 diff --git a/.github/workflows/sedr-library-release.yml b/.github/workflows/sedr-library-release.yml index bd1a844..b3d8f8b 100644 --- a/.github/workflows/sedr-library-release.yml +++ b/.github/workflows/sedr-library-release.yml @@ -61,13 +61,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 @@ -138,13 +138,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 @@ -196,7 +196,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 ref: main diff --git a/.github/workflows/semantic-version-apply.yml b/.github/workflows/semantic-version-apply.yml index 080dd34..7150ec5 100644 --- a/.github/workflows/semantic-version-apply.yml +++ b/.github/workflows/semantic-version-apply.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 ref: ${{ github.ref_name }} diff --git a/.github/workflows/semantic-version-calculate.yml b/.github/workflows/semantic-version-calculate.yml index fefdc84..8f46648 100644 --- a/.github/workflows/semantic-version-calculate.yml +++ b/.github/workflows/semantic-version-calculate.yml @@ -38,7 +38,7 @@ jobs: next_version: ${{ steps.calculate_semantic_version.outputs.next_version }} steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 ref: ${{ github.ref_name }} diff --git a/.github/workflows/spring-rules-build.yml b/.github/workflows/spring-rules-build.yml index 7c3fd98..dc3a591 100644 --- a/.github/workflows/spring-rules-build.yml +++ b/.github/workflows/spring-rules-build.yml @@ -40,13 +40,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 diff --git a/.github/workflows/spring-rules-release.yml b/.github/workflows/spring-rules-release.yml index 672ab2a..98b8596 100644 --- a/.github/workflows/spring-rules-release.yml +++ b/.github/workflows/spring-rules-release.yml @@ -50,13 +50,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 @@ -108,13 +108,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 ref: ${{ github.ref_name }} - name: Setup Java - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0 with: distribution: 'temurin' java-version: 21 diff --git a/.github/workflows/spring-rules-security-scan.yml b/.github/workflows/spring-rules-security-scan.yml index d4c49f6..ea3861d 100644 --- a/.github/workflows/spring-rules-security-scan.yml +++ b/.github/workflows/spring-rules-security-scan.yml @@ -12,7 +12,7 @@ jobs: version: ${{ steps.read-version.outputs.version }} steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 1 persist-credentials: false diff --git a/examples/architecture-validator/single-module-spring/gradle/libs.versions.toml b/examples/architecture-validator/single-module-spring/gradle/libs.versions.toml index b382eb3..4228e76 100644 --- a/examples/architecture-validator/single-module-spring/gradle/libs.versions.toml +++ b/examples/architecture-validator/single-module-spring/gradle/libs.versions.toml @@ -7,7 +7,7 @@ architecture-validator-iff = { id = "com.arc-e-tect.architecture-validator", ver [versions] architecture-validator-iff = "0.4.7" -architecture-validator-hexagonal-spring-rules-iff = "0.4.0" +architecture-validator-hexagonal-spring-rules-iff = "0.4.2" spring-context-iff = "7.0.8" [libraries] diff --git a/examples/architecture-validator/single-module-spring/gradle/wrapper/gradle-wrapper.properties b/examples/architecture-validator/single-module-spring/gradle/wrapper/gradle-wrapper.properties index df6a6ad..eb84db6 100644 --- a/examples/architecture-validator/single-module-spring/gradle/wrapper/gradle-wrapper.properties +++ b/examples/architecture-validator/single-module-spring/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/examples/architecture-validator/single-module-spring/versions.properties b/examples/architecture-validator/single-module-spring/versions.properties index afb78dc..a07c552 100644 --- a/examples/architecture-validator/single-module-spring/versions.properties +++ b/examples/architecture-validator/single-module-spring/versions.properties @@ -8,11 +8,3 @@ #### suppress inspection "UnusedProperty" for whole file #### #### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file. - -#### Generated by `./gradlew refreshVersions` version 0.60.6 -#### -#### Don't manually edit or split the comments that start with four hashtags (####), -#### they will be overwritten by refreshVersions. -#### -#### suppress inspection "SpellCheckingInspection" for whole file -#### suppress inspection "UnusedProperty" for whole file diff --git a/examples/sedr-library/jacoco-marker/gradle/libs.versions.toml b/examples/sedr-library/jacoco-marker/gradle/libs.versions.toml index c6c3bd9..8fb1768 100644 --- a/examples/sedr-library/jacoco-marker/gradle/libs.versions.toml +++ b/examples/sedr-library/jacoco-marker/gradle/libs.versions.toml @@ -6,7 +6,7 @@ [versions] -sedr-library = "0.3.4" +sedr-library = "0.4.2" junit-jupiter = "6.1.0" [libraries] @@ -14,3 +14,4 @@ junit-jupiter = "6.1.0" sedr-library = { module = "com.arc-e-tect.sedr.utils:sedr-library", version.ref = "sedr-library" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" } junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } + diff --git a/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.jar b/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.jar index d997cfc..b1b8ef5 100644 Binary files a/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.jar and b/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.properties b/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.properties index 1a70468..eb84db6 100644 --- a/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.properties +++ b/examples/sedr-library/jacoco-marker/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/sedr-library/jacoco-marker/gradlew b/examples/sedr-library/jacoco-marker/gradlew index 739907d..b9bb139 100755 --- a/examples/sedr-library/jacoco-marker/gradlew +++ b/examples/sedr-library/jacoco-marker/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/examples/sedr-library/jacoco-marker/gradlew.bat b/examples/sedr-library/jacoco-marker/gradlew.bat index c4bdd3a..24c62d5 100644 --- a/examples/sedr-library/jacoco-marker/gradlew.bat +++ b/examples/sedr-library/jacoco-marker/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -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! -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 - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/sedr-library/gradle/wrapper/gradle-wrapper.properties b/sedr-library/gradle/wrapper/gradle-wrapper.properties index df6a6ad..eb84db6 100644 --- a/sedr-library/gradle/wrapper/gradle-wrapper.properties +++ b/sedr-library/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/sedr-library/package-lock.json b/sedr-library/package-lock.json index cacd7f9..b5b23bb 100644 --- a/sedr-library/package-lock.json +++ b/sedr-library/package-lock.json @@ -54,9 +54,9 @@ } }, "node_modules/@actions/http-client/node_modules/undici": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.26.0.tgz", - "integrity": "sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", + "integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==", "dev": true, "license": "MIT", "engines": { @@ -5736,9 +5736,9 @@ } }, "node_modules/undici": { - "version": "7.27.2", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.27.2.tgz", - "integrity": "sha512-uZsKNuzQxDMUY6M3pIMvy5tvlGmtq8XJ2oLAkfRKGNu+1VQAIvLy2xIVG5ATZl5wDXl/tddByAWCizRbOme+TA==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", + "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", "dev": true, "license": "MIT", "engines": {