upgrade dependencies. add new dual publishing

http4k · Oct 25, 2024 · 4f3c7e5 · 4f3c7e5
1 parent a07202c
commit 4f3c7e5
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/.github/workflows/upload_release.yaml b/.github/workflows/upload_release.yaml
@@ -6,7 +6,7 @@ name: Publish Artifacts
 env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 jobs:
-  ReleaseMC:
+  Release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -22,16 +22,18 @@ jobs:
           cache: gradle
       - name: Upload to Sonatype
         run: |
-          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository \
-          -Psign=true \
-          -PreleaseVersion="${{ steps.tagName.outputs.tag }}" \
-          -PsigningKey="${{ secrets.SIGNING_KEY }}" \
-          -PsigningPassword="${{ secrets.SIGNING_PASSWORD }}" \
-          -PnexusUsername="${{ secrets.NEXUS_USERNAME }}" \
-          -PnexusPassword="${{ secrets.NEXUS_PASSWORD }}"
+            ./gradlew publish publishToSonatype closeAndReleaseSonatypeStagingRepository \
+            -Psign=true \
+            -PreleaseVersion="${{ steps.tagName.outputs.tag }}" \
+            -PsigningKey="${{ secrets.SIGNING_KEY }}" \
+            -PsigningPassword="${{ secrets.SIGNING_PASSWORD }}" \
+            -PltsUsername="${{ secrets.LTS_USERNAME }}" \
+            -PltsPassword="${{ secrets.LTS_PASSWORD }}" \
+            -PnexusUsername="${{ secrets.NEXUS_USERNAME }}" \
+            -PnexusPassword="${{ secrets.NEXUS_PASSWORD }}"
   broadcast-release:
     needs:
-      - ReleaseMC
+      - Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 This list is not intended to be all-encompassing - it will document major and breaking API 
 changes with their rationale when appropriate. Given version `A.B.C.D`, breaking changes are to be expected in version number increments where changes in the `A` or `B` sections:
 
+### v5.25.1.0 (uncut)
+- **http4k-connect-*** - Upgrade dependencies
+
 ### v5.25.0.0
 - **http4k-connect-*** - Upgrade dependencies
 - **http4k-connect*** : [Unlikely break] Tightened up nullable types and data class constructor visibility on various APIs

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,6 +4,7 @@ import groovy.util.Node
 import org.gradle.api.JavaVersion.VERSION_1_8
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+import java.net.URI
 import java.time.Duration
 
 plugins {
@@ -238,6 +239,20 @@ subprojects {
         }
 
         publishing {
+            repositories {
+                maven {
+                    url = URI("s3://http4k-lts/maven2")
+
+                    val ltsUsername: String? by project
+                    val ltsPassword: String? by project
+
+                    credentials(AwsCredentials::class.java) {
+                        accessKey = ltsUsername
+                        secretKey = ltsPassword
+                    }
+                }
+            }
+
             val javaComponent = components["java"] as AdhocComponentWithVariants
 
             javaComponent.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }

diff --git a/versions.properties b/versions.properties
@@ -31,7 +31,7 @@ version.dev.forkhandles..forkhandles-bom=2.20.0.0
 
 version.dev.langchain4j..langchain4j=0.35.0
 
-version.http4k=5.32.3.0
+version.http4k=5.33.0.0
 
 version.joda-time..joda-time=2.13.0
 
@@ -60,17 +60,19 @@ version.jetbrains.exposed=0.41.1
 
 version.org.apache.avro..avro=1.12.0
 
-version.junit=5.11.2
+version.junit=5.11.3
 
-version.junit.jupiter=5.11.2
+version.junit.jupiter=5.11.3
 
+# blocked - Java 11 (via KSP) - 2.0.20
 version.kotlin=2.0.20
 
 version.org.bitbucket.b_c..jose4j=0.9.6
 
 version.org.bouncycastle..bcprov-jdk18on=1.78.1
 
 version.kotlinpoet=1.18.1
+##     # available=2.0.0
 
 # blocked - Java 8 - 1.13.8
 version.mockk=1.13.7
@@ -79,21 +81,22 @@ version.mockk=1.13.7
 ### available=1.13.10
 ### available=1.13.11
 ### available=1.13.12
+### available=1.13.13
 
-version.org.testcontainers..testcontainers-bom=1.20.2
+version.org.testcontainers..testcontainers-bom=1.20.3
 
 version.org.webjars..swagger-ui=5.17.14
 
 version.se.ansman.kotshi..api=3.0.0
 
 version.se.ansman.kotshi..compiler=3.0.0
 
-version.software.amazon.awssdk..bom=2.28.16
+version.software.amazon.awssdk..bom=2.29.0
 
 version.com.nimbusds..nimbus-jose-jwt=9.41.2
 
 version.dev.langchain4j..langchain4j-core=0.35.0
 
-version.software.amazon.awssdk..s3=2.28.16
+version.software.amazon.awssdk..s3=2.29.0
 
-version.software.amazon.awssdk..sqs=2.28.16
+version.software.amazon.awssdk..sqs=2.29.0