From fde7e3597a4f6f3e992d1669158e6992df4a034f Mon Sep 17 00:00:00 2001 From: tomas Date: Fri, 11 Jul 2025 22:16:40 -0400 Subject: [PATCH 1/8] Mavencentral jreleaser (#116) * bump gradle version, apply jreleaser plugin * use jreleaser * set up task ordering --------- Co-authored-by: tomas mccandless --- build.gradle | 47 ++++-- buildscript-gradle.lockfile | 147 ++++++++++++++++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- publish.sh | 29 ++++ settings.gradle | 4 +- versionInfo.gradle | 1 + .../locking/warp-core-gatling_2.13.lockfile | 76 ++++----- .../locking/warp-core-macros_2.13.lockfile | 76 ++++----- warp-core/locking/warp-core_2.12.lockfile | 75 ++++----- warp-core/locking/warp-core_2.13.lockfile | 76 ++++----- 11 files changed, 357 insertions(+), 178 deletions(-) diff --git a/build.gradle b/build.gradle index a63b9fff..ba0fe929 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,7 @@ buildscript { classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:${versions.coveralls}" classpath "org.scoverage:gradle-scoverage:${versions.gradleScoverage}" classpath "com.github.alisiikh:gradle-scalastyle-plugin:${versions.scalaStyle}" + classpath "org.jreleaser:org.jreleaser.gradle.plugin:${versions.gradleJReleaser}" } // lock buildscript dependencies @@ -48,6 +49,7 @@ allprojects { apply plugin: 'com.github.kt3k.coveralls' apply plugin: 'maven-publish' apply plugin: 'signing' + apply plugin: 'org.jreleaser' apply from: file("${rootDir}/versionInfo.gradle") repositories { @@ -264,6 +266,10 @@ subprojects { configFile = new File("${rootDir}/checkstyle.xml") } + tasks.withType(Checkstyle) { + it.mustRunAfter(rootProject.copyMySQLConfigTemplate, rootProject.copyH2ConfigTemplate) + } + tasks.withType(JavaExec).each { task -> task.systemProperties(System.properties) task.systemProperty "wd.warp.config.directory", "$rootDir/config" @@ -399,14 +405,7 @@ subprojects { repositories { maven { - credentials { - // will be null if these aren't set as project properties - username findProperty("sonatypeUsername") - password findProperty("sonatypePassword") - } - String snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots' - String releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2' - url = isSnapshot(version.toString()) ? snapshotsRepoUrl : releasesRepoUrl + url = layout.buildDirectory.dir('staging-deploy') } } } @@ -415,11 +414,33 @@ subprojects { addReleaseBranchPattern(".*feature") } - signing { - // only require signing for non-snapshot versions being published to maven central - required { - !isSnapshot(version.toString()) && gradle.taskGraph.hasTask("publish") + jreleaser { + + signing { + active = 'ALWAYS' + armored = true + } + deploy { + maven { + mavenCentral { + 'release-deploy' { + active = 'RELEASE' + url = 'https://central.sonatype.com/api/v1/publisher' + stagingRepository(layout.buildDirectory.asFile.get().absolutePath + '/staging-deploy') + } + } + nexus2 { + 'snapshot-deploy' { + active = 'SNAPSHOT' + snapshotUrl = 'https://central.sonatype.com/repository/maven-snapshots/' + applyMavenCentralRules = true + snapshotSupported = true + closeRepository = true + releaseRepository = true + stagingRepository(layout.buildDirectory.asFile.get().absolutePath + '/staging-deploy') + } + } + } } - sign publishing.publications.mavenJava } } diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index bae8e7b9..8ddfbf79 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -3,10 +3,26 @@ # This file is expected to be part of source control. ch.epfl.scala:scalafix-interfaces:0.10.4=classpath com.adtran:scala-multiversion-plugin:2.0.4=classpath -com.fasterxml.jackson:jackson-bom:2.11.0=classpath +com.fasterxml.jackson.core:jackson-annotations:2.19.1=classpath +com.fasterxml.jackson.core:jackson-core:2.19.1=classpath +com.fasterxml.jackson.core:jackson-databind:2.19.1=classpath +com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.19.1=classpath +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.1=classpath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.1=classpath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.1=classpath +com.fasterxml.jackson:jackson-bom:2.19.1=classpath +com.fasterxml.woodstox:woodstox-core:7.1.1=classpath +com.fasterxml:classmate:1.7.0=classpath com.github.alisiikh:gradle-scalastyle-plugin:3.4.1=classpath +com.github.luben:zstd-jni:1.5.7-3=classpath +com.github.sbaudoin:yamllint:1.6.1=classpath +com.github.spullara.mustache.java:compiler:0.9.14=classpath +com.github.victools:jsonschema-generator:4.38.0=classpath +com.github.victools:jsonschema-module-jackson:4.38.0=classpath com.github.zafarkhaja:java-semver:0.9.0=classpath -com.googlecode.javaewah:JavaEWAH:1.1.12=classpath +com.googlecode.javaewah:JavaEWAH:1.1.13=classpath +com.hierynomus:asn-one:0.6.0=classpath +com.hierynomus:sshj:0.40.0=classpath com.jcraft:jsch.agentproxy.connector-factory:0.0.7=classpath com.jcraft:jsch.agentproxy.core:0.0.7=classpath com.jcraft:jsch.agentproxy.pageant:0.0.7=classpath @@ -25,14 +41,23 @@ com.netflix.nebula:nebula-release-plugin:15.0.3=classpath com.perforce:p4java:2015.2.1365273=classpath com.trilead:trilead-ssh2:1.0.0-build220=classpath commons-beanutils:commons-beanutils:1.8.0=classpath -commons-codec:commons-codec:1.6=classpath +commons-codec:commons-codec:1.18.0=classpath commons-collections:commons-collections:3.2.1=classpath -commons-io:commons-io:2.6=classpath +commons-io:commons-io:2.19.0=classpath commons-lang:commons-lang:2.4=classpath -commons-logging:commons-logging:1.1.3=classpath +commons-logging:commons-logging:1.2=classpath +commons-net:commons-net:3.11.1=classpath de.regnis.q.sequence:sequence-library:1.0.3=classpath +dev.failsafe:failsafe:3.3.2=classpath io.get-coursier:interface:1.0.8=classpath io.github.cosmicsilence:gradle-scalafix:0.1.14=classpath +io.github.openfeign.form:feign-form:3.8.0=classpath +io.github.openfeign:feign-core:13.6=classpath +io.github.openfeign:feign-httpclient:13.6=classpath +io.github.openfeign:feign-jackson:13.6=classpath +jakarta.activation:jakarta.activation-api:2.1.3=classpath +jakarta.mail:jakarta.mail-api:2.1.3=classpath +javax.inject:javax.inject:1=classpath net.java.dev.jna:jna-platform:4.1.0=classpath net.java.dev.jna:jna:4.1.0=classpath net.java.dev.jna:platform:3.4.0=classpath @@ -42,21 +67,125 @@ net.sourceforge.nekohtml:nekohtml:1.9.16=classpath org.ajoberstar.grgit:grgit-core:4.1.1=classpath org.ajoberstar.grgit:grgit-gradle:4.1.1=classpath org.antlr:antlr-runtime:3.4=classpath -org.apache.httpcomponents:httpclient:4.3=classpath -org.apache.httpcomponents:httpcore:4.3=classpath +org.apache.commons:commons-compress:1.27.1=classpath +org.apache.commons:commons-jexl3:3.5.0=classpath +org.apache.commons:commons-lang3:3.17.0=classpath +org.apache.commons:commons-text:1.13.1=classpath +org.apache.httpcomponents:httpclient:4.5.14=classpath +org.apache.httpcomponents:httpcore:4.4.16=classpath org.apache.httpcomponents:httpmime:4.3=classpath +org.apache.maven:maven-artifact:3.6.3=classpath +org.apache.maven:maven-builder-support:3.6.3=classpath +org.apache.maven:maven-model-builder:3.6.3=classpath +org.apache.maven:maven-model:3.6.3=classpath +org.apache.tika:tika-core:2.9.2=classpath +org.bouncycastle:bcpg-jdk18on:1.81=classpath +org.bouncycastle:bcpkix-jdk18on:1.81=classpath +org.bouncycastle:bcprov-jdk18on:1.81=classpath +org.bouncycastle:bcutil-jdk18on:1.81=classpath org.codehaus.groovy.modules.http-builder:http-builder:0.7.1=classpath -org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=classpath +org.codehaus.plexus:plexus-interpolation:1.25=classpath +org.codehaus.plexus:plexus-utils:3.2.1=classpath +org.codehaus.woodstox:stax2-api:4.2.2=classpath +org.commonmark:commonmark-ext-autolink:0.21.0=classpath +org.commonmark:commonmark:0.21.0=classpath +org.eclipse.jgit:org.eclipse.jgit:5.13.3.202401111512-r=classpath +org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4=classpath org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50=classpath org.jetbrains.kotlin:kotlin-stdlib:1.3.50=classpath org.jetbrains:annotations:13.0=classpath +org.jreleaser:jreleaser-artifactory-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-azure-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-bluesky-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-codeberg-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-command-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-config-json:1.19.0=classpath +org.jreleaser:jreleaser-config-toml:1.19.0=classpath +org.jreleaser:jreleaser-config-yaml:1.19.0=classpath +org.jreleaser:jreleaser-discord-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-discourse-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-engine:1.19.0=classpath +org.jreleaser:jreleaser-forgejo-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-ftp-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-genericgit-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-git-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-gitea-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-github-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-gitlab-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-gitter-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-google-chat-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-gradle-plugin:1.19.0=classpath +org.jreleaser:jreleaser-http-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-java-sdk-commons:1.19.0=classpath +org.jreleaser:jreleaser-linkedin-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-logger-api:1.19.0=classpath +org.jreleaser:jreleaser-mastodon-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-mattermost-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-mavencentral-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-model-api:1.19.0=classpath +org.jreleaser:jreleaser-model-impl:1.19.0=classpath +org.jreleaser:jreleaser-nexus2-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-nexus3-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-opencollective-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-resource-bundle:1.19.0=classpath +org.jreleaser:jreleaser-s3-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-sdkman-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-signing-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-slack-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-smtp-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-ssh-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-teams-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-telegram-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-templates:1.19.0=classpath +org.jreleaser:jreleaser-tool-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-twitter-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-utils:1.19.0=classpath +org.jreleaser:jreleaser-webhooks-java-sdk:1.19.0=classpath +org.jreleaser:jreleaser-zulip-java-sdk:1.19.0=classpath +org.jreleaser:org.jreleaser.gradle.plugin:1.19.0=classpath +org.kordamp.gradle:base-gradle-plugin:0.46.10=classpath org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2=classpath +org.nibor.autolink:autolink:0.10.0=classpath +org.reactivestreams:reactive-streams:1.0.4=classpath org.scoverage:gradle-scoverage:8.0.3=classpath -org.slf4j:slf4j-api:1.7.30=classpath +org.slf4j:jcl-over-slf4j:2.0.17=classpath +org.slf4j:slf4j-api:2.0.17=classpath org.tmatesoft.sqljet:sqljet:1.1.10=classpath org.tmatesoft.svnkit:svnkit:1.8.12=classpath +org.tukaani:xz:1.10=classpath +org.twitter4j:twitter4j-core:4.1.2=classpath +org.yaml:snakeyaml:2.4=classpath +software.amazon.awssdk:annotations:2.31.73=classpath +software.amazon.awssdk:apache-client:2.31.73=classpath +software.amazon.awssdk:arns:2.31.73=classpath +software.amazon.awssdk:auth:2.31.73=classpath +software.amazon.awssdk:aws-core:2.31.73=classpath +software.amazon.awssdk:aws-query-protocol:2.31.73=classpath +software.amazon.awssdk:aws-xml-protocol:2.31.73=classpath +software.amazon.awssdk:checksums-spi:2.31.73=classpath +software.amazon.awssdk:checksums:2.31.73=classpath +software.amazon.awssdk:crt-core:2.31.73=classpath +software.amazon.awssdk:endpoints-spi:2.31.73=classpath +software.amazon.awssdk:http-auth-aws-eventstream:2.31.73=classpath +software.amazon.awssdk:http-auth-aws:2.31.73=classpath +software.amazon.awssdk:http-auth-spi:2.31.73=classpath +software.amazon.awssdk:http-auth:2.31.73=classpath +software.amazon.awssdk:http-client-spi:2.31.73=classpath +software.amazon.awssdk:identity-spi:2.31.73=classpath +software.amazon.awssdk:json-utils:2.31.73=classpath +software.amazon.awssdk:metrics-spi:2.31.73=classpath +software.amazon.awssdk:profiles:2.31.73=classpath +software.amazon.awssdk:protocol-core:2.31.73=classpath +software.amazon.awssdk:regions:2.31.73=classpath +software.amazon.awssdk:retries-spi:2.31.73=classpath +software.amazon.awssdk:retries:2.31.73=classpath +software.amazon.awssdk:s3:2.31.73=classpath +software.amazon.awssdk:sdk-core:2.31.73=classpath +software.amazon.awssdk:third-party-jackson-core:2.31.73=classpath +software.amazon.awssdk:utils:2.31.73=classpath +software.amazon.eventstream:eventstream:1.0.1=classpath xerces:xercesImpl:2.9.1=classpath xml-apis:xml-apis:1.3.04=classpath xml-resolver:xml-resolver:1.2=classpath diff --git a/gradle.properties b/gradle.properties index 6dde42ed..c9f345e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ scalaVersions=2.12.20,2.13.16 # during releases, we only want to create 1 repo tag. # note that devSnapshot and snapshot tasks won't create repo tags # see https://github.com/ADTRAN/gradle-scala-multiversion-plugin#advanced-configuration -runOnceTasks=clean,candidate,final,release,generateGradleLintReport +runOnceTasks=candidate,final,release,generateGradleLintReport,jreleaserDeploy # prevent publication of SHA256 & SHA512 checksums, which are incompatible with sonatype release repos # see https://github.com/gradle/gradle/issues/11308 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 98debb84..3ae1e2f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/publish.sh b/publish.sh index 3d30e4c2..633558ee 100755 --- a/publish.sh +++ b/publish.sh @@ -9,6 +9,23 @@ set -e # example: ./publish.sh snapshot minor local # will increment minor version component and publish snapshots to local maven repository + +# See further documentation here: https://jreleaser.org/guide/latest/examples/maven/maven-central.html +# +# Basic workflow: +# Artifacts are staged in a local working directory, then uploaded to maven central. This allows for local checking +# and verification of the directory layout, signing, and fine content requirements. +# +# Dry-Run: +# It can be useful to set dry-run for the upload phase. This can be accomplished with the environment variable JRELEASER_DRY_RUN=true +# +# As a final verification step, it can also be useful to inspect the uploaded file structure and content before +# the staging repository is closed and content is published. +# If the environment variable JRELEASER_MAVENCENTRAL_STAGE is set to UPLOAD, content will only be uploaded to the remote staging +# repository, and the repository will be left unreleased to allow for a final verification step. The last step of closing +# and releasing the remote repository can be done through the maven central UI. +# + if [[ $# -ne 3 ]] then echo "usage: ./publish.sh " @@ -38,6 +55,13 @@ else exit 1 fi +# don't allow publishing devSnapshots to sonatype +if [[ $RELEASE_TYPE = 'devSnapshot' && $REPOSITORY = 'sonatype' ]] +then + echo "Do not publish devSnapshot to sonatype. (use local repository instead)" + exit 1 +fi + if [[ $RELEASE_TYPE = 'final' || $RELEASE_TYPE = 'candidate' ]] then @@ -64,3 +88,8 @@ else echo "$RELEASE_TYPE is not a valid release type" exit 1 fi + +if [[ $REPOSITORY = 'sonatype' ]] +then + JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew jReleaserDeploy --stacktrace +fi \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index c3da27d3..9e1a2034 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,2 @@ rootProject.name = 'warp-core-root' -include 'warp-core', 'warp-core-gatling', 'warp-core-macros' - -enableFeaturePreview('ONE_LOCKFILE_PER_PROJECT') +include 'warp-core', 'warp-core-gatling', 'warp-core-macros' \ No newline at end of file diff --git a/versionInfo.gradle b/versionInfo.gradle index 8b2a97a9..8968f7bd 100644 --- a/versionInfo.gradle +++ b/versionInfo.gradle @@ -15,6 +15,7 @@ project.ext.versions = [ , gatling: '3.8.4' , gradleGit: '4.1.1' , gradleScoverage: '8.0.3' + , gradleJReleaser: '1.19.0' , guava: '32.0.1-jre' , guice: '5.1.0' , gson: '2.11.0' diff --git a/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile b/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile index d276be79..d2ce695e 100644 --- a/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile +++ b/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile @@ -13,10 +13,10 @@ com.aayushatharva.brotli4j:native-osx-x86_64:1.8.0=compileClasspath,default,runt com.aayushatharva.brotli4j:native-windows-x86_64:1.8.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beautiful-scala:scalastyle_2.13:1.2.0=scalastyle com.eatthepath:fast-uuid:0.2.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc +com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4=zinc -com.eed3si9n:sjson-new-core_2.13:0.9.1=zinc -com.eed3si9n:sjson-new-scalajson_2.13:0.9.1=zinc +com.eed3si9n:sjson-new-core_2.13:0.10.1=zinc +com.eed3si9n:sjson-new-scalajson_2.13:0.10.1=zinc com.fasterxml.jackson.core:jackson-annotations:2.13.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.13.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.13.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ com.squareup.okio:okio-jvm:3.6.0=compileClasspath,default,runtimeClasspath,testC com.squareup.okio:okio:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:converter-moshi:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:retrofit:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.swoval:file-tree-views:2.1.7=zinc +com.swoval:file-tree-views:2.1.12=zinc com.tdunning:t-digest:3.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-actor_2.13:2.6.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-slf4j_2.13:2.6.20=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,6 +94,7 @@ io.gatling:gatling-recorder:3.8.4=compileClasspath,default,runtimeClasspath,test io.gatling:gatling-redis-java:3.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.gatling:gatling-redis:3.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.gatling:gatling-test-framework:3.8.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.java-diff-utils:java-diff-utils:4.12=zinc io.netty:netty-buffer:4.1.81.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-dns:4.1.81.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.81.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -121,10 +122,9 @@ javax.jms:javax.jms-api:2.0.1=compileClasspath,default,runtimeClasspath,testComp junit:junit:4.13.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.31=default,runtimeClasspath,testRuntimeClasspath net.debasishg:redisclient_2.13:3.42=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=zinc -net.java.dev.jna:jna:5.8.0=zinc +net.java.dev.jna:jna:5.14.0=zinc net.jodah:typetools:0.6.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.openhft:zero-allocation-hashing:0.10.1=zinc +net.openhft:zero-allocation-hashing:0.16=zinc net.sf.saxon:Saxon-HE:10.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:9.8.0-12=checkstyle org.antlr:antlr4-runtime:4.7.1=checkstyle @@ -141,7 +141,7 @@ org.checkerframework:checker-qual:3.19.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.33.0=default,runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=checkstyle org.flywaydb:flyway-core:5.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fusesource.jansi:jansi:2.1.0=zinc +org.fusesource.jansi:jansi:2.4.0=zinc org.hamcrest:hamcrest-core:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.influxdb:influxdb-java:2.24=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -150,10 +150,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,default,runtimeC org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline-terminal-jansi:3.19.0=zinc -org.jline:jline-terminal-jna:3.19.0=zinc -org.jline:jline-terminal:3.19.0=zinc -org.jline:jline:3.19.0=zinc +org.jline:jline-native:3.27.1=zinc +org.jline:jline-terminal-jni:3.27.1=zinc +org.jline:jline-terminal:3.27.1=zinc +org.jline:jline:3.26.3=zinc org.jodd:jodd-lagarto:6.0.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jodd:jodd-util:6.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -174,37 +174,37 @@ org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=scalastyle,zinc org.scala-lang.modules:scala-parser-combinators_2.13:2.1.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scala-lang.modules:scala-swing_2.13:3.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle,zinc +org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle org.scala-lang.modules:scala-xml_2.13:2.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage -org.scala-lang:scala-compiler:2.13.6=zinc +org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage,zinc +org.scala-lang:scala-compiler:2.13.15=zinc org.scala-lang:scala-library:2.13.1=scalastyle +org.scala-lang:scala-library:2.13.15=zinc org.scala-lang:scala-library:2.13.16=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-library:2.13.6=zinc org.scala-lang:scala-reflect:2.13.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-reflect:2.13.6=zinc -org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc -org.scala-sbt:collections_2.13:1.6.1=zinc -org.scala-sbt:compiler-bridge_2.13:1.6.1=zinc -org.scala-sbt:compiler-interface:1.6.1=zinc -org.scala-sbt:core-macros_2.13:1.6.1=zinc -org.scala-sbt:io_2.13:1.6.0=zinc -org.scala-sbt:launcher-interface:1.1.3=zinc +org.scala-lang:scala-reflect:2.13.15=zinc +org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79=zinc +org.scala-sbt:collections_2.13:1.10.4=zinc +org.scala-sbt:compiler-bridge_2.13:1.10.4=zinc +org.scala-sbt:compiler-interface:1.10.4=zinc +org.scala-sbt:core-macros_2.13:1.10.4=zinc +org.scala-sbt:io_2.13:1.10.1=zinc +org.scala-sbt:launcher-interface:1.4.4=zinc org.scala-sbt:sbinary_2.13:0.5.1=zinc org.scala-sbt:test-interface:1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-sbt:util-control_2.13:1.6.1=zinc -org.scala-sbt:util-interface:1.6.1=zinc -org.scala-sbt:util-logging_2.13:1.6.1=zinc -org.scala-sbt:util-position_2.13:1.6.1=zinc -org.scala-sbt:util-relation_2.13:1.6.1=zinc -org.scala-sbt:zinc-apiinfo_2.13:1.6.1=zinc -org.scala-sbt:zinc-classfile_2.13:1.6.1=zinc -org.scala-sbt:zinc-classpath_2.13:1.6.1=zinc -org.scala-sbt:zinc-compile-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-persist-core-assembly:1.6.1=zinc -org.scala-sbt:zinc-persist_2.13:1.6.1=zinc -org.scala-sbt:zinc_2.13:1.6.1=zinc +org.scala-sbt:util-control_2.13:1.10.4=zinc +org.scala-sbt:util-interface:1.10.4=zinc +org.scala-sbt:util-logging_2.13:1.10.4=zinc +org.scala-sbt:util-position_2.13:1.10.4=zinc +org.scala-sbt:util-relation_2.13:1.10.4=zinc +org.scala-sbt:zinc-apiinfo_2.13:1.10.4=zinc +org.scala-sbt:zinc-classfile_2.13:1.10.4=zinc +org.scala-sbt:zinc-classpath_2.13:1.10.4=zinc +org.scala-sbt:zinc-compile-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-persist-core-assembly:1.10.4=zinc +org.scala-sbt:zinc-persist_2.13:1.10.4=zinc +org.scala-sbt:zinc_2.13:1.10.4=zinc org.scalactic:scalactic_2.13:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scalariform:scalariform_2.13:0.2.10=scalastyle org.scalatest:scalatest-compatible:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -235,4 +235,4 @@ org.simpleflatmapper:sfm-util:8.2.3=compileClasspath,default,runtimeClasspath,te org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.typelevel:spire-macros_2.13:0.17.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.unbescape:unbescape:1.1.6.RELEASE=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor +empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor diff --git a/warp-core-macros/locking/warp-core-macros_2.13.lockfile b/warp-core-macros/locking/warp-core-macros_2.13.lockfile index 78000c6c..e9df91c4 100644 --- a/warp-core-macros/locking/warp-core-macros_2.13.lockfile +++ b/warp-core-macros/locking/warp-core-macros_2.13.lockfile @@ -6,10 +6,10 @@ aopalliance:aopalliance:1.0=compileClasspath,default,runtimeClasspath,testCompil ch.qos.logback:logback-classic:1.5.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.5.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beautiful-scala:scalastyle_2.13:1.2.0=scalastyle -com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc +com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4=zinc -com.eed3si9n:sjson-new-core_2.13:0.9.1=zinc -com.eed3si9n:sjson-new-scalajson_2.13:0.9.1=zinc +com.eed3si9n:sjson-new-core_2.13:0.10.1=zinc +com.eed3si9n:sjson-new-scalajson_2.13:0.10.1=zinc com.github.dwickern:scala-nameof_2.13:3.0.0=default,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -36,7 +36,7 @@ com.squareup.okio:okio-jvm:3.6.0=compileClasspath,default,runtimeClasspath,testC com.squareup.okio:okio:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:converter-moshi:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:retrofit:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.swoval:file-tree-views:2.1.7=zinc +com.swoval:file-tree-views:2.1.12=zinc com.typesafe.slick:slick-hikaricp_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle @@ -49,12 +49,12 @@ commons-cli:commons-cli:1.4=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,default,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=default,runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.java-diff-utils:java-diff-utils:4.12=zinc javax.inject:javax.inject:1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.31=default,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=zinc -net.java.dev.jna:jna:5.8.0=zinc -net.openhft:zero-allocation-hashing:0.10.1=zinc +net.java.dev.jna:jna:5.14.0=zinc +net.openhft:zero-allocation-hashing:0.16=zinc net.sf.saxon:Saxon-HE:9.8.0-12=checkstyle org.antlr:antlr4-runtime:4.7.1=checkstyle org.apache.commons:commons-configuration2:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -69,7 +69,7 @@ org.checkerframework:checker-qual:3.33.0=default,runtimeClasspath,testRuntimeCla org.checkerframework:checker-qual:3.5.0=compileClasspath,testCompileClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=checkstyle org.flywaydb:flyway-core:5.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fusesource.jansi:jansi:2.1.0=zinc +org.fusesource.jansi:jansi:2.4.0=zinc org.hamcrest:hamcrest-core:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.influxdb:influxdb-java:2.24=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -77,10 +77,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,default,runtimeC org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline-terminal-jansi:3.19.0=zinc -org.jline:jline-terminal-jna:3.19.0=zinc -org.jline:jline-terminal:3.19.0=zinc -org.jline:jline:3.19.0=zinc +org.jline:jline-native:3.27.1=zinc +org.jline:jline-terminal-jni:3.27.1=zinc +org.jline:jline-terminal:3.27.1=zinc +org.jline:jline:3.26.3=zinc org.junit.jupiter:junit-jupiter-api:5.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.10.3=testRuntimeClasspath org.junit.platform:junit-platform-commons:1.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -96,36 +96,36 @@ org.scala-lang.modules:scala-collection-compat_2.13:2.12.0=compileClasspath,defa org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=default,runtimeClasspath,testRuntimeClasspath org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=scalastyle,zinc -org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle,zinc +org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle org.scala-lang.modules:scala-xml_2.13:2.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage -org.scala-lang:scala-compiler:2.13.6=zinc +org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage,zinc +org.scala-lang:scala-compiler:2.13.15=zinc org.scala-lang:scala-library:2.13.1=scalastyle +org.scala-lang:scala-library:2.13.15=zinc org.scala-lang:scala-library:2.13.16=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-library:2.13.6=zinc org.scala-lang:scala-reflect:2.13.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-reflect:2.13.6=zinc -org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc -org.scala-sbt:collections_2.13:1.6.1=zinc -org.scala-sbt:compiler-bridge_2.13:1.6.1=zinc -org.scala-sbt:compiler-interface:1.6.1=zinc -org.scala-sbt:core-macros_2.13:1.6.1=zinc -org.scala-sbt:io_2.13:1.6.0=zinc -org.scala-sbt:launcher-interface:1.1.3=zinc +org.scala-lang:scala-reflect:2.13.15=zinc +org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79=zinc +org.scala-sbt:collections_2.13:1.10.4=zinc +org.scala-sbt:compiler-bridge_2.13:1.10.4=zinc +org.scala-sbt:compiler-interface:1.10.4=zinc +org.scala-sbt:core-macros_2.13:1.10.4=zinc +org.scala-sbt:io_2.13:1.10.1=zinc +org.scala-sbt:launcher-interface:1.4.4=zinc org.scala-sbt:sbinary_2.13:0.5.1=zinc -org.scala-sbt:util-control_2.13:1.6.1=zinc -org.scala-sbt:util-interface:1.6.1=zinc -org.scala-sbt:util-logging_2.13:1.6.1=zinc -org.scala-sbt:util-position_2.13:1.6.1=zinc -org.scala-sbt:util-relation_2.13:1.6.1=zinc -org.scala-sbt:zinc-apiinfo_2.13:1.6.1=zinc -org.scala-sbt:zinc-classfile_2.13:1.6.1=zinc -org.scala-sbt:zinc-classpath_2.13:1.6.1=zinc -org.scala-sbt:zinc-compile-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-persist-core-assembly:1.6.1=zinc -org.scala-sbt:zinc-persist_2.13:1.6.1=zinc -org.scala-sbt:zinc_2.13:1.6.1=zinc +org.scala-sbt:util-control_2.13:1.10.4=zinc +org.scala-sbt:util-interface:1.10.4=zinc +org.scala-sbt:util-logging_2.13:1.10.4=zinc +org.scala-sbt:util-position_2.13:1.10.4=zinc +org.scala-sbt:util-relation_2.13:1.10.4=zinc +org.scala-sbt:zinc-apiinfo_2.13:1.10.4=zinc +org.scala-sbt:zinc-classfile_2.13:1.10.4=zinc +org.scala-sbt:zinc-classpath_2.13:1.10.4=zinc +org.scala-sbt:zinc-compile-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-persist-core-assembly:1.10.4=zinc +org.scala-sbt:zinc-persist_2.13:1.10.4=zinc +org.scala-sbt:zinc_2.13:1.10.4=zinc org.scalactic:scalactic_2.13:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scalariform:scalariform_2.13:0.2.10=scalastyle org.scalatest:scalatest-compatible:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -152,4 +152,4 @@ org.scoverage:scalac-scoverage-reporter_2.13:2.3.0=scoverage org.scoverage:scalac-scoverage-runtime_2.13:2.3.0=scoverage org.scoverage:scalac-scoverage-serializer_2.13:2.3.0=scoverage org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor +empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor diff --git a/warp-core/locking/warp-core_2.12.lockfile b/warp-core/locking/warp-core_2.12.lockfile index d08c3848..ffdbcf6b 100644 --- a/warp-core/locking/warp-core_2.12.lockfile +++ b/warp-core/locking/warp-core_2.12.lockfile @@ -6,10 +6,10 @@ aopalliance:aopalliance:1.0=compileClasspath,default,runtimeClasspath,testCompil ch.qos.logback:logback-classic:1.5.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.5.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beautiful-scala:scalastyle_2.13:1.2.0=scalastyle -com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc +com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4=zinc -com.eed3si9n:sjson-new-core_2.13:0.9.1=zinc -com.eed3si9n:sjson-new-scalajson_2.13:0.9.1=zinc +com.eed3si9n:sjson-new-core_2.13:0.10.1=zinc +com.eed3si9n:sjson-new-scalajson_2.13:0.10.1=zinc com.github.dwickern:scala-nameof_2.12:3.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -34,7 +34,7 @@ com.squareup.okio:okio-jvm:3.6.0=compileClasspath,default,runtimeClasspath,testC com.squareup.okio:okio:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:converter-moshi:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:retrofit:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.swoval:file-tree-views:2.1.7=zinc +com.swoval:file-tree-views:2.1.12=zinc com.typesafe.slick:slick-hikaricp_2.12:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.slick:slick_2.12:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle @@ -46,12 +46,12 @@ commons-cli:commons-cli:1.4=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.java-diff-utils:java-diff-utils:4.12=zinc javax.inject:javax.inject:1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.31=default,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=zinc -net.java.dev.jna:jna:5.8.0=zinc -net.openhft:zero-allocation-hashing:0.10.1=zinc +net.java.dev.jna:jna:5.14.0=zinc +net.openhft:zero-allocation-hashing:0.16=zinc net.sf.saxon:Saxon-HE:9.8.0-12=checkstyle org.antlr:antlr4-runtime:4.7.1=checkstyle org.apache.commons:commons-configuration2:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -65,7 +65,7 @@ org.checkerframework:checker-qual:2.0.0=checkstyle org.checkerframework:checker-qual:3.33.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=checkstyle org.flywaydb:flyway-core:5.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fusesource.jansi:jansi:2.1.0=zinc +org.fusesource.jansi:jansi:2.4.0=zinc org.hamcrest:hamcrest-core:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.influxdb:influxdb-java:2.24=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -73,10 +73,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,default,runtimeC org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline-terminal-jansi:3.19.0=zinc -org.jline:jline-terminal-jna:3.19.0=zinc -org.jline:jline-terminal:3.19.0=zinc -org.jline:jline:3.19.0=zinc +org.jline:jline-native:3.27.1=zinc +org.jline:jline-terminal-jni:3.27.1=zinc +org.jline:jline-terminal:3.27.1=zinc +org.jline:jline:3.26.3=zinc org.junit.jupiter:junit-jupiter-api:5.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.10.3=testRuntimeClasspath org.junit.platform:junit-platform-commons:1.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -94,34 +94,35 @@ org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=scalastyle,zinc org.scala-lang.modules:scala-xml_2.12:2.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scala-lang.modules:scala-xml_2.12:2.3.0=scoverage -org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle,zinc -org.scala-lang:scala-compiler:2.13.6=zinc +org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle +org.scala-lang.modules:scala-xml_2.13:2.3.0=zinc +org.scala-lang:scala-compiler:2.13.15=zinc org.scala-lang:scala-library:2.12.20=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath org.scala-lang:scala-library:2.13.1=scalastyle -org.scala-lang:scala-library:2.13.6=zinc +org.scala-lang:scala-library:2.13.15=zinc org.scala-lang:scala-reflect:2.12.17=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-reflect:2.13.6=zinc -org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc -org.scala-sbt:collections_2.13:1.6.1=zinc -org.scala-sbt:compiler-bridge_2.13:1.6.1=zinc -org.scala-sbt:compiler-interface:1.6.1=zinc -org.scala-sbt:core-macros_2.13:1.6.1=zinc -org.scala-sbt:io_2.13:1.6.0=zinc -org.scala-sbt:launcher-interface:1.1.3=zinc +org.scala-lang:scala-reflect:2.13.15=zinc +org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79=zinc +org.scala-sbt:collections_2.13:1.10.4=zinc +org.scala-sbt:compiler-bridge_2.13:1.10.4=zinc +org.scala-sbt:compiler-interface:1.10.4=zinc +org.scala-sbt:core-macros_2.13:1.10.4=zinc +org.scala-sbt:io_2.13:1.10.1=zinc +org.scala-sbt:launcher-interface:1.4.4=zinc org.scala-sbt:sbinary_2.13:0.5.1=zinc -org.scala-sbt:util-control_2.13:1.6.1=zinc -org.scala-sbt:util-interface:1.6.1=zinc -org.scala-sbt:util-logging_2.13:1.6.1=zinc -org.scala-sbt:util-position_2.13:1.6.1=zinc -org.scala-sbt:util-relation_2.13:1.6.1=zinc -org.scala-sbt:zinc-apiinfo_2.13:1.6.1=zinc -org.scala-sbt:zinc-classfile_2.13:1.6.1=zinc -org.scala-sbt:zinc-classpath_2.13:1.6.1=zinc -org.scala-sbt:zinc-compile-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-persist-core-assembly:1.6.1=zinc -org.scala-sbt:zinc-persist_2.13:1.6.1=zinc -org.scala-sbt:zinc_2.13:1.6.1=zinc +org.scala-sbt:util-control_2.13:1.10.4=zinc +org.scala-sbt:util-interface:1.10.4=zinc +org.scala-sbt:util-logging_2.13:1.10.4=zinc +org.scala-sbt:util-position_2.13:1.10.4=zinc +org.scala-sbt:util-relation_2.13:1.10.4=zinc +org.scala-sbt:zinc-apiinfo_2.13:1.10.4=zinc +org.scala-sbt:zinc-classfile_2.13:1.10.4=zinc +org.scala-sbt:zinc-classpath_2.13:1.10.4=zinc +org.scala-sbt:zinc-compile-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-persist-core-assembly:1.10.4=zinc +org.scala-sbt:zinc-persist_2.13:1.10.4=zinc +org.scala-sbt:zinc_2.13:1.10.4=zinc org.scalactic:scalactic_2.12:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scalariform:scalariform_2.13:0.2.10=scalastyle org.scalatest:scalatest-compatible:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -148,4 +149,4 @@ org.scoverage:scalac-scoverage-reporter_2.12:2.3.0=scoverage org.scoverage:scalac-scoverage-runtime_2.12:2.3.0=scoverage org.scoverage:scalac-scoverage-serializer_2.12:2.3.0=scoverage org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor +empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor diff --git a/warp-core/locking/warp-core_2.13.lockfile b/warp-core/locking/warp-core_2.13.lockfile index 39015d75..f7401c3f 100644 --- a/warp-core/locking/warp-core_2.13.lockfile +++ b/warp-core/locking/warp-core_2.13.lockfile @@ -6,10 +6,10 @@ aopalliance:aopalliance:1.0=compileClasspath,default,runtimeClasspath,testCompil ch.qos.logback:logback-classic:1.5.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.5.6=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beautiful-scala:scalastyle_2.13:1.2.0=scalastyle -com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc +com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4=zinc -com.eed3si9n:sjson-new-core_2.13:0.9.1=zinc -com.eed3si9n:sjson-new-scalajson_2.13:0.9.1=zinc +com.eed3si9n:sjson-new-core_2.13:0.10.1=zinc +com.eed3si9n:sjson-new-scalajson_2.13:0.10.1=zinc com.github.dwickern:scala-nameof_2.13:3.0.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -34,7 +34,7 @@ com.squareup.okio:okio-jvm:3.6.0=compileClasspath,default,runtimeClasspath,testC com.squareup.okio:okio:3.6.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:converter-moshi:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.retrofit2:retrofit:2.9.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.swoval:file-tree-views:2.1.7=zinc +com.swoval:file-tree-views:2.1.12=zinc com.typesafe.slick:slick-hikaricp_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle @@ -46,12 +46,12 @@ commons-cli:commons-cli:1.4=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.java-diff-utils:java-diff-utils:4.12=zinc javax.inject:javax.inject:1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.31=default,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=zinc -net.java.dev.jna:jna:5.8.0=zinc -net.openhft:zero-allocation-hashing:0.10.1=zinc +net.java.dev.jna:jna:5.14.0=zinc +net.openhft:zero-allocation-hashing:0.16=zinc net.sf.saxon:Saxon-HE:9.8.0-12=checkstyle org.antlr:antlr4-runtime:4.7.1=checkstyle org.apache.commons:commons-configuration2:2.11.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -65,7 +65,7 @@ org.checkerframework:checker-qual:2.0.0=checkstyle org.checkerframework:checker-qual:3.33.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=checkstyle org.flywaydb:flyway-core:5.2.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.fusesource.jansi:jansi:2.1.0=zinc +org.fusesource.jansi:jansi:2.4.0=zinc org.hamcrest:hamcrest-core:1.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.influxdb:influxdb-java:2.24=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -73,10 +73,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,default,runtimeC org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.9.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jline:jline-terminal-jansi:3.19.0=zinc -org.jline:jline-terminal-jna:3.19.0=zinc -org.jline:jline-terminal:3.19.0=zinc -org.jline:jline:3.19.0=zinc +org.jline:jline-native:3.27.1=zinc +org.jline:jline-terminal-jni:3.27.1=zinc +org.jline:jline-terminal:3.27.1=zinc +org.jline:jline:3.26.3=zinc org.junit.jupiter:junit-jupiter-api:5.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.10.3=testRuntimeClasspath org.junit.platform:junit-platform-commons:1.10.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,36 +92,36 @@ org.scala-lang.modules:scala-collection-compat_2.13:2.12.0=compileClasspath,defa org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=scalastyle,zinc -org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle,zinc +org.scala-lang.modules:scala-xml_2.13:1.2.0=scalastyle org.scala-lang.modules:scala-xml_2.13:2.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage -org.scala-lang:scala-compiler:2.13.6=zinc +org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage,zinc +org.scala-lang:scala-compiler:2.13.15=zinc org.scala-lang:scala-library:2.13.1=scalastyle +org.scala-lang:scala-library:2.13.15=zinc org.scala-lang:scala-library:2.13.16=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-library:2.13.6=zinc org.scala-lang:scala-reflect:2.13.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-reflect:2.13.6=zinc -org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc -org.scala-sbt:collections_2.13:1.6.1=zinc -org.scala-sbt:compiler-bridge_2.13:1.6.1=zinc -org.scala-sbt:compiler-interface:1.6.1=zinc -org.scala-sbt:core-macros_2.13:1.6.1=zinc -org.scala-sbt:io_2.13:1.6.0=zinc -org.scala-sbt:launcher-interface:1.1.3=zinc +org.scala-lang:scala-reflect:2.13.15=zinc +org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79=zinc +org.scala-sbt:collections_2.13:1.10.4=zinc +org.scala-sbt:compiler-bridge_2.13:1.10.4=zinc +org.scala-sbt:compiler-interface:1.10.4=zinc +org.scala-sbt:core-macros_2.13:1.10.4=zinc +org.scala-sbt:io_2.13:1.10.1=zinc +org.scala-sbt:launcher-interface:1.4.4=zinc org.scala-sbt:sbinary_2.13:0.5.1=zinc -org.scala-sbt:util-control_2.13:1.6.1=zinc -org.scala-sbt:util-interface:1.6.1=zinc -org.scala-sbt:util-logging_2.13:1.6.1=zinc -org.scala-sbt:util-position_2.13:1.6.1=zinc -org.scala-sbt:util-relation_2.13:1.6.1=zinc -org.scala-sbt:zinc-apiinfo_2.13:1.6.1=zinc -org.scala-sbt:zinc-classfile_2.13:1.6.1=zinc -org.scala-sbt:zinc-classpath_2.13:1.6.1=zinc -org.scala-sbt:zinc-compile-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-core_2.13:1.6.1=zinc -org.scala-sbt:zinc-persist-core-assembly:1.6.1=zinc -org.scala-sbt:zinc-persist_2.13:1.6.1=zinc -org.scala-sbt:zinc_2.13:1.6.1=zinc +org.scala-sbt:util-control_2.13:1.10.4=zinc +org.scala-sbt:util-interface:1.10.4=zinc +org.scala-sbt:util-logging_2.13:1.10.4=zinc +org.scala-sbt:util-position_2.13:1.10.4=zinc +org.scala-sbt:util-relation_2.13:1.10.4=zinc +org.scala-sbt:zinc-apiinfo_2.13:1.10.4=zinc +org.scala-sbt:zinc-classfile_2.13:1.10.4=zinc +org.scala-sbt:zinc-classpath_2.13:1.10.4=zinc +org.scala-sbt:zinc-compile-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-core_2.13:1.10.4=zinc +org.scala-sbt:zinc-persist-core-assembly:1.10.4=zinc +org.scala-sbt:zinc-persist_2.13:1.10.4=zinc +org.scala-sbt:zinc_2.13:1.10.4=zinc org.scalactic:scalactic_2.13:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.scalariform:scalariform_2.13:0.2.10=scalastyle org.scalatest:scalatest-compatible:3.2.19=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -148,4 +148,4 @@ org.scoverage:scalac-scoverage-reporter_2.13:2.3.0=scoverage org.scoverage:scalac-scoverage-runtime_2.13:2.3.0=scoverage org.scoverage:scalac-scoverage-serializer_2.13:2.3.0=scoverage org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor +empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor From 84a788b65ed8cbb2b46bb7bd4ee665dce69ef302 Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Fri, 11 Jul 2025 19:26:38 -0700 Subject: [PATCH 2/8] run upload for all scala versions --- publish.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish.sh b/publish.sh index 633558ee..450d070d 100755 --- a/publish.sh +++ b/publish.sh @@ -91,5 +91,5 @@ fi if [[ $REPOSITORY = 'sonatype' ]] then - JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew jReleaserDeploy --stacktrace -fi \ No newline at end of file + JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew jReleaserDeploy -PallScalaVersions --stacktrace +fi From 2532ad1fbc9b84919f83f26fa747934eb7775ef0 Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Fri, 11 Jul 2025 19:38:18 -0700 Subject: [PATCH 3/8] account for uselasttag --- publish.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/publish.sh b/publish.sh index 450d070d..c659915d 100755 --- a/publish.sh +++ b/publish.sh @@ -75,6 +75,10 @@ then # then publish our primary module with other scala versions echo "publishing $REPOSITORY artifacts for $RELEASE_SCOPE $RELEASE_TYPE release" ./gradlew -Prelease.useLastTag=true -PallScalaVersions $PUBLISH_TASK + if [[ $REPOSITORY = 'sonatype' ]] + then + JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew -Prelease.useLastTag=true jReleaserDeploy -PallScalaVersions --stacktrace + fi else echo "we are on a personal fork, must release from main (Workday) fork. aborting $RELEASE_TYPE release" exit 1 @@ -89,7 +93,3 @@ else exit 1 fi -if [[ $REPOSITORY = 'sonatype' ]] -then - JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew jReleaserDeploy -PallScalaVersions --stacktrace -fi From 799eb91a2d568e849bcc94e2a4380e3e4c3ecced Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Fri, 11 Jul 2025 19:41:58 -0700 Subject: [PATCH 4/8] jreleaserdeploy should not run only once --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c9f345e8..484f459f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,10 +10,10 @@ scalaVersions=2.12.20,2.13.16 # during releases, we only want to create 1 repo tag. # note that devSnapshot and snapshot tasks won't create repo tags # see https://github.com/ADTRAN/gradle-scala-multiversion-plugin#advanced-configuration -runOnceTasks=candidate,final,release,generateGradleLintReport,jreleaserDeploy +runOnceTasks=candidate,final,release,generateGradleLintReport # prevent publication of SHA256 & SHA512 checksums, which are incompatible with sonatype release repos # see https://github.com/gradle/gradle/issues/11308 systemProp.org.gradle.internal.publish.checksums.insecure=true -showTestStandardStreams=false \ No newline at end of file +showTestStandardStreams=false From ab10adc98bca4dd3feb8520f9feba5de6ced9fe2 Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Fri, 11 Jul 2025 21:17:27 -0700 Subject: [PATCH 5/8] minor debugging --- publish.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/publish.sh b/publish.sh index c659915d..0af84176 100755 --- a/publish.sh +++ b/publish.sh @@ -77,7 +77,8 @@ then ./gradlew -Prelease.useLastTag=true -PallScalaVersions $PUBLISH_TASK if [[ $REPOSITORY = 'sonatype' ]] then - JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew -Prelease.useLastTag=true jReleaserDeploy -PallScalaVersions --stacktrace + echo "uploading staged artifacts" + JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew -Prelease.useLastTag=true -PallScalaVersions jReleaserDeploy --stacktrace fi else echo "we are on a personal fork, must release from main (Workday) fork. aborting $RELEASE_TYPE release" From 296261560950fcc561822477d7c0ceff709951cd Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Sun, 13 Jul 2025 12:13:00 -0700 Subject: [PATCH 6/8] minor dependency cleanup, split eager logger configuration to set bean-utils log level --- .../locking/warp-core-gatling_2.13.lockfile | 7 ++-- .../locking/warp-core-macros_2.13.lockfile | 7 ++-- warp-core/dependencies.gradle | 1 - warp-core/locking/warp-core_2.12.lockfile | 9 +++--- warp-core/locking/warp-core_2.13.lockfile | 9 +++--- .../warp/config/WarpPropertyManager.scala | 8 ++--- .../com/workday/warp/logger/LoggerInit.scala | 32 +++++++++++++++++++ .../com/workday/warp/logger/WarpLogging.scala | 28 +--------------- 8 files changed, 53 insertions(+), 48 deletions(-) create mode 100644 warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala diff --git a/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile b/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile index d2ce695e..3c276c2a 100644 --- a/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile +++ b/warp-core-gatling/locking/warp-core-gatling_2.13.lockfile @@ -59,10 +59,11 @@ com.typesafe.slick:slick-hikaricp_2.13:3.4.1=compileClasspath,default,runtimeCla com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle com.typesafe:config:1.4.2=compileClasspath,testCompileClasspath -com.typesafe:config:1.4.3=default,runtimeClasspath,testRuntimeClasspath +com.typesafe:config:1.4.3=default +com.typesafe:config:1.4.4=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-beanutils:commons-beanutils:1.9.3=checkstyle -commons-beanutils:commons-beanutils:1.9.4=default,runtimeClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.4=default commons-cli:commons-cli:1.4=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,default,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=default,runtimeClasspath,testRuntimeClasspath diff --git a/warp-core-macros/locking/warp-core-macros_2.13.lockfile b/warp-core-macros/locking/warp-core-macros_2.13.lockfile index e9df91c4..f5c63da4 100644 --- a/warp-core-macros/locking/warp-core-macros_2.13.lockfile +++ b/warp-core-macros/locking/warp-core-macros_2.13.lockfile @@ -41,10 +41,11 @@ com.typesafe.slick:slick-hikaricp_2.13:3.4.1=compileClasspath,default,runtimeCla com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle com.typesafe:config:1.4.2=compileClasspath,testCompileClasspath -com.typesafe:config:1.4.3=default,runtimeClasspath,testRuntimeClasspath +com.typesafe:config:1.4.3=default +com.typesafe:config:1.4.4=runtimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-beanutils:commons-beanutils:1.9.3=checkstyle -commons-beanutils:commons-beanutils:1.9.4=default,runtimeClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.4=default commons-cli:commons-cli:1.4=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,default,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=default,runtimeClasspath,testRuntimeClasspath diff --git a/warp-core/dependencies.gradle b/warp-core/dependencies.gradle index b1caeec8..9d799af9 100644 --- a/warp-core/dependencies.gradle +++ b/warp-core/dependencies.gradle @@ -46,7 +46,6 @@ dependencies { implementation "org.scala-lang.modules:scala-java8-compat_%%:${versions.scalaJava8Compat}" implementation 'com.github.dwickern:scala-nameof_%%:3.0.0' - implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' runtimeOnly "com.h2database:h2:${versions.h2}" runtimeOnly "commons-beanutils:commons-beanutils:${versions.beanUtils}" diff --git a/warp-core/locking/warp-core_2.12.lockfile b/warp-core/locking/warp-core_2.12.lockfile index ffdbcf6b..b1233019 100644 --- a/warp-core/locking/warp-core_2.12.lockfile +++ b/warp-core/locking/warp-core_2.12.lockfile @@ -38,12 +38,13 @@ com.swoval:file-tree-views:2.1.12=zinc com.typesafe.slick:slick-hikaricp_2.12:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.slick:slick_2.12:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle -com.typesafe:config:1.4.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.typesafe:config:1.4.3=default +com.typesafe:config:1.4.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-beanutils:commons-beanutils:1.9.3=checkstyle -commons-beanutils:commons-beanutils:1.9.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.4=default commons-cli:commons-cli:1.4=checkstyle -commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-collections:commons-collections:3.2.2=checkstyle,default,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc diff --git a/warp-core/locking/warp-core_2.13.lockfile b/warp-core/locking/warp-core_2.13.lockfile index f7401c3f..f4d8f691 100644 --- a/warp-core/locking/warp-core_2.13.lockfile +++ b/warp-core/locking/warp-core_2.13.lockfile @@ -38,12 +38,13 @@ com.swoval:file-tree-views:2.1.12=zinc com.typesafe.slick:slick-hikaricp_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.0=scalastyle -com.typesafe:config:1.4.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.typesafe:config:1.4.3=default +com.typesafe:config:1.4.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-beanutils:commons-beanutils:1.9.3=checkstyle -commons-beanutils:commons-beanutils:1.9.4=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.4=default commons-cli:commons-cli:1.4=checkstyle -commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-collections:commons-collections:3.2.2=checkstyle,default,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.3.2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc diff --git a/warp-core/src/main/scala/com/workday/warp/config/WarpPropertyManager.scala b/warp-core/src/main/scala/com/workday/warp/config/WarpPropertyManager.scala index 05d85039..5d9bf3e1 100644 --- a/warp-core/src/main/scala/com/workday/warp/config/WarpPropertyManager.scala +++ b/warp-core/src/main/scala/com/workday/warp/config/WarpPropertyManager.scala @@ -3,11 +3,10 @@ package com.workday.warp.config import java.io.File import java.util.Properties import com.workday.warp.inject.WarpGuicer -import com.workday.warp.logger.WarpLogUtils +import com.workday.warp.logger.{LoggerInit, WarpLogUtils} import org.apache.commons.configuration2.PropertiesConfiguration import org.apache.commons.configuration2.builder.fluent.Configurations import org.apache.commons.configuration2.ex.ConfigurationException -import org.slf4j.{Logger, LoggerFactory} import scala.collection.JavaConverters._ import scala.collection.mutable @@ -23,7 +22,7 @@ import scala.util.{Failure, Success, Try} * Created by tomas.mccandless on 10/21/15. * Based on a class created by michael.ottati on 3/29/13 */ -object WarpPropertyManager { +object WarpPropertyManager extends LoggerInit { /** * Properties containing this prefix will be passed through as system properties with this @@ -34,9 +33,6 @@ object WarpPropertyManager { private val WARP_PROPERTIES: String = "warp.properties" private val WARP_CONFIG_DIRECTORY_PROPERTY: String = "wd.warp.config.directory" - @transient - protected lazy val logger: Logger = LoggerFactory.getLogger(getClass.getName) - // immutable copy of jvm system properties val systemProps: Map[String, String] = System.getProperties.asScala.toMap // determine the directory to search for warp configuration files diff --git a/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala b/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala new file mode 100644 index 00000000..ccb99e80 --- /dev/null +++ b/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala @@ -0,0 +1,32 @@ +package com.workday.warp.logger + +import ch.qos.logback.classic.{Level, LoggerContext} +import org.slf4j.{Logger, LoggerFactory} + +import scala.util.{Failure, Try} + +trait LoggerInit { + + // early configuration of this log level to + // Prevent spurious log entries from commons-beanutils library, which is a transitive dependency. + getLoggerContext.foreach(_.getLogger("org.apache.commons.beanutils.converters").setLevel(Level.INFO)) + + /** + * Retrieve the LoggerContext as a Try from the ILoggerFactory. + * + * Because we want to programmatically configure the logger, we need some methods only available via logback rather + * than slf4j. This necessitates a cast, however if slf4j is bound at runtime to some concrete implementation other + * than logback (e.g., slf4j-simple), this fails. Configuration will fallback to the default for that implementation. + * + * @return Try[LoggerContext] + */ + def getLoggerContext: Try[LoggerContext] = { + Try(LoggerFactory.getILoggerFactory.asInstanceOf[LoggerContext]).recoverWith { case e => + logger.warn("Could not cast to logback LoggerContext at runtime, logger will run with default configuration") + Failure(e) + } + } + + @transient + protected lazy val logger: Logger = LoggerFactory.getLogger(getClass.getName) +} diff --git a/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala b/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala index 08cfd08d..8437c278 100644 --- a/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala +++ b/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala @@ -1,37 +1,11 @@ package com.workday.warp.logger -import ch.qos.logback.classic.{Level, LoggerContext} import com.workday.warp.config.WarpPropertyManager -import org.slf4j.{Logger, LoggerFactory} -import scala.util.{Failure, Try} - -trait WarpLogging { - - // Prevent spurious log entries from commons-beanutils library, which is a transitive dependency. - getLoggerContext.foreach(_.getLogger("org.apache.commons.beanutils.converters").setLevel(Level.INFO)) +trait WarpLogging extends LoggerInit { // Initializes properties for use in logger configuration WarpPropertyManager.version - - /** - * Retrieve the LoggerContext as a Try from the ILoggerFactory. - * - * Because we want to programmatically configure the logger, we need some methods only available via logback rather - * than slf4j. This necessitates a cast, however if slf4j is bound at runtime to some concrete implementation other - * than logback (e.g., slf4j-simple), this fails. Configuration will fallback to the default for that implementation. - * - * @return Try[LoggerContext] - */ - def getLoggerContext: Try[LoggerContext] = { - Try(LoggerFactory.getILoggerFactory.asInstanceOf[LoggerContext]).recoverWith { case e => - logger.warn("Could not cast to logback LoggerContext at runtime, logger will run with default configuration") - Failure(e) - } - } - - @transient - protected lazy val logger: Logger = LoggerFactory.getLogger(getClass.getName) } class WarpLoggingWrapper extends WarpLogging \ No newline at end of file From fd8b406756e5761aeb284e8746647c5178c96802 Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Sun, 13 Jul 2025 21:10:04 -0700 Subject: [PATCH 7/8] make jreleaser stage soft --- publish.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/publish.sh b/publish.sh index 0af84176..f2eddf22 100755 --- a/publish.sh +++ b/publish.sh @@ -78,7 +78,11 @@ then if [[ $REPOSITORY = 'sonatype' ]] then echo "uploading staged artifacts" - JRELEASER_MAVENCENTRAL_STAGE=UPLOAD ./gradlew -Prelease.useLastTag=true -PallScalaVersions jReleaserDeploy --stacktrace + # can also set to "publish" or "full" + # see https://jreleaser.org/guide/latest/reference/deploy/maven/maven-central.html + JRELEASER_MAVENCENTRAL_STAGE=${JRELEASER_MAVENCENTRAL_STAGE:-upload} + export JRELEASER_MAVENCENTRAL_STAGE + ./gradlew -Prelease.useLastTag=true -PallScalaVersions jReleaserDeploy --stacktrace fi else echo "we are on a personal fork, must release from main (Workday) fork. aborting $RELEASE_TYPE release" From 4b63adccf319c67e146347537d6b81088a3d61be Mon Sep 17 00:00:00 2001 From: tomas mccandless Date: Mon, 14 Jul 2025 09:12:11 -0700 Subject: [PATCH 8/8] minor doc updates --- .../src/main/scala/com/workday/warp/logger/LoggerInit.scala | 5 +++++ .../main/scala/com/workday/warp/logger/WarpLogging.scala | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala b/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala index ccb99e80..603db2d4 100644 --- a/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala +++ b/warp-core/src/main/scala/com/workday/warp/logger/LoggerInit.scala @@ -5,6 +5,11 @@ import org.slf4j.{Logger, LoggerFactory} import scala.util.{Failure, Try} +/** + * Preconfiguration of the logger context to set log levels and prevent spurious log entries. + * This trait is intended to quiesce debug entries from transitive dependencies that occur in the early stages of initialization + * before we have had a chance to configure the logger properly. + */ trait LoggerInit { // early configuration of this log level to diff --git a/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala b/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala index 8437c278..a98ab097 100644 --- a/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala +++ b/warp-core/src/main/scala/com/workday/warp/logger/WarpLogging.scala @@ -2,6 +2,12 @@ package com.workday.warp.logger import com.workday.warp.config.WarpPropertyManager +/** + * Trait that initializes the logger configuration for Warp. + * It sets up the logger context and initializes properties for use in logger configuration. + * + * This trait is intended to be mixed into classes that require logging capabilities. + */ trait WarpLogging extends LoggerInit { // Initializes properties for use in logger configuration