diff --git a/jooby/pom.xml b/jooby/pom.xml index f65182c6ff..d0019dceb7 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 4.5.2 + 4.5.3 jooby jooby diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index c01b470134..bec89a3a8a 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-apt jooby-apt diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/mcp/McpRoute.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/mcp/McpRoute.java index 6d99dfa679..2d0260ffd8 100644 --- a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/mcp/McpRoute.java +++ b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/mcp/McpRoute.java @@ -723,18 +723,24 @@ private List generateToolDefinition(boolean kt) { buffer.add( statement( indent(6), - "return io.modelcontextprotocol.spec.McpSchema.Tool(", + "return io.modelcontextprotocol.spec.McpSchema.Tool.builder(", string(toolName), - ", ", + ", this.json.convertValue(schema, java.util.Map::class.java) as java.util.Map)", + ".title(", titleArg, - ", ", + ")", + ".description(", string(description), - ", this.json.convertValue(schema," - + " io.modelcontextprotocol.spec.McpSchema.JsonSchema::class.java), ", + ")", + ".outputSchema(", outputSchemaArg, - ", ", + ")", + ".annotations(", annotationsArg, - ", null)")); + ")", + ".build()")); + } else { if (toolAnnotation != null) { annotationsArg = "annotations"; @@ -760,18 +766,22 @@ private List generateToolDefinition(boolean kt) { buffer.add( statement( indent(6), - "return new io.modelcontextprotocol.spec.McpSchema.Tool(", + "return io.modelcontextprotocol.spec.McpSchema.Tool.builder(", string(toolName), - ", ", + ", this.json.convertValue(schema, java.util.Map.class))", + ".title(", titleArg, - ", ", + ")", + ".description(", string(description), - ", this.json.convertValue(schema," - + " io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), ", + ")", + ".outputSchema(", outputSchemaArg, - ", ", + ")", + ".annotations(", annotationsArg, - ", null)", + ")", + ".build()", semicolon(kt))); } buffer.add(statement(indent(4), "}\n")); diff --git a/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java b/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java index 588a2b6f51..ddcf055555 100644 --- a/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java +++ b/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java @@ -125,7 +125,7 @@ private io.modelcontextprotocol.spec.McpSchema.Tool addToolSpec(com.github.victo props.put("b", schema_b); req.add("b"); var annotations = new io.modelcontextprotocol.spec.McpSchema.ToolAnnotations("Add two numbers.A simple calculator.", true, true, false, true, null); - return new io.modelcontextprotocol.spec.McpSchema.Tool("calculator", "Add two numbers.", "A simple calculator.", this.json.convertValue(schema, io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), null, annotations, null); + return io.modelcontextprotocol.spec.McpSchema.Tool.builder("calculator", this.json.convertValue(schema, java.util.Map.class)).title("Add two numbers.").description("A simple calculator.").outputSchema(null).annotations(annotations).build(); } private io.modelcontextprotocol.spec.McpSchema.CallToolResult add(io.modelcontextprotocol.server.McpSyncServerExchange exchange, io.modelcontextprotocol.common.McpTransportContext transportContext, io.jooby.mcp.McpOperation operation) { diff --git a/modules/jooby-apt/src/test/java/tests/i3830/OutputSchemaTest.java b/modules/jooby-apt/src/test/java/tests/i3830/OutputSchemaTest.java index d56bd7e507..36e5804d55 100644 --- a/modules/jooby-apt/src/test/java/tests/i3830/OutputSchemaTest.java +++ b/modules/jooby-apt/src/test/java/tests/i3830/OutputSchemaTest.java @@ -28,7 +28,7 @@ private io.modelcontextprotocol.spec.McpSchema.Tool schemaOffToolSpec(com.github schema.put("properties", props); var req = new java.util.ArrayList(); schema.put("required", req); - return new io.modelcontextprotocol.spec.McpSchema.Tool("schemaOff", null, null, this.json.convertValue(schema, io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), null, null, null); + return io.modelcontextprotocol.spec.McpSchema.Tool.builder("schemaOff", this.json.convertValue(schema, java.util.Map.class)).title(null).description(null).outputSchema(null).annotations(null).build(); } """); }); @@ -56,7 +56,7 @@ private io.modelcontextprotocol.spec.McpSchema.Tool schemaMapToolSpec(com.github schemaMapOutputSchemaWrapped.put("type", "object"); schemaMapOutputSchemaWrapped.put("additionalProperties", schemaMapOutputSchemaMap); schemaMapOutputSchema = schemaMapOutputSchemaWrapped; - return new io.modelcontextprotocol.spec.McpSchema.Tool("schemaMap", null, null, this.json.convertValue(schema, io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), schemaMapOutputSchema, null, null); + return io.modelcontextprotocol.spec.McpSchema.Tool.builder("schemaMap", this.json.convertValue(schema, java.util.Map.class)).title(null).description(null).outputSchema(schemaMapOutputSchema).annotations(null).build(); } """); }); @@ -84,7 +84,7 @@ private io.modelcontextprotocol.spec.McpSchema.Tool schemaListToolSpec(com.githu schemaListOutputSchemaWrapped.put("type", "array"); schemaListOutputSchemaWrapped.put("items", schemaListOutputSchemaMap); schemaListOutputSchema = schemaListOutputSchemaWrapped; - return new io.modelcontextprotocol.spec.McpSchema.Tool("schemaList", null, null, this.json.convertValue(schema, io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), schemaListOutputSchema, null, null); + return io.modelcontextprotocol.spec.McpSchema.Tool.builder("schemaList", this.json.convertValue(schema, java.util.Map.class)).title(null).description(null).outputSchema(schemaListOutputSchema).annotations(null).build(); } """); }); @@ -109,7 +109,7 @@ private io.modelcontextprotocol.spec.McpSchema.Tool explicitSchemaToolSpec(com.g var explicitSchemaOutputSchemaNode = schemaGenerator.generateSchema(tests.i3830.Pet.class); var explicitSchemaOutputSchemaMap = this.json.convertValue(explicitSchemaOutputSchemaNode, java.util.Map.class); explicitSchemaOutputSchema = explicitSchemaOutputSchemaMap; - return new io.modelcontextprotocol.spec.McpSchema.Tool("explicitSchema", null, null, this.json.convertValue(schema, io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), explicitSchemaOutputSchema, null, null); + return io.modelcontextprotocol.spec.McpSchema.Tool.builder("explicitSchema", this.json.convertValue(schema, java.util.Map.class)).title(null).description(null).outputSchema(explicitSchemaOutputSchema).annotations(null).build(); } """); }); @@ -136,7 +136,7 @@ private io.modelcontextprotocol.spec.McpSchema.Tool defaultSchemaToolSpec(com.gi var defaultSchemaOutputSchemaMap = this.json.convertValue(defaultSchemaOutputSchemaNode, java.util.Map.class); defaultSchemaOutputSchema = defaultSchemaOutputSchemaMap; } - return new io.modelcontextprotocol.spec.McpSchema.Tool("defaultSchema", null, null, this.json.convertValue(schema, io.modelcontextprotocol.spec.McpSchema.JsonSchema.class), defaultSchemaOutputSchema, null, null); + return io.modelcontextprotocol.spec.McpSchema.Tool.builder("defaultSchema", this.json.convertValue(schema, java.util.Map.class)).title(null).description(null).outputSchema(defaultSchemaOutputSchema).annotations(null).build(); } """); }); diff --git a/modules/jooby-avaje-inject/pom.xml b/modules/jooby-avaje-inject/pom.xml index 1f57f7b98c..52b47d4a4b 100644 --- a/modules/jooby-avaje-inject/pom.xml +++ b/modules/jooby-avaje-inject/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-avaje-inject jooby-avaje-inject diff --git a/modules/jooby-avaje-jsonb/pom.xml b/modules/jooby-avaje-jsonb/pom.xml index 52c35863e6..709a0083ff 100644 --- a/modules/jooby-avaje-jsonb/pom.xml +++ b/modules/jooby-avaje-jsonb/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-avaje-jsonb jooby-avaje-jsonb diff --git a/modules/jooby-avaje-validator/pom.xml b/modules/jooby-avaje-validator/pom.xml index c8aeefbd99..cae9dbbb49 100644 --- a/modules/jooby-avaje-validator/pom.xml +++ b/modules/jooby-avaje-validator/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-avaje-validator jooby-avaje-validator diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index a8e869e768..01fa3e5d90 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-awssdk-v1 jooby-awssdk-v1 diff --git a/modules/jooby-awssdk-v2/pom.xml b/modules/jooby-awssdk-v2/pom.xml index e9d776a3d9..11350e39eb 100644 --- a/modules/jooby-awssdk-v2/pom.xml +++ b/modules/jooby-awssdk-v2/pom.xml @@ -6,13 +6,13 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-awssdk-v2 jooby-awssdk-v2 - 2.44.12 + 2.46.17 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 2152deedf9..e4b66b6927 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -7,14 +7,14 @@ io.jooby modules - 4.5.2 + 4.5.3 io.jooby jooby-bom jooby-bom pom - 4.5.2 + 4.5.3 Jooby (Bill of Materials) https://jooby.io diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index fbf36feda1..144d6f121f 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-caffeine jooby-caffeine diff --git a/modules/jooby-camel/pom.xml b/modules/jooby-camel/pom.xml index 5cf3d89de0..6afc6e7249 100644 --- a/modules/jooby-camel/pom.xml +++ b/modules/jooby-camel/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-camel jooby-camel diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index b925ed9bb5..e82d786b9a 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,14 +6,14 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-cli jooby-cli io.jooby.cli - 3.30.13 + 3.30.14 4.7.7 ${project.build.outputDirectory}${file.separator}dependencies.properties diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 2d8747c9a3..9fdc9f10c7 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-commons-email jooby-commons-email diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index cf12753948..2e569ff3b5 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-conscrypt jooby-conscrypt diff --git a/modules/jooby-db-scheduler/pom.xml b/modules/jooby-db-scheduler/pom.xml index eb1468a19a..b8cb8f4d37 100644 --- a/modules/jooby-db-scheduler/pom.xml +++ b/modules/jooby-db-scheduler/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-db-scheduler jooby-db-scheduler diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index de9fec61ad..cc8f0bf6d1 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-distribution jooby-distribution diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index bc6a582da0..a1fd13a52d 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-ebean jooby-ebean diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index e844ec4c95..9350852d68 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-flyway jooby-flyway diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 1124e73891..400116d9bc 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-freemarker jooby-freemarker diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index ead895f366..59bb6c71b0 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-gradle-setup jooby-gradle-setup diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index cd325e43f0..6483f86fbc 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-graphiql jooby-graphiql diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 6a07370ee4..32df826bf0 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-graphql jooby-graphql diff --git a/modules/jooby-grpc/pom.xml b/modules/jooby-grpc/pom.xml index b9b293bec9..9120353008 100644 --- a/modules/jooby-grpc/pom.xml +++ b/modules/jooby-grpc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-grpc jooby-grpc diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 6cec4cddcd..523bc144aa 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-gson jooby-gson diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 2f24fe07dd..e27d68c3a3 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-guice jooby-guice diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index e1bbac2dc1..de9a52f03d 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-handlebars jooby-handlebars diff --git a/modules/jooby-hibernate-validator/pom.xml b/modules/jooby-hibernate-validator/pom.xml index af4f940fa4..3a07238462 100644 --- a/modules/jooby-hibernate-validator/pom.xml +++ b/modules/jooby-hibernate-validator/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-hibernate-validator jooby-hibernate-validator diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 568db5d6be..48c08bb405 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-hibernate jooby-hibernate diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index b8b84095b0..446143ca41 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-hikari jooby-hikari diff --git a/modules/jooby-hikari/src/main/java/io/jooby/hikari/HikariModule.java b/modules/jooby-hikari/src/main/java/io/jooby/hikari/HikariModule.java index 7d3bc8560b..ded0546eab 100644 --- a/modules/jooby-hikari/src/main/java/io/jooby/hikari/HikariModule.java +++ b/modules/jooby-hikari/src/main/java/io/jooby/hikari/HikariModule.java @@ -309,7 +309,7 @@ private static Map defaults(String database, Environment env) { defaults.put("dataSourceClassName", "org.hsqldb.jdbc.JDBCDataSource"); case "mariadb" -> // url jdbc:mariadb://:/?=&=... - defaults.put("dataSourceClassName", "org.mariadb.jdbc.MySQLDataSource"); + defaults.put("dataSourceClassName", "org.mariadb.jdbc.MariaDbDataSource"); case "mysql" -> { // url jdbc:mysql://:/?=&=... // 6.x diff --git a/modules/jooby-hikari/src/test/java/io/jooby/hikari/HikariModuleTest.java b/modules/jooby-hikari/src/test/java/io/jooby/hikari/HikariModuleTest.java index 203e5099cc..1a0e3facde 100644 --- a/modules/jooby-hikari/src/test/java/io/jooby/hikari/HikariModuleTest.java +++ b/modules/jooby-hikari/src/test/java/io/jooby/hikari/HikariModuleTest.java @@ -386,7 +386,7 @@ public void databaseType() { assertEquals("foo", HikariModule.databaseType("foo")); } - private Config mapOf(String... values) { + public static Config mapOf(String... values) { Map hash = new HashMap<>(); for (int i = 0; i < values.length; i += 2) { hash.put(values[i], values[i + 1]); diff --git a/modules/jooby-hikari/src/test/java/io/jooby/hikari/Issue3971.java b/modules/jooby-hikari/src/test/java/io/jooby/hikari/Issue3971.java new file mode 100644 index 0000000000..42224b979e --- /dev/null +++ b/modules/jooby-hikari/src/test/java/io/jooby/hikari/Issue3971.java @@ -0,0 +1,35 @@ +/* + * Jooby https://jooby.io + * Apache License Version 2.0 https://jooby.io/LICENSE.txt + * Copyright 2014 Edgar Espina + */ +package io.jooby.hikari; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; + +import com.zaxxer.hikari.HikariConfig; +import io.jooby.Environment; + +public class Issue3971 { + @Test + public void shouldSetMariaDbDatasource() { + HikariConfig conf = + HikariModule.build( + new Environment( + getClass().getClassLoader(), + HikariModuleTest.mapOf( + "db.url", "jdbc:mariadb://localhost/db", "db.user", "root", "db.password", ""), + "test"), + "db"); + assertEquals("org.mariadb.jdbc.MariaDbDataSource", conf.getDataSourceClassName()); + assertEquals(null, conf.getJdbcUrl()); + assertEquals("mariadb.db", conf.getPoolName()); + assertNotNull(conf.getDataSourceProperties()); + assertEquals("root", conf.getUsername()); + assertEquals("", conf.getPassword()); + assertEquals("jdbc:mariadb://localhost/db", conf.getDataSourceProperties().getProperty("url")); + } +} diff --git a/modules/jooby-htmx/pom.xml b/modules/jooby-htmx/pom.xml index 22bdf91fc1..d8df8016e9 100644 --- a/modules/jooby-htmx/pom.xml +++ b/modules/jooby-htmx/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-htmx jooby-htmx diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index f11880d6d1..47b68cb59a 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jackson jooby-jackson diff --git a/modules/jooby-jackson3/pom.xml b/modules/jooby-jackson3/pom.xml index 95dcaf2c84..2879a8b694 100644 --- a/modules/jooby-jackson3/pom.xml +++ b/modules/jooby-jackson3/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jackson3 jooby-jackson3 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 8f848d77b1..2fbb450535 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jasypt jooby-jasypt diff --git a/modules/jooby-javadoc/pom.xml b/modules/jooby-javadoc/pom.xml index c147d38200..fad56dddbd 100644 --- a/modules/jooby-javadoc/pom.xml +++ b/modules/jooby-javadoc/pom.xml @@ -8,7 +8,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-javadoc jooby-javadoc @@ -29,7 +29,7 @@ com.puppycrawl.tools checkstyle - 13.4.2 + 13.7.0 org.codehaus.plexus diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index bc039a1cf0..2bf80f89ff 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jdbi jooby-jdbi diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 58bc5f6b15..79150f9af3 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jetty jooby-jetty diff --git a/modules/jooby-jsonrpc-avaje-jsonb/pom.xml b/modules/jooby-jsonrpc-avaje-jsonb/pom.xml index bfb5d6f2f4..d1a26f124e 100644 --- a/modules/jooby-jsonrpc-avaje-jsonb/pom.xml +++ b/modules/jooby-jsonrpc-avaje-jsonb/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jsonrpc-avaje-jsonb diff --git a/modules/jooby-jsonrpc-jackson2/pom.xml b/modules/jooby-jsonrpc-jackson2/pom.xml index 129f11a694..5bafa94ff4 100644 --- a/modules/jooby-jsonrpc-jackson2/pom.xml +++ b/modules/jooby-jsonrpc-jackson2/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jsonrpc-jackson2 diff --git a/modules/jooby-jsonrpc-jackson3/pom.xml b/modules/jooby-jsonrpc-jackson3/pom.xml index deadc5d41d..7298f0bbc3 100644 --- a/modules/jooby-jsonrpc-jackson3/pom.xml +++ b/modules/jooby-jsonrpc-jackson3/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jsonrpc-jackson3 diff --git a/modules/jooby-jsonrpc/pom.xml b/modules/jooby-jsonrpc/pom.xml index aab56a1672..d86f37da70 100644 --- a/modules/jooby-jsonrpc/pom.xml +++ b/modules/jooby-jsonrpc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jsonrpc diff --git a/modules/jooby-jstachio/pom.xml b/modules/jooby-jstachio/pom.xml index 70f9fceb89..666aa03ae5 100644 --- a/modules/jooby-jstachio/pom.xml +++ b/modules/jooby-jstachio/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jstachio jooby-jstachio diff --git a/modules/jooby-jte/pom.xml b/modules/jooby-jte/pom.xml index e99b71f276..4fabee4515 100644 --- a/modules/jooby-jte/pom.xml +++ b/modules/jooby-jte/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jte jooby-jte diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 316cab8419..9b48c38a7a 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-jwt jooby-jwt diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 7cf011955b..c7342df738 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-kafka jooby-kafka diff --git a/modules/jooby-kotlin/pom.xml b/modules/jooby-kotlin/pom.xml index 069b338083..c0cd060bb0 100644 --- a/modules/jooby-kotlin/pom.xml +++ b/modules/jooby-kotlin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-kotlin jooby-kotlin @@ -50,7 +50,7 @@ io.mockk mockk-jvm - 1.14.9 + 1.14.11 test diff --git a/modules/jooby-langchain4j/pom.xml b/modules/jooby-langchain4j/pom.xml index a9513bc801..84cc934b60 100644 --- a/modules/jooby-langchain4j/pom.xml +++ b/modules/jooby-langchain4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-langchain4j jooby-langchain4j @@ -73,7 +73,7 @@ dev.langchain4j langchain4j-bom - 1.15.0 + 1.17.0 pom import diff --git a/modules/jooby-log4j/pom.xml b/modules/jooby-log4j/pom.xml index 4fa99cf4d2..253ad9c9e2 100644 --- a/modules/jooby-log4j/pom.xml +++ b/modules/jooby-log4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-log4j jooby-log4j diff --git a/modules/jooby-logback/pom.xml b/modules/jooby-logback/pom.xml index 5266b3c301..574c7edb09 100644 --- a/modules/jooby-logback/pom.xml +++ b/modules/jooby-logback/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-logback jooby-logback diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index d0c3406b0e..185781b650 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-maven-plugin jooby-maven-plugin diff --git a/modules/jooby-mcp-jackson2/pom.xml b/modules/jooby-mcp-jackson2/pom.xml index a4ee43958d..5cf5be6530 100644 --- a/modules/jooby-mcp-jackson2/pom.xml +++ b/modules/jooby-mcp-jackson2/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-mcp-jackson2 diff --git a/modules/jooby-mcp-jackson3/pom.xml b/modules/jooby-mcp-jackson3/pom.xml index 2405631a09..cedcb3111d 100644 --- a/modules/jooby-mcp-jackson3/pom.xml +++ b/modules/jooby-mcp-jackson3/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-mcp-jackson3 diff --git a/modules/jooby-mcp/pom.xml b/modules/jooby-mcp/pom.xml index 254a367e6c..fe264d0c09 100644 --- a/modules/jooby-mcp/pom.xml +++ b/modules/jooby-mcp/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-mcp diff --git a/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/McpExecutor.java b/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/McpExecutor.java index e6e85693ea..3bcf22d94e 100644 --- a/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/McpExecutor.java +++ b/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/McpExecutor.java @@ -41,19 +41,20 @@ public McpExecutor(Jooby application) { if (SneakyThrows.isFatal(cause)) { throw SneakyThrows.propagate(cause); } + var errorMessage = + cause.getMessage() != null + ? cause.getMessage() + : "execution of " + operation.getId() + " resulted in exception"; var code = toMcpErrorCode(cause); if (operation.isTool()) { // Tool error - var errorMessage = - cause.getMessage() != null ? cause.getMessage() : "Unknown error occurred"; - var textContent = new McpSchema.TextContent(errorMessage); + var textContent = McpSchema.TextContent.builder(errorMessage).build(); return McpSchema.CallToolResult.builder().addContent(textContent).isError(true).build(); } if (cause instanceof McpError mcpError) { throw mcpError; } else { - throw new McpError( - new McpSchema.JSONRPCResponse.JSONRPCError(code, cause.getMessage(), null)); + throw new McpError(new McpSchema.JSONRPCResponse.JSONRPCError(code, errorMessage, null)); } } } diff --git a/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/transport/SendError.java b/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/transport/SendError.java index 1e10cd33ac..9a9a4e061f 100644 --- a/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/transport/SendError.java +++ b/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/transport/SendError.java @@ -127,7 +127,7 @@ public static Context error(Context ctx, StatusCode statusCode, int errCode, Str } private static McpSchema.JSONRPCResponse err(McpSchema.JSONRPCResponse.JSONRPCError err) { - return new McpSchema.JSONRPCResponse(McpSchema.JSONRPC_VERSION, null, null, err); + return new McpSchema.JSONRPCResponse(McpSchema.JSONRPC_VERSION, err.code(), null, err); } private static Context send(Context ctx, McpSchema.JSONRPCResponse err) { diff --git a/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/McpExecutorTest.java b/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/McpExecutorTest.java index f283050240..95a2ee6ac8 100644 --- a/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/McpExecutorTest.java +++ b/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/McpExecutorTest.java @@ -125,7 +125,8 @@ void testToolErrorWithNullMessage() throws Throwable { Object result = executor.invoke(null, transportContext, operation, chain); McpSchema.CallToolResult toolResult = (McpSchema.CallToolResult) result; assertEquals( - "Unknown error occurred", ((McpSchema.TextContent) toolResult.content().get(0)).text()); + "execution of test-op resulted in exception", + ((McpSchema.TextContent) toolResult.content().get(0)).text()); } private void checkMapping(Throwable t, StatusCode joobyCode, int expectedMcpCode) diff --git a/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/SendErrorTest.java b/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/SendErrorTest.java index d90a3a7567..033c4e8f1d 100644 --- a/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/SendErrorTest.java +++ b/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/SendErrorTest.java @@ -48,7 +48,7 @@ private void assertErrorResponse( McpSchema.JSONRPCResponse response = captor.getValue(); assertEquals(McpSchema.JSONRPC_VERSION, response.jsonrpc()); - assertNull(response.id()); + assertEquals(expectedErrorCode, response.id()); assertNull(response.result()); assertNotNull(response.error()); diff --git a/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/StreamableTransportProviderTest.java b/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/StreamableTransportProviderTest.java index c4560959b3..05a857bcd2 100644 --- a/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/StreamableTransportProviderTest.java +++ b/modules/jooby-mcp/src/test/java/io/jooby/internal/mcp/transport/StreamableTransportProviderTest.java @@ -356,6 +356,7 @@ void testPost_Initialize_Success() throws Exception { when(body.valueOrNull()).thenReturn("body"); McpSchema.JSONRPCRequest req = mock(McpSchema.JSONRPCRequest.class); + when(req.id()).thenReturn("operation-1"); when(req.method()).thenReturn(McpSchema.METHOD_INITIALIZE); try (MockedStatic schema = mockStatic(McpSchema.class)) { @@ -375,6 +376,7 @@ void testPost_Initialize_Success() throws Exception { Object res = postHandler.apply(ctx); assertTrue(res instanceof McpSchema.JSONRPCResponse); + assertEquals("operation-1", ((McpSchema.JSONRPCResponse) res).id()); verify(ctx).setResponseHeader(HttpHeaders.MCP_SESSION_ID, "sess-init"); } } diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 86f4ad3179..86a0e14990 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-metrics jooby-metrics diff --git a/modules/jooby-mutiny/pom.xml b/modules/jooby-mutiny/pom.xml index 7afdfbf8f8..340430e105 100644 --- a/modules/jooby-mutiny/pom.xml +++ b/modules/jooby-mutiny/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-mutiny jooby-mutiny @@ -21,7 +21,7 @@ io.smallrye.reactive mutiny - 3.2.0 + 3.3.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 251d3da4ee..63f168b6dc 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-netty jooby-netty diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index d077dbf481..b1c2e43260 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-openapi jooby-openapi @@ -69,7 +69,7 @@ net.datafaker datafaker - 2.5.4 + 2.7.0 commons-codec @@ -116,7 +116,7 @@ io.avaje avaje-inject - 12.5 + 12.6 test @@ -162,7 +162,7 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 test diff --git a/modules/jooby-opentelemetry/pom.xml b/modules/jooby-opentelemetry/pom.xml index 5e0ccdd273..e06b1b9abb 100644 --- a/modules/jooby-opentelemetry/pom.xml +++ b/modules/jooby-opentelemetry/pom.xml @@ -8,7 +8,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-opentelemetry jooby-opentelemetry @@ -167,7 +167,7 @@ io.opentelemetry.instrumentation opentelemetry-instrumentation-bom-alpha - 2.28.1-alpha + 2.29.0-alpha pom import diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index e3be5b7954..bdb43c9f0b 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-pac4j jooby-pac4j diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 2a273c4bdf..ed088e4845 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-pebble jooby-pebble diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index dee5c649e8..c26569d20f 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-quartz jooby-quartz diff --git a/modules/jooby-reactor/pom.xml b/modules/jooby-reactor/pom.xml index b382f04653..5bd4262138 100644 --- a/modules/jooby-reactor/pom.xml +++ b/modules/jooby-reactor/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-reactor jooby-reactor @@ -21,7 +21,7 @@ io.projectreactor reactor-core - 3.8.5 + 3.8.6 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index a9454f8039..5a29bbf7b8 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-redis jooby-redis diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 3f04bf484b..dfe80cc988 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-redoc jooby-redoc diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index b68f97ed4b..74383f88c1 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-rocker jooby-rocker diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 0108d4cca8..7499dacfa6 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-run jooby-run diff --git a/modules/jooby-rxjava3/pom.xml b/modules/jooby-rxjava3/pom.xml index 2157dc022a..7b6506c772 100644 --- a/modules/jooby-rxjava3/pom.xml +++ b/modules/jooby-rxjava3/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-rxjava3 jooby-rxjava3 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 1402b4be33..a30fce3ddd 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-stork diff --git a/modules/jooby-swagger-ui/package-lock.json b/modules/jooby-swagger-ui/package-lock.json index bdf3f17122..97175d3bfb 100644 --- a/modules/jooby-swagger-ui/package-lock.json +++ b/modules/jooby-swagger-ui/package-lock.json @@ -9,7 +9,7 @@ "version": "4.0.0", "license": "ASF", "dependencies": { - "swagger-ui-dist": "^5.32.6" + "swagger-ui-dist": "^5.32.8" } }, "node_modules/@scarf/scarf": { @@ -20,9 +20,9 @@ "license": "Apache-2.0" }, "node_modules/swagger-ui-dist": { - "version": "5.32.6", - "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.32.6.tgz", - "integrity": "sha512-75ttZNaYCLoFPnozPZcTUU6mS3wKT8l7WLjU5zJSHFeJa23i5vtnze6IiCl4jDMPeQTXVXIgovq4M11NNfQvSA==", + "version": "5.32.8", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.32.8.tgz", + "integrity": "sha512-dgMdWXIgnI4zX4OPhKEdWnlDODbgm8W3AX0Ivn/BBqcUh6xZsBxhZMnvk6DJyRz1BTrj8dPxtarmEGgkz30oyA==", "license": "Apache-2.0", "dependencies": { "@scarf/scarf": "=1.4.0" diff --git a/modules/jooby-swagger-ui/package.json b/modules/jooby-swagger-ui/package.json index ce96acfe74..dac84649dd 100644 --- a/modules/jooby-swagger-ui/package.json +++ b/modules/jooby-swagger-ui/package.json @@ -4,7 +4,7 @@ "private": true, "license": "ASF", "dependencies": { - "swagger-ui-dist": "^5.32.6" + "swagger-ui-dist": "^5.32.8" }, "scarfSettings": { "enabled": false diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 2334ecefcc..f3ca0a1473 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-swagger-ui jooby-swagger-ui diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 655980d678..4151f315dc 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-test jooby-test diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 4c5c7de874..29c0c32c9d 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-thymeleaf jooby-thymeleaf diff --git a/modules/jooby-trpc-avaje-jsonb/pom.xml b/modules/jooby-trpc-avaje-jsonb/pom.xml index ce679038b8..4fc537bded 100644 --- a/modules/jooby-trpc-avaje-jsonb/pom.xml +++ b/modules/jooby-trpc-avaje-jsonb/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-trpc-avaje-jsonb diff --git a/modules/jooby-trpc-generator/pom.xml b/modules/jooby-trpc-generator/pom.xml index b4e5aa90e1..a9b28d5e9a 100644 --- a/modules/jooby-trpc-generator/pom.xml +++ b/modules/jooby-trpc-generator/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-trpc-generator jooby-trpc-generator @@ -84,7 +84,7 @@ io.projectreactor reactor-core - 3.8.5 + 3.8.6 test diff --git a/modules/jooby-trpc-jackson2/pom.xml b/modules/jooby-trpc-jackson2/pom.xml index 9716e6eb7e..a52916a048 100644 --- a/modules/jooby-trpc-jackson2/pom.xml +++ b/modules/jooby-trpc-jackson2/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-trpc-jackson2 diff --git a/modules/jooby-trpc-jackson3/pom.xml b/modules/jooby-trpc-jackson3/pom.xml index 38f501c919..d758516834 100644 --- a/modules/jooby-trpc-jackson3/pom.xml +++ b/modules/jooby-trpc-jackson3/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-trpc-jackson3 diff --git a/modules/jooby-trpc/pom.xml b/modules/jooby-trpc/pom.xml index 10bf91b0d8..e2ba478491 100644 --- a/modules/jooby-trpc/pom.xml +++ b/modules/jooby-trpc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-trpc jooby-trpc diff --git a/modules/jooby-undertow/pom.xml b/modules/jooby-undertow/pom.xml index dbb5d6c6ef..595a87d6dd 100644 --- a/modules/jooby-undertow/pom.xml +++ b/modules/jooby-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-undertow jooby-undertow diff --git a/modules/jooby-vertx-mysql-client/pom.xml b/modules/jooby-vertx-mysql-client/pom.xml index da05e0cc0a..2f14f863af 100644 --- a/modules/jooby-vertx-mysql-client/pom.xml +++ b/modules/jooby-vertx-mysql-client/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-vertx-mysql-client jooby-vertx-mysql-client diff --git a/modules/jooby-vertx-pg-client/pom.xml b/modules/jooby-vertx-pg-client/pom.xml index bfb42a81c1..6a31171ec9 100644 --- a/modules/jooby-vertx-pg-client/pom.xml +++ b/modules/jooby-vertx-pg-client/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-vertx-pg-client jooby-vertx-pg-client diff --git a/modules/jooby-vertx-sql-client/pom.xml b/modules/jooby-vertx-sql-client/pom.xml index c07259f862..f53fb3237f 100644 --- a/modules/jooby-vertx-sql-client/pom.xml +++ b/modules/jooby-vertx-sql-client/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-vertx-sql-client jooby-vertx-sql-client diff --git a/modules/jooby-vertx/pom.xml b/modules/jooby-vertx/pom.xml index 0c6b104fa2..4cda5a4ef9 100644 --- a/modules/jooby-vertx/pom.xml +++ b/modules/jooby-vertx/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-vertx jooby-vertx diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 51fb935041..2e1cbcfb8d 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-whoops jooby-whoops diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 53ec52573a..f0288a1cec 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 4.5.2 + 4.5.3 jooby-yasson jooby-yasson diff --git a/modules/pom.xml b/modules/pom.xml index f7c7b5076d..5e9470e3a2 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -4,7 +4,7 @@ io.jooby jooby-project - 4.5.2 + 4.5.3 modules diff --git a/pom.xml b/pom.xml index 9ca6986016..8d6b6a68b6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.jooby jooby-project - 4.5.2 + 4.5.3 pom jooby-project @@ -58,39 +58,39 @@ 2.3.34 - 4.5.1 + 4.5.3 1.3.7 - 4.1.1 - 2.21.3 - 3.1.3 + 4.1.2 + 2.22.0 + 3.2.0 2.14.0 - 3.0.1 + 3.0.2 3.0.4 2.4.0 3.1.5.RELEASE 3.2.4 - 7.0.2 + 7.1.0 1.2 - 7.3.6.Final - 17.6.0 + 7.4.3.Final + 19.1.0 3.53.0 11.20.1 26.0 - 7.5.2.RELEASE + 7.6.0.RELEASE 2.13.1 - 4.3.0 + 4.3.1 3.2.4 - 1.4.8 + 1.4.9 7.0.0 - 1.81.0 + 1.82.1 - 1.5.32 + 1.5.37 2.26.0 2.0.18 @@ -98,7 +98,7 @@ 1.6.0 - 4.2.38 + 4.2.39 2.3.0 @@ -107,22 +107,22 @@ 9.10.1 - 2.4.1.Final - 12.1.9 - 4.2.14.Final - 5.0.12 + 2.4.2.Final + 12.1.10 + 4.2.15.Final + 5.1.3 - 2.2.50 - 2.1.42 + 2.2.52 + 2.1.45 2.0.0-rc.20 2.5.2 - 12.5 - 3.13 + 12.6 + 3.14 2.17 @@ -131,27 +131,27 @@ 4.0.0 - 5.3.2 + 5.4.0 0.13.0 - 6.5.0 + 6.5.4 2.5.2 - 16.10.0 + 16.12.0 9.2.1 8.19.0 1.12.797 4.20.0 1.9.3 - 1.62.0 + 1.63.0 2.22.0 - 2.3.21 + 2.4.0 1.11.0 - 0.8.14 - 6.1.0 + 0.8.15 + 6.1.1 6.0.0 3.27.7 5.23.0 @@ -189,14 +189,14 @@ 3.6.2 3.8.2 3.4.0 - 3.5.5 + 3.5.6 2.3.1 4.0.3 3.3.0 2.21.0 3.6.3 3.1.2 - 2.0.0 + 2.0.1 v22.20.0 10.9.3 @@ -211,7 +211,7 @@ 21 21 yyyy-MM-dd HH:mm:ssa - 2026-06-03T21:38:31Z + 2026-07-01T13:21:52Z UTF-8 etc${file.separator}source${file.separator}formatter.sh @@ -265,7 +265,7 @@ io.modelcontextprotocol.sdk mcp-bom - 1.1.3 + 2.0.0 pom import @@ -1599,7 +1599,7 @@ com.diffplug.spotless spotless-maven-plugin - 3.5.1 + 3.7.0 true @@ -1808,7 +1808,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.10.0 + 0.11.0 true central diff --git a/tests/pom.xml b/tests/pom.xml index 667675beab..a75bdd4a7b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 4.5.2 + 4.5.3 tests tests @@ -314,7 +314,7 @@ io.vertx vertx-pg-client - 5.0.12 + 5.1.3 @@ -346,14 +346,14 @@ io.mockk mockk-jvm - 1.14.9 + 1.14.11 test org.asynchttpclient async-http-client - 3.0.10 + 3.0.11 diff --git a/tests/src/test/kotlin/i3863/KMovieService.kt b/tests/src/test/kotlin/i3863/KMovieService.kt index 3ed750a96d..48197d7ad6 100644 --- a/tests/src/test/kotlin/i3863/KMovieService.kt +++ b/tests/src/test/kotlin/i3863/KMovieService.kt @@ -8,7 +8,6 @@ package i3863 import io.jooby.annotation.trpc.Trpc import io.jooby.i3863.Metadata import io.jooby.i3863.Movie -import java.util.stream.Collectors @Trpc("movies") class KMovieService { @@ -27,10 +26,7 @@ class KMovieService { /** Procedure: movies.bulkCreate Takes a List of complex objects. */ @Trpc.Query fun bulkCreate(movies: List): List { - return movies - .stream() - .map { m: Movie -> "Created: " + m.title } - .collect(Collectors.toList()) + return movies.map { m: Movie -> "Created: " + m.title } } /** Procedure: movies.ping */