Merge branch '3.x' into 4.x

Author: jknack

docs/asciidoc/routing.adoc

@@ -467,7 +467,7 @@ interface Filter {
 ----
 {
   /** Kotlin uses implicit variables: `ctx` and `next` */
-  filter {
+  use {
     val start = System.currentTimeMillis()  // <1>
 
     val response = next.apply(ctx)          // <2>
@@ -1014,14 +1014,14 @@ A `scoped filter` looks like:
 ----
 {
   // Increment +1
-  filter {
+  use {
     val n = next.apply(ctx) as Int
     return 1 + n
   }
 
   routes {                                // <1>
     // Multiply by 2
-    filter {
+    use {
       val n = next.apply(ctx) as Int
       2 * n
     }

jooby/pom.xml

@@ -71,7 +71,7 @@
 
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
+      <artifactId>okhttp-jvm</artifactId>
       <scope>test</scope>
     </dependency>
 

modules/jooby-avaje-inject/pom.xml

@@ -65,7 +65,7 @@
 
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
+      <artifactId>okhttp-jvm</artifactId>
       <scope>test</scope>
     </dependency>
 

modules/jooby-awssdk-v2/pom.xml

@@ -12,7 +12,7 @@
   <name>jooby-awssdk-v2</name>
 
   <properties>
-    <aws.java.sdk.version>2.31.73</aws.java.sdk.version>
+    <aws.java.sdk.version>2.31.77</aws.java.sdk.version>
   </properties>
 
   <dependencyManagement>

modules/jooby-swagger-ui/package-lock.json

@@ -4,7 +4,7 @@
   "private": true,
   "license": "ASF",
   "dependencies": {
-    "swagger-ui-dist": "^5.25.3"
+    "swagger-ui-dist": "^5.26.0"
   },
   "scarfSettings": {
     "enabled": false

modules/jooby-swagger-ui/package.json

@@ -57,7 +57,7 @@
 
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
+      <artifactId>okhttp-jvm</artifactId>
       <scope>test</scope>
     </dependency>
 

modules/jooby-test/pom.xml

@@ -106,7 +106,7 @@
 
     <!-- Server -->
     <undertow.version>2.3.18.Final</undertow.version>
-    <jetty.version>12.0.22</jetty.version>
+    <jetty.version>12.0.23</jetty.version>
     <netty.version>4.2.2.Final</netty.version>
 
     <!--OpenAPI-->
@@ -129,7 +129,7 @@
     <spotbugs-annotations.version>4.9.3</spotbugs-annotations.version>
 
     <!-- Misc -->
-    <okhttp.version>4.12.0</okhttp.version>
+    <okhttp.version>5.0.0</okhttp.version>
     <jsonwebtoken.version>0.12.6</jsonwebtoken.version>
     <pac4j.version>6.1.3</pac4j.version>
     <quartz.version>2.5.0</quartz.version>
@@ -148,7 +148,7 @@
 
     <!-- Test dependencies -->
     <jacoco.version>0.8.13</jacoco.version>
-    <junit.version>5.13.2</junit.version>
+    <junit.version>5.13.3</junit.version>
     <rest-assured.version>5.5.5</rest-assured.version>
     <assertj-core.version>3.27.3</assertj-core.version>
     <mockito.version>5.18.0</mockito.version>
@@ -171,8 +171,8 @@
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
     <maven-core.version>3.9.10</maven-core.version>
     <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
-    <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-    <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+    <maven-enforcer-plugin.version>3.6.0</maven-enforcer-plugin.version>
+    <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
     <archetype-packaging.version>3.2.1</archetype-packaging.version>
@@ -929,7 +929,7 @@
       <!-- OKHttp -->
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp</artifactId>
+        <artifactId>okhttp-jvm</artifactId>
         <version>${okhttp.version}</version>
       </dependency>
 

pom.xml

@@ -198,7 +198,7 @@
 
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
+      <artifactId>okhttp-jvm</artifactId>
       <scope>test</scope>
     </dependency>