Skip to content

Commit

Permalink
chore(deps): update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Feb 22, 2024
1 parent 38fa191 commit 515d536
Show file tree
Hide file tree
Showing 12 changed files with 101 additions and 81 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Verify Changed files in docs
uses: tj-actions/verify-changed-files@v8.1
uses: tj-actions/verify-changed-files@v13.1
id: verify-changed-files
with:
files: |
Expand All @@ -50,10 +50,10 @@ jobs:
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
with:
limit-access-to-actor: true
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- name: install-java8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand All @@ -80,21 +80,21 @@ jobs:
run: |
./gradlew --no-daemon jacocoTestReport
- name: Upload Test Report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always() # always run even if the previous step fails
with:
name: junit-test-results
path: '**/build/test-results/test/TEST-*.xml'
retention-days: 1
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v4
with:
#files: ./coverage1.xml,./coverage2.xml # optional
flags: ${{ runner.os }} # optional
name: ${{ runner.os }}-tests # optional
verbose: true # optional (default = false)
- name: build-choco-package
if: runner.os == 'Windows'
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '2.2.204' # SDK Version to use.
- name: build-choco
Expand All @@ -103,13 +103,13 @@ jobs:
powershell
choco pack build/choco/jbang.nuspec
- name: Archive build results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ runner.os }}-build-${{ github.sha }}
path: build
- name: Upload jbang.zip
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always() && runner.os != 'Windows'
with:
name: jbang-${{ github.sha }}
Expand All @@ -125,11 +125,11 @@ jobs:
java: [8,11,17,19]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: ${{ runner.os }}-build-${{ github.sha }}
path: build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/install-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Remove Java
run: |
sudo rm -rf /Library/Java/*
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
JRELEASER_NEXUS2_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
JRELEASER_VERSION: 1.9.0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: install-java11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand All @@ -50,7 +50,7 @@ jobs:
setup-java: false
- name: JReleaser publish output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jreleaser-publish
path: |
Expand All @@ -73,14 +73,14 @@ jobs:
setup-java: false
- name: JReleaser announce output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jreleaser-announce
path: |
out/jreleaser/trace.log
out/jreleaser/output.properties
- name: upload-choco
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-choco
path: build/choco
Expand All @@ -90,11 +90,11 @@ jobs:
name: publish-choco
continue-on-error: true
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-choco
path: build/choco
- uses: actions/setup-dotnet@v1
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '2.2.204' # SDK Version to use.
- name: choco-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
workflow: ${{ github.event.workflow.id }}
run_id: ${{ github.event.workflow_run.id }}
- name: Publish Test Report
uses: mikepenz/action-junit-report@v3
uses: mikepenz/action-junit-report@v4
with:
commit: ${{github.event.workflow_run.head_sha}}
report_paths: '**/build/test-results/test/TEST-*.xml'
6 changes: 3 additions & 3 deletions .github/workflows/tag-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
JRELEASER_NEXUS2_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
JRELEASER_VERSION: 1.5.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: install-java11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
setup-java: false
- name: JReleaser output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jreleaser-release
path: |
Expand Down
44 changes: 22 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import org.gradle.crypto.checksum.Checksum

plugins {
id "distribution"
id "com.github.johnrengelman.shadow" version "8.0.0"
id "com.github.johnrengelman.shadow" version "8.1.1"
id "java"
id "com.github.breadmoirai.github-release" version "2.4.1"
id "io.toolebox.git-versioner" version "1.6.5"
id "com.github.breadmoirai.github-release" version "2.5.2"
id "io.toolebox.git-versioner" version "1.6.7"
id 'org.gradle.crypto.checksum' version '1.4.0'
id "com.diffplug.spotless" version "6.13.0" // can't go higher to still work with Java 8
id 'com.github.gmazzo.buildconfig' version "3.1.0"
id "com.diffplug.spotless" version "6.25.0" // can't go higher to still work with Java 8
id 'com.github.gmazzo.buildconfig' version "5.3.5"
id "com.dorongold.task-tree" version "2.1.1"
id "com.geoffgranum.gradle-conventional-changelog" version "0.3.1"
id "org.asciidoctor.jvm.convert" version "3.3.2"
id "org.ajoberstar.grgit" version "4.1.1"
id "org.sonarqube" version "4.0.0.2929"
id "org.asciidoctor.jvm.convert" version "4.0.2"
id "org.ajoberstar.grgit" version "5.2.2"
id "org.sonarqube" version "4.4.1.3373"
id 'jacoco'
id 'maven-publish'
}
Expand Down Expand Up @@ -90,27 +90,27 @@ dependencies {
implementation 'com.offbytwo:docopt:0.6.0.20150202'

implementation 'org.apache.commons:commons-text:1.11.0'
implementation 'org.apache.commons:commons-compress:1.25.0'
implementation 'info.picocli:picocli:4.6.3'
implementation 'io.quarkus.qute:qute-core:1.12.2.Final'
implementation 'org.apache.commons:commons-compress:1.26.0'
implementation 'info.picocli:picocli:4.7.5'
implementation 'io.quarkus.qute:qute-core:3.8.0'
implementation 'kr.motd.maven:os-maven-plugin:1.7.1'
implementation 'org.codehaus.plexus:plexus-java:1.2.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'org.jsoup:jsoup:1.17.1'
implementation 'org.jsoup:jsoup:1.17.2'
implementation 'org.codejive:java-properties:0.0.7'

implementation "org.slf4j:slf4j-nop:1.7.30"
implementation "org.slf4j:jcl-over-slf4j:1.7.30"
implementation "org.jboss:jandex:2.2.3.Final"
implementation "org.slf4j:slf4j-nop:2.0.12"
implementation "org.slf4j:jcl-over-slf4j:2.0.12"
implementation "org.jboss:jandex:3.1.6"

implementation "eu.maveniverse.maven.mima:context:2.4.4"
runtimeOnly "eu.maveniverse.maven.mima.runtime:standalone-static:2.4.4"
implementation "eu.maveniverse.maven.mima:context:2.4.8"
runtimeOnly "eu.maveniverse.maven.mima.runtime:standalone-static:2.4.8"

testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.1"
testImplementation "org.junit.jupiter:junit-jupiter:5.10.1"
testImplementation "com.github.stefanbirkner:system-rules:1.17.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
testImplementation "org.junit.jupiter:junit-jupiter:5.10.2"
testImplementation "com.github.stefanbirkner:system-rules:1.19.0"
testImplementation "org.hamcrest:hamcrest-library:2.2"
testImplementation "com.github.tomakehurst:wiremock-jre8:2.32.0"
testImplementation "com.github.tomakehurst:wiremock-jre8:3.0.1"

//testImplementation 'com.github.maxandersen.karate:karate-junit:19e06766'
//testImplementation 'com.github.maxandersen.karate:karate-apache:19e06766'
Expand Down Expand Up @@ -257,7 +257,7 @@ test {
}

jacoco {
toolVersion = '0.8.7'
toolVersion = '0.8.11'
}

jacocoTestReport {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 28 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
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.
Expand Down
Loading

0 comments on commit 515d536

Please sign in to comment.