diff --git a/.github/workflows/pull-request-merge-check.yml b/.github/workflows/pull-request-merge-check.yml index 74a06c9e..1755ba29 100644 --- a/.github/workflows/pull-request-merge-check.yml +++ b/.github/workflows/pull-request-merge-check.yml @@ -65,7 +65,7 @@ jobs: java-version: '21' distribution: 'temurin' - name: Build - uses: gradle/gradle-build-action@v3.4.2 + uses: gradle/gradle-build-action@v3.5.0 with: arguments: :hideout-core:testClasses @@ -117,7 +117,7 @@ jobs: distribution: 'temurin' - name: Unit Test - uses: gradle/gradle-build-action@v3.4.2 + uses: gradle/gradle-build-action@v3.5.0 with: arguments: :hideout-core:test @@ -177,7 +177,7 @@ jobs: - name: Run Kover - uses: gradle/gradle-build-action@v3.4.2 + uses: gradle/gradle-build-action@v3.5.0 with: arguments: :hideout-core:koverXmlReport --rerun-tasks @@ -260,7 +260,7 @@ jobs: distribution: 'temurin' - name: Build with Gradle - uses: gradle/gradle-build-action@66535aaf56f831b35e3a8481c9c99b665b84dd45 + uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 with: arguments: :hideout-core:detektMain diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136..2c352119 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- 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-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf13..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e4..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/hideout-activitypub/build.gradle.kts b/hideout-activitypub/build.gradle.kts index 60495c65..36ec82b7 100644 --- a/hideout-activitypub/build.gradle.kts +++ b/hideout-activitypub/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.24" + kotlin("jvm") version "1.9.25" } group = "dev.usbharu" diff --git a/hideout-activitypub/gradle/wrapper/gradle-wrapper.jar b/hideout-activitypub/gradle/wrapper/gradle-wrapper.jar index e6441136..2c352119 100644 Binary files a/hideout-activitypub/gradle/wrapper/gradle-wrapper.jar and b/hideout-activitypub/gradle/wrapper/gradle-wrapper.jar differ diff --git a/hideout-activitypub/gradle/wrapper/gradle-wrapper.properties b/hideout-activitypub/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- a/hideout-activitypub/gradle/wrapper/gradle-wrapper.properties +++ b/hideout-activitypub/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/hideout-activitypub/gradlew b/hideout-activitypub/gradlew index b740cf13..f5feea6d 100644 --- a/hideout-activitypub/gradlew +++ b/hideout-activitypub/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/hideout-activitypub/gradlew.bat b/hideout-activitypub/gradlew.bat index 7101f8e4..9b42019c 100644 --- a/hideout-activitypub/gradlew.bat +++ b/hideout-activitypub/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 1205e8cd..b8b4f97b 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -134,7 +134,7 @@ dependencies { testImplementation(libs.coroutines.test) testImplementation(libs.ktor.client.mock) testImplementation(libs.h2db) - testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") + testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0") testImplementation("org.mockito:mockito-inline:5.2.0") testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1") testImplementation("com.jparams:to-string-verifier:1.4.8") diff --git a/hideout-core/gradle/wrapper/gradle-wrapper.jar b/hideout-core/gradle/wrapper/gradle-wrapper.jar index e6441136..2c352119 100644 Binary files a/hideout-core/gradle/wrapper/gradle-wrapper.jar and b/hideout-core/gradle/wrapper/gradle-wrapper.jar differ diff --git a/hideout-core/gradle/wrapper/gradle-wrapper.properties b/hideout-core/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- a/hideout-core/gradle/wrapper/gradle-wrapper.properties +++ b/hideout-core/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/hideout-core/gradlew b/hideout-core/gradlew index b740cf13..f5feea6d 100644 --- a/hideout-core/gradlew +++ b/hideout-core/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/hideout-core/gradlew.bat b/hideout-core/gradlew.bat index 7101f8e4..9b42019c 100644 --- a/hideout-core/gradlew.bat +++ b/hideout-core/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/hideout-mastodon/gradle/wrapper/gradle-wrapper.jar b/hideout-mastodon/gradle/wrapper/gradle-wrapper.jar index e6441136..2c352119 100644 Binary files a/hideout-mastodon/gradle/wrapper/gradle-wrapper.jar and b/hideout-mastodon/gradle/wrapper/gradle-wrapper.jar differ diff --git a/hideout-mastodon/gradle/wrapper/gradle-wrapper.properties b/hideout-mastodon/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- a/hideout-mastodon/gradle/wrapper/gradle-wrapper.properties +++ b/hideout-mastodon/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/hideout-mastodon/gradlew b/hideout-mastodon/gradlew index b740cf13..f5feea6d 100644 --- a/hideout-mastodon/gradlew +++ b/hideout-mastodon/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/hideout-mastodon/gradlew.bat b/hideout-mastodon/gradlew.bat index 7101f8e4..9b42019c 100644 --- a/hideout-mastodon/gradlew.bat +++ b/hideout-mastodon/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/libs.versions.toml b/libs.versions.toml index fc1f2228..3e63abdc 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -11,7 +11,7 @@ serialization = "1.7.1" kjob = "0.6.0" tika = "2.9.2" owl = "0.0.1" -jackson = "2.15.4" +jackson = "2.17.2" [libraries] @@ -69,9 +69,9 @@ jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module- blurhash = { module = "io.trbl:blurhash", version = "1.0.0" } -aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.12" } +aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.25" } -jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" } +jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" } owasp-java-html-sanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version = "20240325.1" } @@ -82,9 +82,9 @@ imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version = "3 thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" } flyway-core = { module = "org.flywaydb:flyway-core" } -flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version = "10.15.0" } +flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version = "10.16.0" } -h2db = { module = "com.h2database:h2", version = "2.2.224" } +h2db = { module = "com.h2database:h2", version = "2.3.230" } kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } @@ -106,9 +106,9 @@ jackson = ["jackson-databind", "jackson-module-kotlin"] [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -spring-boot = { id = "org.springframework.boot", version = "3.3.1" } +spring-boot = { id = "org.springframework.boot", version = "3.3.2" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } -kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.2" } -openapi-generator = { id = "org.openapi.generator", version = "7.6.0" } +kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.3" } +openapi-generator = { id = "org.openapi.generator", version = "7.7.0" } license-report = { id = "com.github.jk1.dependency-license-report", version = "2.8" } \ No newline at end of file diff --git a/owl/build.gradle.kts b/owl/build.gradle.kts index 6308d5c2..9a7240c0 100644 --- a/owl/build.gradle.kts +++ b/owl/build.gradle.kts @@ -1,6 +1,6 @@ plugins { // alias(libs.plugins.kotlin.jvm) - id("org.jetbrains.kotlin.jvm") version "1.9.24" + id("org.jetbrains.kotlin.jvm") version "1.9.25" } diff --git a/owl/gradle/wrapper/gradle-wrapper.jar b/owl/gradle/wrapper/gradle-wrapper.jar index e6441136..2c352119 100644 Binary files a/owl/gradle/wrapper/gradle-wrapper.jar and b/owl/gradle/wrapper/gradle-wrapper.jar differ diff --git a/owl/gradle/wrapper/gradle-wrapper.properties b/owl/gradle/wrapper/gradle-wrapper.properties index a4413138..09523c0e 100644 --- a/owl/gradle/wrapper/gradle-wrapper.properties +++ b/owl/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/owl/gradlew b/owl/gradlew index b740cf13..f5feea6d 100644 --- a/owl/gradlew +++ b/owl/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/owl/gradlew.bat b/owl/gradlew.bat index 7101f8e4..9b42019c 100644 --- a/owl/gradlew.bat +++ b/owl/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/owl/owl-broker/build.gradle.kts b/owl/owl-broker/build.gradle.kts index 8bfbed16..7d376208 100644 --- a/owl/owl-broker/build.gradle.kts +++ b/owl/owl-broker/build.gradle.kts @@ -2,7 +2,7 @@ plugins { // alias(libs.plugins.kotlin.jvm) kotlin("jvm") id("com.google.protobuf") version "0.9.4" - id("com.google.devtools.ksp") version "1.9.24-1.0.20" + id("com.google.devtools.ksp") version "1.9.25-1.0.20" } apply { @@ -19,9 +19,9 @@ repositories { dependencies { implementation("io.grpc:grpc-kotlin-stub:1.4.1") - implementation("io.grpc:grpc-protobuf:1.65.0") + implementation("io.grpc:grpc-protobuf:1.65.1") implementation("com.google.protobuf:protobuf-kotlin:4.27.2") - implementation("io.grpc:grpc-netty:1.65.0") + implementation("io.grpc:grpc-netty:1.65.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation(project(":owl-common")) implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1") @@ -45,7 +45,7 @@ protobuf { } plugins { create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.65.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.65.1" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" diff --git a/owl/owl-broker/owl-broker-mongodb/build.gradle.kts b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts index 72b8a8f7..e3165ba4 100644 --- a/owl/owl-broker/owl-broker-mongodb/build.gradle.kts +++ b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts @@ -1,7 +1,7 @@ plugins { application kotlin("jvm") - id("com.google.devtools.ksp") version "1.9.24-1.0.20" + id("com.google.devtools.ksp") version "1.9.25-1.0.20" } apply { @@ -16,7 +16,7 @@ repositories { } dependencies { - implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.1") + implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.2") implementation(project(":owl-broker")) implementation(project(":owl-common")) implementation(platform("io.insert-koin:koin-bom:3.5.6")) diff --git a/owl/owl-consumer/build.gradle.kts b/owl/owl-consumer/build.gradle.kts index 30bd82d7..5c6fa8db 100644 --- a/owl/owl-consumer/build.gradle.kts +++ b/owl/owl-consumer/build.gradle.kts @@ -13,9 +13,9 @@ repositories { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") implementation("io.grpc:grpc-kotlin-stub:1.4.1") - implementation("io.grpc:grpc-protobuf:1.65.0") + implementation("io.grpc:grpc-protobuf:1.65.1") implementation("com.google.protobuf:protobuf-kotlin:4.27.2") - implementation("io.grpc:grpc-netty:1.65.0") + implementation("io.grpc:grpc-netty:1.65.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation(project(":owl-common")) protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) @@ -34,7 +34,7 @@ protobuf { } plugins { create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.65.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.65.1" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" diff --git a/owl/owl-producer/owl-producer-default/build.gradle.kts b/owl/owl-producer/owl-producer-default/build.gradle.kts index 0e4fc8fe..31577ac0 100644 --- a/owl/owl-producer/owl-producer-default/build.gradle.kts +++ b/owl/owl-producer/owl-producer-default/build.gradle.kts @@ -14,9 +14,9 @@ dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") api(project(":owl-producer:owl-producer-api")) implementation("io.grpc:grpc-kotlin-stub:1.4.1") - implementation("io.grpc:grpc-protobuf:1.65.0") + implementation("io.grpc:grpc-protobuf:1.65.1") implementation("com.google.protobuf:protobuf-kotlin:4.27.2") - implementation("io.grpc:grpc-netty:1.65.0") + implementation("io.grpc:grpc-netty:1.65.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation(project(":owl-common")) protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) @@ -35,7 +35,7 @@ protobuf { } plugins { create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.65.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.65.1" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"