From 2b43f2668c78d87136e4ddfe5c789ba438bb7085 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 00:35:34 +0000 Subject: [PATCH 01/97] Bump maven-jar-plugin from 3.2.0 to 3.2.2 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.0...maven-jar-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b3003cc3a..e1d7635fa6 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ 2.8.2 3.0.0-M3 3.0.1 - 3.2.0 + 3.2.2 3.3.0 3.2.0 3.6.0 From a87e03243b104158970b1d7ce2eac76638b694cb Mon Sep 17 00:00:00 2001 From: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> Date: Wed, 20 Apr 2022 19:05:22 -0500 Subject: [PATCH 02/97] chore: Set permissions for GitHub actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much. - Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> --- .github/workflows/quick-build.yml | 3 +++ .github/workflows/starter.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml index a7b0d66293..deaf400cfc 100644 --- a/.github/workflows/quick-build.yml +++ b/.github/workflows/quick-build.yml @@ -2,6 +2,9 @@ name: Quick Build on: [pull_request] +permissions: + contents: read + jobs: build: diff --git a/.github/workflows/starter.yml b/.github/workflows/starter.yml index cef8da0fbf..521489fedd 100644 --- a/.github/workflows/starter.yml +++ b/.github/workflows/starter.yml @@ -8,6 +8,9 @@ on: paths: - 'starters/**' +permissions: + contents: read + jobs: build: runs-on: ${{ matrix.os }} From c979bdd947f1c471dc2e83f3d326b2f71599906e Mon Sep 17 00:00:00 2001 From: U1F984 <4466497+u1f984@users.noreply.github.com> Date: Fri, 29 Apr 2022 15:18:27 +0200 Subject: [PATCH 03/97] Add httpsOnly option Signed-off-by: U1F984 <4466497+u1f984@users.noreply.github.com> --- docs/asciidoc/servers.adoc | 12 ++++++--- jooby/src/main/java/io/jooby/Jooby.java | 14 +++++----- .../src/main/java/io/jooby/ServerOptions.java | 26 ++++++++++++++++++- .../test/java/io/jooby/ServerOptionsTest.java | 2 ++ .../src/main/java/io/jooby/jetty/Jetty.java | 14 ++++++---- .../src/main/java/io/jooby/netty/Netty.java | 15 ++++++----- .../src/main/java/io/jooby/utow/Utow.java | 14 +++++++--- tests/src/test/java/io/jooby/HttpsTest.java | 16 ++++++++++++ 8 files changed, 87 insertions(+), 26 deletions(-) diff --git a/docs/asciidoc/servers.adoc b/docs/asciidoc/servers.adoc index 772f54b58d..19cf2c5570 100644 --- a/docs/asciidoc/servers.adoc +++ b/docs/asciidoc/servers.adoc @@ -48,6 +48,7 @@ Server options are available via javadoc:ServerOptions[] class: .setMaxRequestSize(10485760) .setSecurePort(8433) .setSsl(SslOptions.selfSigned()) + .setHttpsOnly(false) .setHttp2(true) .setExpectContinue(true) ); @@ -70,8 +71,9 @@ Server options are available via javadoc:ServerOptions[] class: maxRequestSize = 10485760 securePort = 8443 ssl = SslOptions.selfSigned() - http2 = true - expectContinue = true + isHttpsOnly = true + isHttp2 = true + isExpectContinue = true } } ---- @@ -87,8 +89,9 @@ Server options are available via javadoc:ServerOptions[] class: - maxRequestSize: Maximum request size in bytes. Request exceeding this value results in 413(REQUEST_ENTITY_TOO_LARGE) response. Default is `10mb`. - securePort: Enable HTTPS. This option is fully covered in next section. - ssl: SSL options with certificate details. This option is fully covered in next section. -- http2: Enable HTTP 2.0. -- expectContinue: Whenever 100-Expect and continue requests are handled by the server. This is off +- isHttpsOnly: bind only to HTTPS port, not HTTP. This requires SSL options to be configured. +- isHttp2: Enable HTTP 2.0. +- isExpectContinue: Whenever 100-Expect and continue requests are handled by the server. This is off by default, except for Jetty which is always ON. Server options are available as application configuration properties too: @@ -107,6 +110,7 @@ server.defaultHeaders = true server.maxRequestSize = 10485760 server.securePort = 8443 server.ssl.type = self-signed | PKCS12 | X509 +server.ssl.httpsOnly = false server.http2 = true server.expectContinue = false ---- diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java index 2d25380d35..61d229bb5e 100644 --- a/jooby/src/main/java/io/jooby/Jooby.java +++ b/jooby/src/main/java/io/jooby/Jooby.java @@ -893,17 +893,19 @@ public Jooby errorCode(@Nonnull Class type, log.info(" app dir: {}", System.getProperty("user.dir")); log.info(" tmp dir: {}", tmpdir); + List args = new ArrayList<>(); StringBuilder buff = new StringBuilder(); buff.append("routes: \n\n{}\n\nlistening on:\n"); + args.add(router); ServerOptions options = server.getOptions(); String host = options.getHost().replace("0.0.0.0", "localhost"); - List args = new ArrayList<>(); - args.add(router); - args.add(host); - args.add(options.getPort()); - args.add(router.getContextPath()); - buff.append(" http://{}:{}{}\n"); + if (!options.isHttpsOnly()) { + args.add(host); + args.add(options.getPort()); + args.add(router.getContextPath()); + buff.append(" http://{}:{}{}\n"); + } if (options.isSSLEnabled()) { args.add(host); diff --git a/jooby/src/main/java/io/jooby/ServerOptions.java b/jooby/src/main/java/io/jooby/ServerOptions.java index 649ebcf542..4815cea03f 100644 --- a/jooby/src/main/java/io/jooby/ServerOptions.java +++ b/jooby/src/main/java/io/jooby/ServerOptions.java @@ -101,6 +101,11 @@ public class ServerOptions { private Integer securePort; + /** + * Bind only https port. Default is false. + */ + private boolean httpsOnly; + private Integer compressionLevel; private Boolean http2; @@ -155,6 +160,9 @@ public class ServerOptions { } // ssl SslOptions.from(conf, "server.ssl").ifPresent(options::setSsl); + if (conf.hasPath("server.httpsOnly")) { + options.httpsOnly = conf.getBoolean("server.httpsOnly"); + } if (conf.hasPath("server.http2")) { options.setHttp2(conf.getBoolean("server.http2")); } @@ -174,6 +182,7 @@ public class ServerOptions { buff.append(", workerThreads: ").append(getWorkerThreads()); buff.append(", bufferSize: ").append(bufferSize); buff.append(", maxRequestSize: ").append(maxRequestSize); + buff.append(", httpsOnly: ").append(httpsOnly); if (compressionLevel != null) { buff.append(", gzip"); } @@ -246,7 +255,7 @@ public boolean isSSLEnabled() { * @param securePort Port number or 0 for random number. * @return This options. */ - public @Nullable ServerOptions setSecurePort(@Nullable Integer securePort) { + public @Nonnull ServerOptions setSecurePort(@Nullable Integer securePort) { if (securePort == null) { this.securePort = null; } else { @@ -255,6 +264,21 @@ public boolean isSSLEnabled() { return this; } + /** + * Bind only https port. Default is false. + */ + public boolean isHttpsOnly() { + return httpsOnly; + } + + /** + * Bind only https port. Default is false. + */ + public @Nonnull ServerOptions setHttpsOnly(boolean httpsOnly) { + this.httpsOnly = httpsOnly; + return this; + } + /** * Number of IO threads used by the server. Required by Netty and Undertow. * diff --git a/jooby/src/test/java/io/jooby/ServerOptionsTest.java b/jooby/src/test/java/io/jooby/ServerOptionsTest.java index e8921cf886..6ffde15611 100644 --- a/jooby/src/test/java/io/jooby/ServerOptionsTest.java +++ b/jooby/src/test/java/io/jooby/ServerOptionsTest.java @@ -22,6 +22,7 @@ public void shouldParseFromConfig() { .withValue("server.maxRequestSize", fromAnyRef(2048)) .withValue("server.workerThreads", fromAnyRef(32)) .withValue("server.host", fromAnyRef("0.0.0.0")) + .withValue("server.httpsOnly", fromAnyRef(true)) .resolve() ).get(); assertEquals(9090, options.getPort()); @@ -34,5 +35,6 @@ public void shouldParseFromConfig() { assertEquals(2048, options.getMaxRequestSize()); assertEquals(32, options.getWorkerThreads()); assertEquals("0.0.0.0", options.getHost()); + assertEquals(true, options.isHttpsOnly()); } } diff --git a/modules/jooby-jetty/src/main/java/io/jooby/jetty/Jetty.java b/modules/jooby-jetty/src/main/java/io/jooby/jetty/Jetty.java index 11aa316b2f..7f3a574e4e 100644 --- a/modules/jooby-jetty/src/main/java/io/jooby/jetty/Jetty.java +++ b/modules/jooby-jetty/src/main/java/io/jooby/jetty/Jetty.java @@ -125,12 +125,14 @@ public class Jetty extends io.jooby.Server.Base { Optional.ofNullable(http2) .ifPresent(extension -> connectionFactories.addAll(extension.configure(httpConf))); - ServerConnector http = new ServerConnector(server, - connectionFactories.toArray(new ConnectionFactory[0])); - http.setPort(options.getPort()); - http.setHost(options.getHost()); + if (!options.isHttpsOnly()) { + ServerConnector http = new ServerConnector(server, + connectionFactories.toArray(new ConnectionFactory[0])); + http.setPort(options.getPort()); + http.setHost(options.getHost()); - server.addConnector(http); + server.addConnector(http); + } if (options.isSSLEnabled()) { SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); @@ -170,6 +172,8 @@ public class Jetty extends io.jooby.Server.Base { secureConnector.setHost(options.getHost()); server.addConnector(secureConnector); + } else if (options.isHttpsOnly()) { + throw new IllegalArgumentException("Server configured for httpsOnly, but ssl options not set"); } ContextHandler context = new ContextHandler(); diff --git a/modules/jooby-netty/src/main/java/io/jooby/netty/Netty.java b/modules/jooby-netty/src/main/java/io/jooby/netty/Netty.java index dabe567170..c40dc4afe7 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/netty/Netty.java +++ b/modules/jooby-netty/src/main/java/io/jooby/netty/Netty.java @@ -127,12 +127,13 @@ public class Netty extends Server.Base { } /** Bootstrap: */ - ServerBootstrap http = transport.configure(acceptorloop, eventloop) - .childHandler(newPipeline(factory, null, http2)) - .childOption(ChannelOption.SO_REUSEADDR, true) - .childOption(ChannelOption.TCP_NODELAY, true); - - http.bind(options.getHost(), options.getPort()).get(); + if (!options.isHttpsOnly()) { + ServerBootstrap http = transport.configure(acceptorloop, eventloop) + .childHandler(newPipeline(factory, null, http2)) + .childOption(ChannelOption.SO_REUSEADDR, true) + .childOption(ChannelOption.TCP_NODELAY, true); + http.bind(options.getHost(), options.getPort()).get(); + } if (options.isSSLEnabled()) { SSLContext javaSslContext = options @@ -152,6 +153,8 @@ public class Netty extends Server.Base { .childOption(ChannelOption.TCP_NODELAY, true); https.bind(options.getHost(), options.getSecurePort()).get(); + } else if (options.isHttpsOnly()) { + throw new IllegalArgumentException("Server configured for httpsOnly, but ssl options not set"); } fireReady(applications); diff --git a/modules/jooby-utow/src/main/java/io/jooby/utow/Utow.java b/modules/jooby-utow/src/main/java/io/jooby/utow/Utow.java index 1d782b35a0..ba196c094d 100644 --- a/modules/jooby-utow/src/main/java/io/jooby/utow/Utow.java +++ b/modules/jooby-utow/src/main/java/io/jooby/utow/Utow.java @@ -61,7 +61,8 @@ public class Utow extends Server.Base { .setIoThreads(ServerOptions.IO_THREADS) .setServer("utow"); - @Nonnull @Override public Utow setOptions(@Nonnull ServerOptions options) { + @Nonnull + @Override public Utow setOptions(@Nonnull ServerOptions options) { this.options = options .setIoThreads(options.getIoThreads()); return this; @@ -93,7 +94,6 @@ public class Utow extends Server.Base { } Undertow.Builder builder = Undertow.builder() - .addHttpListener(options.getPort(), options.getHost()) .setBufferSize(options.getBufferSize()) /** Socket : */ .setSocketOption(Options.BACKLOG, BACKLOG) @@ -110,10 +110,14 @@ public class Utow extends Server.Base { .setWorkerThreads(options.getWorkerThreads()) .setHandler(handler); + if (!options.isHttpsOnly()) { + builder.addHttpListener(options.getPort(), options.getHost()); + } + if (options.isHttp2() == null || options.isHttp2() == Boolean.TRUE) { stream(spliteratorUnknownSize( - ServiceLoader.load(Http2Configurer.class).iterator(), - Spliterator.ORDERED), + ServiceLoader.load(Http2Configurer.class).iterator(), + Spliterator.ORDERED), false ) .filter(it -> it.support(Undertow.Builder.class)) @@ -134,6 +138,8 @@ public class Utow extends Server.Base { .map(this::toSslClientAuthMode) .ifPresent( clientAuth -> builder.setSocketOption(Options.SSL_CLIENT_AUTH_MODE, clientAuth)); + } else if (options.isHttpsOnly()) { + throw new IllegalArgumentException("Server configured for httpsOnly, but ssl options not set"); } server = builder.build(); diff --git a/tests/src/test/java/io/jooby/HttpsTest.java b/tests/src/test/java/io/jooby/HttpsTest.java index 640bcea6d0..a640104283 100644 --- a/tests/src/test/java/io/jooby/HttpsTest.java +++ b/tests/src/test/java/io/jooby/HttpsTest.java @@ -3,7 +3,10 @@ import io.jooby.junit.ServerTest; import io.jooby.junit.ServerTestRunner; +import java.net.ConnectException; + import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class HttpsTest { @@ -151,4 +154,17 @@ public void forceSSLStatic2(ServerTestRunner runner) { }); }); } + + @ServerTest + public void httpsOnly(ServerTestRunner runner) { + runner.define(app -> { + app.setServerOptions(new ServerOptions().setSecurePort(8443).setHttpsOnly(true)); + + app.get("/test", ctx -> "test"); + }).ready((http, https) -> { + assertThrows(ConnectException.class, () -> http.get("/test", null)); + + https.get("/test", rsp -> assertEquals("test", rsp.body().string())); + }); + } } From 5807c1600c795997267f9d14452aa73a1575f616 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 1 May 2022 13:49:22 -0300 Subject: [PATCH 04/97] FileUpload is missing in a MVC controller fix #2570 --- .../java/io/jooby/internal/MissingValue.java | 21 ++++++++--- .../converter/ReflectiveBeanConverter.java | 36 ++++++++++++++----- modules/jooby-bom/pom.xml | 6 ++-- tests/src/test/java/io/jooby/TestSupport.java | 15 ++++++++ .../java/io/jooby/i2570/Controller2570.java | 13 +++++++ .../java/io/jooby/i2570/Document2570.java | 24 +++++++++++++ .../test/java/io/jooby/i2570/Issue2570.java | 29 +++++++++++++++ 7 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 tests/src/test/java/io/jooby/TestSupport.java create mode 100644 tests/src/test/java/io/jooby/i2570/Controller2570.java create mode 100644 tests/src/test/java/io/jooby/i2570/Document2570.java create mode 100644 tests/src/test/java/io/jooby/i2570/Issue2570.java diff --git a/jooby/src/main/java/io/jooby/internal/MissingValue.java b/jooby/src/main/java/io/jooby/internal/MissingValue.java index d41f8d26d2..74b22a5b41 100644 --- a/jooby/src/main/java/io/jooby/internal/MissingValue.java +++ b/jooby/src/main/java/io/jooby/internal/MissingValue.java @@ -5,16 +5,18 @@ */ package io.jooby.internal; -import io.jooby.exception.MissingValueException; -import io.jooby.ValueNode; - -import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; +import javax.annotation.Nonnull; + +import io.jooby.ValueNode; +import io.jooby.exception.MissingValueException; + public class MissingValue implements ValueNode { private String name; @@ -73,4 +75,15 @@ public MissingValue(String name) { @Override public String toString() { return ""; } + + @Override public boolean equals(Object o) { + if (o instanceof MissingValue) { + return Objects.equals(name, ((MissingValue) o).name); + } + return false; + } + + @Override public int hashCode() { + return Objects.hash(name); + } } diff --git a/jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java b/jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java index a1f20fb4d5..5818767824 100644 --- a/jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java +++ b/jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java @@ -17,6 +17,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; import java.util.Set; @@ -66,7 +67,7 @@ private static T newInstance(Class type, ValueNode node) Collections.emptySet()); } Constructor constructor = selectConstructor(constructors); - Set state = new HashSet<>(); + Set state = new HashSet<>(); Object[] args = constructor.getParameterCount() == 0 ? NO_ARGS : inject(node, constructor, state::add); @@ -130,15 +131,34 @@ private static String paramName(Parameter parameter) { throw Usage.parameterNameNotPresent(parameter); } - private static T setters(T newInstance, ValueNode node, Set skip) { + /** + * Collect all possible values. + * + * @param node Root node. + * @return Names, including file names. + */ + private static Set names(ValueNode node) { + Set names = new LinkedHashSet<>(); + for (ValueNode item : node) { + names.add(item.name()); + } + if (node instanceof Multipart) { + for (FileUpload file : ((Multipart) node).files()) { + names.add(file.getName()); + } + } + return names; + } + + private static T setters(T newInstance, ValueNode node, Set skip) { Method[] methods = newInstance.getClass().getMethods(); - for (ValueNode value : node) { + for (String name: names(node)) { + ValueNode value = node.get(name); if (!skip.contains(value)) { - String name = value.name(); - String setter1 = "set" + Character.toUpperCase(name.charAt(0)) + name.substring(1); - Method method = findMethod(methods, setter1); + String methodName = "set" + Character.toUpperCase(name.charAt(0)) + name.substring(1); + Method method = findSetter(methods, methodName); if (method == null) { - method = findMethod(methods, name); + method = findSetter(methods, name); } if (method != null) { Parameter parameter = method.getParameters()[0]; @@ -203,7 +223,7 @@ private static boolean isFileUpload(Class type) { return FileUpload.class == type; } - private static Method findMethod(Method[] methods, String name) { + private static Method findSetter(Method[] methods, String name) { for (Method method : methods) { if (method.getName().equals(name) && method.getParameterCount() == 1) { return method; diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 90d84c7815..f8bfe2113f 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -16,7 +16,7 @@ - 2.14.0 + 2.14.1-SNAPSHOT 4.0.3 3.2.0 9.1 @@ -61,8 +61,8 @@ 9.4.45.v20220203 0.0.8 1.12.191 - 2.14.0 - 2.14.0 + 2.14.1-SNAPSHOT + 2.14.1-SNAPSHOT 0.11.2 3.0.2 5.8.1 diff --git a/tests/src/test/java/io/jooby/TestSupport.java b/tests/src/test/java/io/jooby/TestSupport.java new file mode 100644 index 0000000000..803c491a45 --- /dev/null +++ b/tests/src/test/java/io/jooby/TestSupport.java @@ -0,0 +1,15 @@ +package io.jooby; + +import java.nio.file.Path; +import java.nio.file.Paths; + +public class TestSupport { + + public static Path userdir(String... segments) { + Path path = Paths.get(System.getProperty("user.dir")); + for (String segment : segments) { + path = path.resolve(segment); + } + return path; + } +} diff --git a/tests/src/test/java/io/jooby/i2570/Controller2570.java b/tests/src/test/java/io/jooby/i2570/Controller2570.java new file mode 100644 index 0000000000..45aa180f7d --- /dev/null +++ b/tests/src/test/java/io/jooby/i2570/Controller2570.java @@ -0,0 +1,13 @@ +package io.jooby.i2570; + +import io.jooby.annotations.Consumes; +import io.jooby.annotations.FormParam; +import io.jooby.annotations.POST; + +public class Controller2570 { + @POST("/2570") + @Consumes("multipart/form-data") + public String createFile(@FormParam Document2570 document) { + return document.getName() + ": " + document.getFile().getFileName(); + } +} diff --git a/tests/src/test/java/io/jooby/i2570/Document2570.java b/tests/src/test/java/io/jooby/i2570/Document2570.java new file mode 100644 index 0000000000..7c613e40e3 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2570/Document2570.java @@ -0,0 +1,24 @@ +package io.jooby.i2570; + +import io.jooby.FileUpload; + +public class Document2570 { + private String name; + private FileUpload file; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public FileUpload getFile() { + return file; + } + + public void setFile(FileUpload file) { + this.file = file; + } +} diff --git a/tests/src/test/java/io/jooby/i2570/Issue2570.java b/tests/src/test/java/io/jooby/i2570/Issue2570.java new file mode 100644 index 0000000000..57ac850414 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2570/Issue2570.java @@ -0,0 +1,29 @@ +package io.jooby.i2570; + +import static io.jooby.TestSupport.userdir; +import static okhttp3.RequestBody.create; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; +import okhttp3.MediaType; +import okhttp3.MultipartBody; + +public class Issue2570 { + @ServerTest + public void shouldSetFileOnBean(ServerTestRunner runner) { + runner.define(app -> { + app.mvc(new Controller2570()); + }).ready(http -> { + http.post("/2570", new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart("name", "file name") + .addFormDataPart("file", "fileupload.js", + create(userdir("src", "test", "resources", "files", "fileupload.js").toFile(), + MediaType.parse("application/javascript"))) + .build(), rsp -> { + assertEquals("file name: fileupload.js", rsp.body().string()); + }); + }); + } +} From 174c016cd7510c8aabbaa6b02da9a9054c40beac Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 1 May 2022 13:56:28 -0300 Subject: [PATCH 05/97] build: fix checkstyle errors --- jooby/src/main/java/io/jooby/ServerOptions.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jooby/src/main/java/io/jooby/ServerOptions.java b/jooby/src/main/java/io/jooby/ServerOptions.java index 4815cea03f..aac459ef03 100644 --- a/jooby/src/main/java/io/jooby/ServerOptions.java +++ b/jooby/src/main/java/io/jooby/ServerOptions.java @@ -266,6 +266,8 @@ public boolean isSSLEnabled() { /** * Bind only https port. Default is false. + * + * @return True when only https is required. */ public boolean isHttpsOnly() { return httpsOnly; @@ -273,6 +275,9 @@ public boolean isHttpsOnly() { /** * Bind only https port. Default is false. + * + * @param httpsOnly True to bind only HTTPS. + * @return This options. */ public @Nonnull ServerOptions setHttpsOnly(boolean httpsOnly) { this.httpsOnly = httpsOnly; From 261326f59f4e5c967e841ed58d7f11876fd12e5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 May 2022 00:05:54 +0000 Subject: [PATCH 06/97] Bump vue from 3.0.3 to 3.2.33 Bumps [vue](https://github.com/vuejs/core) from 3.0.3 to 3.2.33. - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/core/compare/v3.0.3...v3.2.33) --- updated-dependencies: - dependency-name: org.webjars.npm:vue dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- jooby/pom.xml | 2 +- tests/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jooby/pom.xml b/jooby/pom.xml index ee41072196..32550de7ef 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -277,7 +277,7 @@ org.webjars.npm vue - 3.0.3 + 3.2.33 test diff --git a/tests/pom.xml b/tests/pom.xml index 66f2a895f0..72feb55159 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -157,7 +157,7 @@ org.webjars.npm vue - 3.0.3 + 3.2.33 From 15a289e862714fd38d11a337f10c3e1079673a27 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 2 May 2022 08:51:00 -0300 Subject: [PATCH 07/97] netty: onComplete callback should run on caller thread. Fix #2572 --- .../io/jooby/internal/netty/NettyContext.java | 91 +++++++++++-------- .../internal/netty/NettyOutputStream.java | 32 ++++--- .../io/jooby/internal/netty/NettySender.java | 1 + .../test/java/io/jooby/i2572/Issue2572.java | 46 ++++++++++ 4 files changed, 121 insertions(+), 49 deletions(-) create mode 100644 tests/src/test/java/io/jooby/i2572/Issue2572.java diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java index 446cc70137..713ba5cb99 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java @@ -546,17 +546,21 @@ boolean isHttpGet() { } private Context send(@Nonnull ByteBuf data) { - responseStarted = true; - setHeaders.set(CONTENT_LENGTH, Long.toString(data.readableBytes())); - DefaultFullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, status, - data, setHeaders, NO_TRAILING); - if (ctx.channel().eventLoop().inEventLoop()) { - needsFlush = true; - ctx.write(response, promise(this)); - } else { - ctx.writeAndFlush(response, promise(this)); + try { + responseStarted = true; + setHeaders.set(CONTENT_LENGTH, Long.toString(data.readableBytes())); + DefaultFullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, status, + data, setHeaders, NO_TRAILING); + if (ctx.channel().eventLoop().inEventLoop()) { + needsFlush = true; + ctx.write(response, promise(this)); + } else { + ctx.writeAndFlush(response, promise(this)); + } + return this; + } finally { + requestComplete(); } - return this; } public void flush() { @@ -567,19 +571,23 @@ public void flush() { } @Nonnull @Override public Context send(@Nonnull ReadableByteChannel channel) { - prepareChunked(); - DefaultHttpResponse rsp = new DefaultHttpResponse(HTTP_1_1, status, setHeaders); - responseStarted = true; - int bufferSize = contentLength > 0 ? (int) contentLength : this.bufferSize; - ctx.channel().eventLoop().execute(() -> { - // Headers - ctx.write(rsp, ctx.voidPromise()); - // Body - ctx.write(new ChunkedNioStream(channel, bufferSize), ctx.voidPromise()); - // Finish - ctx.writeAndFlush(EMPTY_LAST_CONTENT, promise(this)); - }); - return this; + try { + prepareChunked(); + DefaultHttpResponse rsp = new DefaultHttpResponse(HTTP_1_1, status, setHeaders); + responseStarted = true; + int bufferSize = contentLength > 0 ? (int) contentLength : this.bufferSize; + ctx.channel().eventLoop().execute(() -> { + // Headers + ctx.write(rsp, ctx.voidPromise()); + // Body + ctx.write(new ChunkedNioStream(channel, bufferSize), ctx.voidPromise()); + // Finish + ctx.writeAndFlush(EMPTY_LAST_CONTENT, promise(this)); + }); + return this; + }finally { + requestComplete(); + } } @Nonnull @Override public Context send(@Nonnull InputStream in) { @@ -607,6 +615,8 @@ public void flush() { return this; } catch (Exception x) { throw SneakyThrows.propagate(x); + } finally { + requestComplete(); } } @@ -646,6 +656,8 @@ public void flush() { } } catch (IOException x) { throw SneakyThrows.propagate(x); + } finally { + requestComplete(); } return this; } @@ -666,22 +678,29 @@ public void flush() { } @Nonnull @Override public Context send(StatusCode statusCode) { - setResponseCode(statusCode); - responseStarted = true; - if (!setHeaders.contains(CONTENT_LENGTH)) { - setHeaders.set(CONTENT_LENGTH, "0"); + try { + setResponseCode(statusCode); + responseStarted = true; + if (!setHeaders.contains(CONTENT_LENGTH)) { + setHeaders.set(CONTENT_LENGTH, "0"); + } + DefaultFullHttpResponse rsp = new DefaultFullHttpResponse(HTTP_1_1, + status, Unpooled.EMPTY_BUFFER, setHeaders, + NO_TRAILING); + ctx.writeAndFlush(rsp, promise(this)); + return this; + } finally { + requestComplete(); } - DefaultFullHttpResponse rsp = new DefaultFullHttpResponse(HTTP_1_1, - status, Unpooled.EMPTY_BUFFER, setHeaders, - NO_TRAILING); - ctx.writeAndFlush(rsp, promise(this)); - return this; + } + + void requestComplete() { + fireCompleteEvent(); + ifSaveSession(); } @Override public void operationComplete(ChannelFuture future) { try { - fireCompleteEvent(); - ifSaveSession(); destroy(future.cause()); } finally { if (!isKeepAlive(req)) { @@ -758,8 +777,8 @@ void destroy(Throwable cause) { private NettyOutputStream newOutputStream() { prepareChunked(); - return new NettyOutputStream(ctx, bufferSize, - new DefaultHttpResponse(req.protocolVersion(), status, setHeaders), this); + return new NettyOutputStream(this, ctx, bufferSize, + new DefaultHttpResponse(req.protocolVersion(), status, setHeaders)); } private FileUpload register(FileUpload upload) { diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyOutputStream.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyOutputStream.java index caf4d5934a..c5837a25de 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyOutputStream.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyOutputStream.java @@ -18,16 +18,18 @@ public class NettyOutputStream extends OutputStream { private final ByteBuf buffer; - private final ChannelHandlerContext ctx; + private final NettyContext ctx; + private final ChannelHandlerContext context; private final ChannelFutureListener closeListener; private HttpResponse headers; - public NettyOutputStream(ChannelHandlerContext ctx, int bufferSize, HttpResponse headers, - ChannelFutureListener closeListener) { - this.buffer = ctx.alloc().buffer(0, bufferSize); + public NettyOutputStream(NettyContext ctx, ChannelHandlerContext context, int bufferSize, + HttpResponse headers) { this.ctx = ctx; + this.buffer = context.alloc().buffer(0, bufferSize); + this.context = context; this.headers = headers; - this.closeListener = closeListener; + this.closeListener = ctx; } @Override @@ -65,7 +67,7 @@ public void write(byte[] src, int off, int len, ChannelFutureListener callback) private void writeHeaders() { if (headers != null) { - ctx.write(headers, ctx.voidPromise()); + context.write(headers, context.voidPromise()); headers = null; } } @@ -79,22 +81,22 @@ private void flush(ChannelFutureListener callback, ChannelFutureListener listene if (chunkSize > 0) { if (listener != null) { if (callback == null) { - ctx.write(new DefaultHttpContent(buffer.copy()), ctx.voidPromise()); + context.write(new DefaultHttpContent(buffer.copy()), context.voidPromise()); } else { - ctx.write(new DefaultHttpContent(buffer.copy())).addListener(callback); + context.write(new DefaultHttpContent(buffer.copy())).addListener(callback); } - ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(listener); + context.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(listener); buffer.release(); } else { if (callback == null) { - ctx.write(new DefaultHttpContent(buffer.copy()), ctx.voidPromise()); + context.write(new DefaultHttpContent(buffer.copy()), context.voidPromise()); } else { - ctx.write(new DefaultHttpContent(buffer.copy())).addListener(callback); + context.write(new DefaultHttpContent(buffer.copy())).addListener(callback); } buffer.clear(); } } else { - ChannelFuture future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT); + ChannelFuture future = context.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT); if (listener != null) { future.addListener(listener); } @@ -103,6 +105,10 @@ private void flush(ChannelFutureListener callback, ChannelFutureListener listene @Override public void close() { - flush(null, closeListener); + try { + flush(null, closeListener); + } finally { + ctx.requestComplete(); + } } } diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettySender.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettySender.java index 9cc5bfde42..d86dd07573 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettySender.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettySender.java @@ -32,6 +32,7 @@ public NettySender(NettyContext ctx, ChannelHandlerContext context) { @Override public void close() { context.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(ctx); + ctx.requestComplete(); } private static ChannelFutureListener newChannelFutureListener(NettyContext ctx, diff --git a/tests/src/test/java/io/jooby/i2572/Issue2572.java b/tests/src/test/java/io/jooby/i2572/Issue2572.java new file mode 100644 index 0000000000..dcbf20daa0 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2572/Issue2572.java @@ -0,0 +1,46 @@ +package io.jooby.i2572; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.json.JSONObject; + +import io.jooby.ExecutionMode; +import io.jooby.json.JacksonModule; +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class Issue2572 { + @ServerTest(executionMode = {ExecutionMode.EVENT_LOOP, ExecutionMode.WORKER}) + public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { + runner.define(app -> { + Map state = new LinkedHashMap<>(); + + app.install(new JacksonModule()); + + app.get("/2572/state", ctx -> state); + + app.decorator(next -> ctx -> { + state.put("caller", Thread.currentThread().getName()); + ctx.onComplete(context -> { + state.put("onComplete", Thread.currentThread().getName()); + }); + return next.apply(ctx); + }); + + app.get("/2572/init", ctx -> "Initialized"); + + }).ready(http -> { + http.get("/2572/init", rsp -> { + assertEquals("Initialized", rsp.body().string()); + }); + + http.get("/2572/state", rsp -> { + JSONObject json = new JSONObject(rsp.body().string()); + assertEquals(json.get("caller"), json.get("onComplete")); + }); + }); + } +} From 405d421cb671e669248128eb13ebd8d2e1e3b278 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 2 May 2022 09:05:35 -0300 Subject: [PATCH 08/97] dependencies: jetty upgrade --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2c5533926..d928c5a5af 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 2.2.17.Final - 9.4.45.v20220203 + 9.4.46.v20220331 4.1.76.Final From 63f3a2eacae120d3f9ab3695a4dd203950da3817 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 2 May 2022 10:46:08 -0300 Subject: [PATCH 09/97] @Transactional annotation must be supported at class/type level too fix #2574 --- jooby/src/main/java/io/jooby/annotations/Transactional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jooby/src/main/java/io/jooby/annotations/Transactional.java b/jooby/src/main/java/io/jooby/annotations/Transactional.java index d4b1d84494..bf1b6b5518 100644 --- a/jooby/src/main/java/io/jooby/annotations/Transactional.java +++ b/jooby/src/main/java/io/jooby/annotations/Transactional.java @@ -33,7 +33,7 @@ * This annotation has no effect on the behavior of {@code SessionRequest} decorator(s). */ @RouteAttribute -@Target(ElementType.METHOD) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface Transactional { From 6c709ffc3e22d2794cd45590153b6ca9374445df Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 2 May 2022 10:54:47 -0300 Subject: [PATCH 10/97] jooby-cli: doesn't add src/main/resources while generating maven project fix #2575 --- modules/jooby-cli/src/main/resources/cli/pom.xml.hbs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs b/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs index 0513db0895..6980e9c2ed 100644 --- a/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs +++ b/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs @@ -48,13 +48,16 @@ {{#if kotlin}} - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin + ${project.basedir}${file.separator}src${file.separator}main${file.separator}kotlin + ${project.basedir}${file.separator}src${file.separator}test${file.separator}kotlin {{/if}} conf + + src${file.separator}main${file.separator}resources + {{#if kotlin}} From ef62ad5c89e7372bb98faf9528eecf0cf3ce78f8 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 2 May 2022 11:24:08 -0300 Subject: [PATCH 11/97] v2.14.1 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 12 ++++++------ modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 62 insertions(+), 62 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 998e4c0e80..f261b8c0fb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 32550de7ef..77ca6ba48d 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 1496d61761..dd5c65ba7b 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 7130b36025..d0f7bfc3e9 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 44a133a894..022998149c 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index f24d156685..0322d5b81e 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index f8bfe2113f..5a310788a5 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 @@ -16,7 +16,7 @@ - 2.14.1-SNAPSHOT + 2.14.1 4.0.3 3.2.0 9.1 @@ -58,11 +58,11 @@ 1 1.11.0.Final 3.28.0 - 9.4.45.v20220203 + 9.4.46.v20220331 0.0.8 1.12.191 - 2.14.1-SNAPSHOT - 2.14.1-SNAPSHOT + 2.14.1 + 2.14.1 0.11.2 3.0.2 5.8.1 @@ -84,7 +84,7 @@ 2.8.2 3.0.0-M3 3.0.1 - 3.2.0 + 3.2.2 3.3.0 3.6.0 3.8.1 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 34eb3fca4c..e2769f6e10 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index ac6c046c29..d208d209d2 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index f5acc68013..d180661d72 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 075c01691d..da0098994d 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index a2cdc59541..cfc0772c90 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 28b1120ac8..dec0003b8b 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 9f12cff7e1..011982d019 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index c8a7a02f69..8ce33e4f81 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index a4c05f6e31..4565f70f64 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 928b2bacd5..ffa3337483 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index f50eab9be5..16a11c3a9b 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 000142b082..18c38e77e2 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 901a30759d..fd03388d38 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index c7d20fa11f..8e115a360a 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index f51c390d63..1a9b15bb23 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index a10b1de3db..60bb6f11df 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 9a6983a37c..b95ba566d9 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 901cd98c70..edb396effd 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 6a59284bb9..13becaf84e 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index ee3e3e6a88..5af731f9b7 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 3eaf32e8c6..2810489ffd 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 933a30ef45..87ea034b5a 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 0d819ad3b1..fd3afeb974 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index fce6712dad..6c32624086 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index aa5fea9bb2..6efc392487 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 0692109a1b..3696d18f44 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index dd9ca1051d..55b0cac1bd 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 290c76fea5..885b97970b 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 798fb23273..72a3bda7aa 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index bb03647342..13f2dc07cc 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index ea7512758c..a3bfe96944 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index e6ccc3306c..a3c99132af 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index c3b133804d..430a45d44f 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 6ec98e42a0..8236880900 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index dd7ed29099..f09e30c2fa 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 8b4e130f70..00cc932123 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 91b9d05b9d..bf9f7fb978 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 67a95aee25..c2c21a3745 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index fc00ae73d9..16d034825f 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 7bd6e3a04f..e975914e9a 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 7f95f25ff2..d3e72e4802 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index feed3f1838..fe50084336 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index f671b823bf..d2bf0b75fd 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 48d9bb9cd3..3f22b51fad 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 6c53cd60e7..828cfae2fa 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 493ec403e6..91c1992bf5 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 0aba3831ff..96e691dda2 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 8d6c98a5a0..814f6e03d5 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1-SNAPSHOT + 2.14.1 modules diff --git a/pom.xml b/pom.xml index 0b6d6ef0a1..ae04779ac0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.14.1-SNAPSHOT + 2.14.1 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 72feb55159..ffb07ada80 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1-SNAPSHOT + 2.14.1 4.0.0 From 5af60083688b1324ba86bea91f6e41919b93ce78 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 2 May 2022 13:10:28 -0300 Subject: [PATCH 12/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 8 ++++---- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f261b8c0fb..722367f647 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 77ca6ba48d..657fd49b96 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index dd5c65ba7b..1c9f2517b3 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index d0f7bfc3e9..f741b7058b 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 022998149c..3c84f97f7d 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 0322d5b81e..cc0b2002b7 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 5a310788a5..7ec91486ac 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 @@ -16,7 +16,7 @@ - 2.14.1 + 2.14.2-SNAPSHOT 4.0.3 3.2.0 9.1 @@ -61,8 +61,8 @@ 9.4.46.v20220331 0.0.8 1.12.191 - 2.14.1 - 2.14.1 + 2.14.2-SNAPSHOT + 2.14.2-SNAPSHOT 0.11.2 3.0.2 5.8.1 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index e2769f6e10..b608ce7321 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index d208d209d2..5651732e5a 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index d180661d72..00774b4b51 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index da0098994d..0e4e25245b 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index cfc0772c90..795018ee53 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index dec0003b8b..73eb51c36c 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 011982d019..c8bdcd1a81 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 8ce33e4f81..31de226567 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 4565f70f64..cb9b343a22 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index ffa3337483..4885554a77 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 16a11c3a9b..02514feb35 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 18c38e77e2..85cfca3b20 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index fd03388d38..3404c9c827 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 8e115a360a..e0b04433e1 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 1a9b15bb23..f6f1f91c14 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 60bb6f11df..7bcf2bc905 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index b95ba566d9..07f4ba683c 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index edb396effd..738fb786cb 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 13becaf84e..bff91c808a 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 5af731f9b7..52810b0060 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 2810489ffd..b987d92855 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 87ea034b5a..efef902322 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index fd3afeb974..179d75eafd 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 6c32624086..5b7e0dcb9c 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 6efc392487..a542c6d449 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 3696d18f44..6b2f98792a 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 55b0cac1bd..d0b1353e45 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 885b97970b..95c80cdd7f 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 72a3bda7aa..5dde6f9aae 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 13f2dc07cc..d07b188c09 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index a3bfe96944..b5dec7a8d9 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index a3c99132af..fb6356e8ef 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 430a45d44f..2eb5d7e0f4 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 8236880900..da6e49e7fb 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index f09e30c2fa..4748a15940 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 00cc932123..1a89604e39 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index bf9f7fb978..c69fc01801 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index c2c21a3745..1bacbdf67b 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 16d034825f..8f7078e03e 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index e975914e9a..38a306dd60 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index d3e72e4802..a87ae5e23f 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index fe50084336..9182afc4f9 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index d2bf0b75fd..41c56f3ae9 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 3f22b51fad..b7cd5fed44 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 828cfae2fa..eeba862759 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 91c1992bf5..dbedfa0dce 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 96e691dda2..009bcb4973 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 814f6e03d5..590c2043d4 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1 + 2.14.2-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index ae04779ac0..6db93b7233 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.14.1 + 2.14.2-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index ffb07ada80..bf522d76bd 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.1 + 2.14.2-SNAPSHOT 4.0.0 From af27bcbc34b36b826641d1d84e5d61e812e940f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 00:33:00 +0000 Subject: [PATCH 13/97] Bump netty.version from 4.1.76.Final to 4.1.77.Final Bumps `netty.version` from 4.1.76.Final to 4.1.77.Final. Updates `netty-common` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-buffer` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-handler` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-transport` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-transport-native-epoll` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-codec-http` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-transport-native-kqueue` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-transport-native-epoll` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-transport-native-kqueue` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) Updates `netty-codec-http2` from 4.1.76.Final to 4.1.77.Final - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.76.Final...netty-4.1.77.Final) --- updated-dependencies: - dependency-name: io.netty:netty-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-buffer dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-epoll:linux-x86_64 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-transport-native-kqueue:osx-x86_64 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-http2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 7ec91486ac..87763aaad9 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -100,7 +100,7 @@ 4.4.0 2.3.1 8.0.27 - 4.1.76.Final + 4.1.77.Final 1.6.8 v12.19.0 4.9.3 diff --git a/pom.xml b/pom.xml index 6db93b7233..abf1fbc470 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 2.2.17.Final 9.4.46.v20220331 - 4.1.76.Final + 4.1.77.Final 2.2.21 From 9ee3c34c329196ac776d4d14e4c4c765d693b74c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 00:54:18 +0000 Subject: [PATCH 14/97] Bump lettuce-core from 6.1.6.RELEASE to 6.1.8.RELEASE Bumps [lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.1.6.RELEASE to 6.1.8.RELEASE. - [Release notes](https://github.com/lettuce-io/lettuce-core/releases) - [Changelog](https://github.com/lettuce-io/lettuce-core/blob/6.1.8.RELEASE/RELEASE-NOTES.md) - [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.1.6.RELEASE...6.1.8.RELEASE) --- updated-dependencies: - dependency-name: io.lettuce:lettuce-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 7ec91486ac..fc359f767a 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -69,7 +69,7 @@ 2.7.0 1.4.32 1.4.1 - 6.1.6.RELEASE + 6.1.8.RELEASE 4.1 2.17.1 1.2 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 4748a15940..9efd7f7d27 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -54,7 +54,7 @@ io.lettuce lettuce-core - 6.1.6.RELEASE + 6.1.8.RELEASE diff --git a/pom.xml b/pom.xml index 6db93b7233..8750c8d0ff 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 3.28.0 7.5.1 16.2 - 6.1.6.RELEASE + 6.1.8.RELEASE 2.11.1 2.7.0 2.8.8 From b6707bcd5c5710e5127a46d4889e2fa33eea8d4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 00:58:26 +0000 Subject: [PATCH 15/97] Bump mockito.version from 4.4.0 to 4.5.1 Bumps `mockito.version` from 4.4.0 to 4.5.1. Updates `mockito-core` from 4.4.0 to 4.5.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.1) Updates `mockito-junit-jupiter` from 4.4.0 to 4.5.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 7ec91486ac..5a31edb4e3 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -97,7 +97,7 @@ 3.0.0-M6 2.24 4.2.8 - 4.4.0 + 4.5.1 2.3.1 8.0.27 4.1.76.Final diff --git a/pom.xml b/pom.xml index 6db93b7233..9afb471cd1 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 5.8.1 4.3.3 8.42 - 4.4.0 + 4.5.1 30.0-jre 1.0 From f1da6d9e5f0d6514c6c242efa80603050dd7fdbc Mon Sep 17 00:00:00 2001 From: Adam Gent Date: Mon, 9 May 2022 13:56:02 -0400 Subject: [PATCH 16/97] Add a queue for hotreload to group changes --- .../src/main/java/io/jooby/run/JoobyRun.java | 141 ++++++++++++++++-- .../java/io/jooby/run/JoobyRunOptions.java | 26 ++++ 2 files changed, 157 insertions(+), 10 deletions(-) diff --git a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java index 57fa29b794..db49aca151 100644 --- a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java +++ b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java @@ -19,12 +19,18 @@ import java.nio.file.ClosedWatchServiceException; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Clock; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; /** @@ -57,6 +63,13 @@ private static class AppModule { private Module module; private ClassLoader contextClassLoader; private int counter; + private final AtomicInteger state = new AtomicInteger(CLOSED); + private static final int CLOSED = 1 << 0; + private static final int UNLOADING = 1 << 1; + private static final int UNLOADED = 1 << 2; + private static final int STARTING = 1 << 3; + private static final int RESTART = 1 << 4; + private static final int RUNNING = 1 << 5; AppModule(Logger logger, ExtModuleLoader loader, ClassLoader contextClassLoader, JoobyRunOptions conf) { @@ -67,6 +80,11 @@ private static class AppModule { } public Exception start() { + if (!(state.compareAndSet(CLOSED, STARTING) + || state.compareAndSet(UNLOADED, STARTING))) { + debugState("Jooby already starting."); + return null; + } try { module = loader.loadModule(conf.getProjectName()); ModuleClassLoader classLoader = module.getClassLoader(); @@ -102,6 +120,9 @@ public Exception start() { } catch (Throwable x) { printErr(x); } finally { + if (state.compareAndSet(STARTING, RUNNING)) { + debugState("Jooby is now"); + } Thread.currentThread().setContextClassLoader(contextClassLoader); } // In theory: application started successfully, then something went wrong. Still, users @@ -139,10 +160,19 @@ private boolean isFatal(Throwable cause) { || cause instanceof VirtualMachineError; } + public boolean isStarting() { + long s = state.longValue(); + return s > CLOSED && s < RUNNING; + } + public void restart() { - closeServer(); - unloadModule(); - start(); + if (state.compareAndSet(RUNNING, RESTART)) { + closeServer(); + unloadModule(); + start(); + } else { + debugState("Already restarting."); + } } public void close() { @@ -160,6 +190,10 @@ private Throwable withoutReflection(Throwable cause) { } private void unloadModule() { + if (!state.compareAndSet(CLOSED, UNLOADING)) { + debugState("Cannot unload as server isn't closed."); + return; + } try { if (module != null) { loader.unload(conf.getProjectName(), module); @@ -167,20 +201,54 @@ private void unloadModule() { } catch (Exception x) { logger.debug("unload module resulted in exception", x); } finally { + state.compareAndSet(UNLOADING, UNLOADED); module = null; } } private void closeServer() { try { - Class ref = module.getClassLoader().loadClass(SERVER_REF); + debugState("Closing server."); + Class ref = module.getClassLoader().loadClass(SERVER_REF); ref.getDeclaredMethod(SERVER_REF_STOP).invoke(null); } catch (Exception x) { logger.error("Application shutdown resulted in exception", withoutReflection(x)); + } finally { + state.set(CLOSED); + } + } + + private void debugState(String message) { + if (logger.isDebugEnabled()) { + String name; + switch (state.get()) { + case CLOSED: + name = "CLOSED"; + break; + case UNLOADING: + name = "UNLOADING"; + break; + case UNLOADED: + name = "UNLOADED"; + break; + case STARTING: + name = "STARTING"; + break; + case RESTART: + name = "RESTART"; + break; + case RUNNING: + name = "RUNNING"; + break; + default: + throw new IllegalStateException("BUG"); + } + logger.debug(message + " state: {}", name); } } } + static final String SERVER_REF = "io.jooby.run.ServerRef"; static final String SERVER_REF_STOP = "stop"; @@ -199,6 +267,17 @@ private void closeServer() { private AppModule module; + private final Clock clock; + + private final ConcurrentLinkedQueue queue = new ConcurrentLinkedQueue<>(); + + /* + * How long we wait after the last change before restart + */ + private final long waitTimeBeforeRestartMillis; + + private final long initialDelayBeforeFirstRestartMillis; + /** * Creates a new instances with the given options. * @@ -206,6 +285,10 @@ private void closeServer() { */ public JoobyRun(JoobyRunOptions options) { this.options = options; + clock = Clock.systemUTC(); // Possibly change for unit test + waitTimeBeforeRestartMillis = options.getWaitTimeBeforeRestart(); + // this might not need to be configurable + initialDelayBeforeFirstRestartMillis = JoobyRunOptions.INITIAL_DELAY_BEFORE_FIRST_RESTART; } /** @@ -253,17 +336,26 @@ public boolean addResource(Path path) { public void start() throws Throwable { this.watcher = newWatcher(); try { + logger.debug("project: {}", toString()); - ModuleFinder[] finders = { - new FlattenClasspath(options.getProjectName(), resources, dependencies)}; + ModuleFinder[] finders = + {new FlattenClasspath(options.getProjectName(), resources, dependencies)}; ExtModuleLoader loader = new ExtModuleLoader(finders); - module = new AppModule(logger, loader, Thread.currentThread().getContextClassLoader(), - options); + module = + new AppModule(logger, loader, Thread.currentThread().getContextClassLoader(), options); + ScheduledExecutorService se; Exception error = module.start(); if (error == null) { - watcher.watch(); + se = Executors.newScheduledThreadPool(1); + se.scheduleAtFixedRate(this::actualRestart, initialDelayBeforeFirstRestartMillis, + waitTimeBeforeRestartMillis, TimeUnit.MILLISECONDS); + try { + watcher.watch(); + } finally { + se.shutdownNow(); + } } else { // exit shutdown(); @@ -278,7 +370,36 @@ public void start() throws Throwable { * Restart the application. */ public void restart() { - module.restart(); + //module.restart(); + queue.offer(new Event(clock.millis())); + } + + private static class Event { + private final long time; + Event(long time) { + this.time = time; + } + }; + + + + private synchronized void actualRestart() { + if (module.isStarting()) { + return; // We don't empty the queue. This is the case a change was made while starting. + } + // Event e = queue.peek(); + long t = clock.millis(); + Event e = queue.peek(); + if (e == null) { + return; // queue was empty + } + for (; e != null && (t - e.time) > waitTimeBeforeRestartMillis; e = queue.peek()) { + queue.poll(); + } + // e will be null if the queue is empty which means all events were old enough + if (e == null) { + module.restart(); + } } /** diff --git a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java index 47455f4374..b2f40995e9 100644 --- a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java +++ b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java @@ -28,6 +28,12 @@ public class JoobyRunOptions { private Integer port = null; + private Long waitTimeBeforeRestart = DEFAULT_WAIT_TIME_BEFORE_RESTART; + + private static final long DEFAULT_WAIT_TIME_BEFORE_RESTART = 500L; + + static final long INITIAL_DELAY_BEFORE_FIRST_RESTART = 5000L; + /** * Project name. * @@ -82,6 +88,26 @@ public void setPort(Integer port) { this.port = port; } + /** + * How long to wait after last file change to restart. Default is: 500 milliseconds. + * + * @return Wait time in milliseconds + */ + public Long getWaitTimeBeforeRestart() { + return waitTimeBeforeRestart; + } + + /** + * Set wait time before restart. + * + * @param waitTimeBeforeRestart + */ + public void setWaitTimeBeforeRestart(Long waitTimeBeforeRestart) { + if (waitTimeBeforeRestart != null) { + this.waitTimeBeforeRestart = waitTimeBeforeRestart; + } + } + /** * List of file extensions that trigger an application restart. Default is: conf, * properties and class. From 89cc4afd52ccaa108dbce07112286fbd88f6a931 Mon Sep 17 00:00:00 2001 From: Adam Gent Date: Mon, 9 May 2022 14:16:55 -0400 Subject: [PATCH 17/97] Fix unit test for new jooby run for wait time --- .../src/main/java/io/jooby/maven/RunMojo.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java index 56975364df..8753b10291 100644 --- a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java +++ b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java @@ -62,6 +62,12 @@ public class RunMojo extends BaseMojo { @Parameter(property = "jooby.port") private Integer port; + /** + * How long to wait after last file change to restart. Default is: 500 milliseconds. + */ + @Parameter(property = "jooby.waitTimeBeforeRestart") + private Long waitTimeBeforeRestart; + @Override protected void doExecute(List projects, String mainClass) throws Throwable { Maven maven = getMaven(); @@ -122,6 +128,7 @@ private JoobyRunOptions createOptions(String mainClass) { options.setCompileExtensions(compileExtensions); } options.setPort(port); + options.setWaitTimeBeforeRestart(waitTimeBeforeRestart); options.setProjectName(session.getCurrentProject().getArtifactId()); if (restartExtensions != null) { options.setRestartExtensions(restartExtensions); From d0b1a4acc3f8ed7e771a65203e5e62018b7e41db Mon Sep 17 00:00:00 2001 From: Adam Gent Date: Mon, 9 May 2022 14:53:48 -0400 Subject: [PATCH 18/97] Make sonatype-lift happy --- modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java | 1 + .../src/main/java/io/jooby/run/JoobyRunOptions.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java index db49aca151..4b775ecde4 100644 --- a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java +++ b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java @@ -333,6 +333,7 @@ public boolean addResource(Path path) { * * @throws Throwable If something goes wrong. */ + @SuppressWarnings("FutureReturnValueIgnored") public void start() throws Throwable { this.watcher = newWatcher(); try { diff --git a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java index b2f40995e9..956f3ba69a 100644 --- a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java +++ b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRunOptions.java @@ -91,16 +91,16 @@ public void setPort(Integer port) { /** * How long to wait after last file change to restart. Default is: 500 milliseconds. * - * @return Wait time in milliseconds + * @return Wait time in milliseconds. */ public Long getWaitTimeBeforeRestart() { return waitTimeBeforeRestart; } /** - * Set wait time before restart. + * Set wait time before restart on file change. * - * @param waitTimeBeforeRestart + * @param waitTimeBeforeRestart the time in milliseconds. */ public void setWaitTimeBeforeRestart(Long waitTimeBeforeRestart) { if (waitTimeBeforeRestart != null) { From 42b24b1249fecde7da41fb676c9141cc4d5264e5 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 10 May 2022 16:19:32 -0300 Subject: [PATCH 19/97] jooby-run: Add waitTimeBeforeRestart to gradle plugin - See #2577 --- .../main/java/io/jooby/gradle/RunTask.java | 29 +++++++++++++++++++ modules/jooby-gradle-setup/pom.xml | 14 +++++++++ .../src/main/java/io/jooby/run/JoobyRun.java | 18 +++++------- 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java b/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java index e8b5e4acfc..b2a2ebfb14 100644 --- a/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java +++ b/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java @@ -53,6 +53,11 @@ public class RunTask extends BaseTask { private Integer port; + /** + * How long to wait after last file change to restart. Default is: 500 milliseconds. + */ + private Long waitTimeBeforeRestart; + /** * Run task. * @@ -81,6 +86,9 @@ public void run() throws Throwable { if (restartExtensions != null) { config.setRestartExtensions(restartExtensions); } + if (waitTimeBeforeRestart != null) { + config.setWaitTimeBeforeRestart(waitTimeBeforeRestart); + } config.setProjectName(current.getName()); getLogger().info("jooby options: {}", config); @@ -255,6 +263,27 @@ public void setPort(Integer port) { this.port = port; } + /** + * How long to wait after last file change to restart. Default is: 500 milliseconds. + * + * @return How long to wait after last file change. + */ + @Input + @org.gradle.api.tasks.Optional + public Long getWaitTimeBeforeRestart() { + return waitTimeBeforeRestart; + } + + /** + * Set How long to wait after last file change to restart. + * Default is: 500 milliseconds. + * + * @param waitTimeBeforeRestart How long to wait after last file change to restart. + */ + public void setWaitTimeBeforeRestart(Long waitTimeBeforeRestart) { + this.waitTimeBeforeRestart = waitTimeBeforeRestart; + } + /** * * Shutdown without killing gradle daemon on ENTER KEY. diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index cb9b343a22..5d569607d8 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -43,6 +43,20 @@ + + compilePlugin + + exec + + compile + + + compileJava + -PjoobyVersion=${project.version} + + + + publishToMavenLocal diff --git a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java index 4b775ecde4..732ba0a799 100644 --- a/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java +++ b/modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java @@ -45,6 +45,13 @@ */ public class JoobyRun { + private static class Event { + private final long time; + Event(long time) { + this.time = time; + } + } + private static class ExtModuleLoader extends ModuleLoader { ExtModuleLoader(ModuleFinder... finders) { @@ -371,24 +378,13 @@ public void start() throws Throwable { * Restart the application. */ public void restart() { - //module.restart(); queue.offer(new Event(clock.millis())); } - private static class Event { - private final long time; - Event(long time) { - this.time = time; - } - }; - - - private synchronized void actualRestart() { if (module.isStarting()) { return; // We don't empty the queue. This is the case a change was made while starting. } - // Event e = queue.peek(); long t = clock.millis(); Event e = queue.peek(); if (e == null) { From cf930707968760fbeca0ec83e3d9f5351fa7aec6 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 11 May 2022 08:25:00 -0300 Subject: [PATCH 20/97] jooby-run: document waitTimeBeforeRestart. See #2577 --- docs/asciidoc/dev-tools.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/asciidoc/dev-tools.adoc b/docs/asciidoc/dev-tools.adoc index b5719935aa..4f5d18bef5 100644 --- a/docs/asciidoc/dev-tools.adoc +++ b/docs/asciidoc/dev-tools.adoc @@ -109,6 +109,7 @@ The next example shows all the available options with their default values: conf,properties,class <2> java,kt <3> 8080 <4> + 500 <5> ... @@ -137,6 +138,7 @@ joobyRun { restartExtensions = ["conf", "properties", "class"] <2> compileExtensions = ["java", "kt"] <3> port = 8080 <4> + waitTimeBeforeRestart = 500 <5> } ---- @@ -144,4 +146,5 @@ joobyRun { <2> Restart extensions. A change on these files trigger a restart request. <3> Source extensions. A change on these files trigger a compilation request, followed by a restart request. <4> Application port +<5> How long to wait after last file change to restart. Default is: `500` milliseconds. From c0d82e4c2dad113ae235150bd05e39baca48a7a6 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 11 May 2022 08:26:27 -0300 Subject: [PATCH 21/97] build: add gradle compile to pipeline --- .github/workflows/full-build.yml | 2 +- .github/workflows/quick-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml index a907b48f4b..5ccc9c1aa2 100644 --- a/.github/workflows/full-build.yml +++ b/.github/workflows/full-build.yml @@ -24,7 +24,7 @@ jobs: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 - name: Build - run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle -s ./etc/central-settings.xml + run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle,gradlePlugin -s ./etc/central-settings.xml env: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml index deaf400cfc..a33d3bf4cf 100644 --- a/.github/workflows/quick-build.yml +++ b/.github/workflows/quick-build.yml @@ -28,7 +28,7 @@ jobs: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 - name: Build - run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle -s ./etc/central-settings.xml + run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle,gradlePlugin -s ./etc/central-settings.xml env: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 From 2fddb0c0cee099bdf95537bc02a6509a51ed493a Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 11 May 2022 08:49:54 -0300 Subject: [PATCH 22/97] build: revert gradle integration from build --- .github/workflows/full-build.yml | 2 +- .github/workflows/quick-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml index 5ccc9c1aa2..a907b48f4b 100644 --- a/.github/workflows/full-build.yml +++ b/.github/workflows/full-build.yml @@ -24,7 +24,7 @@ jobs: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 - name: Build - run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle,gradlePlugin -s ./etc/central-settings.xml + run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle -s ./etc/central-settings.xml env: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml index a33d3bf4cf..deaf400cfc 100644 --- a/.github/workflows/quick-build.yml +++ b/.github/workflows/quick-build.yml @@ -28,7 +28,7 @@ jobs: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 - name: Build - run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle,gradlePlugin -s ./etc/central-settings.xml + run: mvn clean checkstyle:checkstyle package -pl '!docs' -P checkstyle -s ./etc/central-settings.xml env: BUILD_PORT: 0 BUILD_SECURE_PORT: 0 From 1143bd6ddf8509ee940ca7f185b00f9bc3d7dd96 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 14 May 2022 13:53:08 -0300 Subject: [PATCH 23/97] WebSocket: Fix raise condition while sending a message on connect - Fix #2585 --- .../jooby/internal/netty/NettyWebSocket.java | 2 +- .../io/jooby/internal/utow/UtowWebSocket.java | 2 +- tests/src/test/java/io/jooby/WebClient.java | 4 ++ .../test/java/io/jooby/i2858/Issue2858.java | 56 +++++++++++++++++++ 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 tests/src/test/java/io/jooby/i2858/Issue2858.java diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java index 4f1969126d..d30f8cfd7d 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java @@ -223,6 +223,7 @@ private void handleError(Throwable x) { } void fireConnect() { + open.set(true); addSession(this); if (connectCallback != null) { fireCallback(webSocketTask(() -> { @@ -293,7 +294,6 @@ private Runnable webSocketTask(Runnable runnable, boolean isInit) { private void waitForConnect() { try { ready.await(); - open.set(true); } catch (InterruptedException x) { Thread.currentThread().interrupt(); } diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java index be1fed031d..666e035790 100644 --- a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java +++ b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java @@ -163,6 +163,7 @@ public UtowWebSocket(UtowContext ctx, WebSocketChannel channel) { void fireConnect() { // fire only once try { + open.set(true); addSession(this); Config conf = ctx.getRouter().getConfig(); long timeout = conf.hasPath("websocket.idleTimeout") @@ -196,7 +197,6 @@ void fireConnect() { private void waitForConnect() { try { ready.await(); - open.set(true); } catch (InterruptedException x) { Thread.currentThread().interrupt(); } diff --git a/tests/src/test/java/io/jooby/WebClient.java b/tests/src/test/java/io/jooby/WebClient.java index 0ea4cafcd9..5d51789bd1 100644 --- a/tests/src/test/java/io/jooby/WebClient.java +++ b/tests/src/test/java/io/jooby/WebClient.java @@ -100,6 +100,10 @@ public BlockingWebSocket(WebSocket ws, SyncWebSocketListener listener) { public String send(String message) { ws.send(message); + return lastMessage(); + } + + public String lastMessage() { return listener.lastMessage(); } diff --git a/tests/src/test/java/io/jooby/i2858/Issue2858.java b/tests/src/test/java/io/jooby/i2858/Issue2858.java new file mode 100644 index 0000000000..0dff8ccfe5 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2858/Issue2858.java @@ -0,0 +1,56 @@ +package io.jooby.i2858; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.json.JSONObject; + +import io.jooby.Jooby; +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class Issue2858 { + + public static class App2858 extends Jooby { + + public static volatile boolean error = false; + + { + ws("/2858", (ctx, initializer) -> { + initializer.onConnect(ws -> { + try { + ws.send(new JSONObject().put("connected", true).toString()); + } catch (Exception x) { + error = true; + } + }); + initializer.onMessage((ws, message) -> { + ws.send(new JSONObject().put(message.value(), error).toString()); + }); + + initializer.onError((ws, cause) -> { + error = true; + getLog().error("error ", cause); + }); + }); + + error((ctx, cause, code) -> { + error = true; + getLog().error("error ", cause); + }); + } + } + + @ServerTest + public void shouldBeAbleToSendMessageOnConnect(ServerTestRunner runner) { + App2858 app = new App2858(); + runner.use(() -> app) + .ready(client -> { + client.syncWebSocket("/2858", ws -> { + assertEquals("{\"connected\":true}", ws.lastMessage()); + assertEquals("{\"error\":false}", ws.send("error")); + }); + }); + + assertEquals(false, app.error); + } +} From 14de37922b687b873cba0129af3f7491e8b323ee Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 14 May 2022 20:39:05 -0300 Subject: [PATCH 24/97] version bump: upgrade dependencies --- pom.xml | 59 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 6a1c177784..18caa70dc1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,10 +20,11 @@ 2.3.31 - 4.2.0 + 4.3.0 3.1.5 - 2.13.2 - 2.13.2.2 + 2.13.3 + 2.13.2 + 2.13.3 2.9.0 1.0.2 1.0.9 @@ -32,9 +33,9 @@ 4.0.3 - 8.0.27 + 8.0.29 1.2 - 2.1.210 + 2.1.212 5.6.3.Final 12.16.0 3.28.0 @@ -45,12 +46,12 @@ 2.7.0 2.8.8 - 1.4.1 + 1.4.2 3.1.5.Final - 5.3.7 - 5.0.1 + 5.3.20 + 5.1.0 1.2.9 @@ -61,14 +62,14 @@ 1.5 - 0.0.8 - 4.2.8 + 0.0.9 + 4.2.9 1.11.0.Final - 9.1 + 9.3 2.2.17.Final @@ -77,11 +78,11 @@ 2.2.21 - 3.4.14 + 3.4.18 - 2.1.13 - 2.0.30 + 2.2.0 + 2.0.32 2.0.0-rc.20 @@ -94,17 +95,17 @@ 4.9.3 - 0.11.2 + 0.11.5 4.5.6 2.3.2 9.1.6 6.4.1 - 1.12.191 + 1.12.220 ${aws-java-sdk.version} - 1.12.0 + 1.12.1 1.9.3 - 2.8.0 + 2.11.0 1.1.6.RELEASE @@ -113,16 +114,16 @@ true - 0.8.7 - 5.8.1 + 0.8.8 + 5.8.2 4.3.3 8.42 4.5.1 - 30.0-jre + 30.1-jre - 1.0 + 1.0.1 0.19 - 1.1.2 + 1.1.3 2.6 @@ -138,15 +139,15 @@ 2.24 3.1.2 3.8.1 - 3.8.1 + 3.8.5 2.8.2 3.0.0-M3 3.0.1 3.2.2 3.3.0 3.2.0 - 3.6.0 - 3.8.1 + 3.6.4 + 3.8.5 3.6.0 2.2.1 3.2.0 @@ -156,7 +157,7 @@ 3.0.0-M6 2.3.1 1.6.8 - 3.3.0 + 3.4.1 3.1.1 2.8.1 3.0.0 @@ -628,7 +629,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - ${jackson.version} + ${jackson-dataformat-yaml.version} @@ -1439,7 +1440,7 @@ org.apache.ant ant - 1.10.11 + 1.10.12 From ef55836a1ae4e92cfa3bc3a5b819bbf312739d2a Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 15 May 2022 13:12:02 -0300 Subject: [PATCH 25/97] v2.14.2 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 81 ++++++++++++++---------- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 103 insertions(+), 90 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 722367f647..70f694a140 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 657fd49b96..678524e1e6 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 1c9f2517b3..c2c602feae 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index f741b7058b..75b470fa0a 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 3c84f97f7d..2bdbeada60 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index cc0b2002b7..88217f23ff 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 80eeba0652..1fdb5fad47 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 @@ -16,20 +16,20 @@ - 2.14.2-SNAPSHOT + 2.14.2 4.0.3 3.2.0 - 9.1 - 1.0 - 1.12.191 + 9.3 + 1.0.1 + 1.12.220 6.4.1 2.8.8 8.42 1.5 - 2.8.0 + 2.11.0 2.11.1 0.19 - 1.4.1 + 1.4.2 2.5.2 9.1.6 12.16.0 @@ -37,21 +37,22 @@ 7.5.1 2.3.31 1.11.0 - 1.12.0 + 1.12.1 2.6 0.9-rc-1 2.6 16.2 2.9.0 - 30.0-jre - 5.0.1 - 2.1.210 - 4.2.0 + 30.1-jre + 5.1.0 + 2.1.212 + 4.3.0 5.6.3.Final - 2.13.2.2 - 2.13.2 - 0.8.7 - 0.8.7 + 2.13.3 + 2.13.2 + 2.13.3 + 0.8.8 + 0.8.8 1.0.2 2.1.6 1.9.3 @@ -59,13 +60,13 @@ 1.11.0.Final 3.28.0 9.4.46.v20220331 - 0.0.8 - 1.12.191 - 2.14.2-SNAPSHOT - 2.14.2-SNAPSHOT - 0.11.2 + 0.0.9 + 1.12.220 + 2.14.2 + 2.14.2 + 0.11.5 3.0.2 - 5.8.1 + 5.8.2 2.7.0 1.4.32 1.4.1 @@ -79,15 +80,15 @@ 3.3.0 3.1.2 3.8.1 - 3.8.1 + 3.8.5 3.1.2 2.8.2 3.0.0-M3 3.0.1 3.2.2 3.3.0 - 3.6.0 - 3.8.1 + 3.6.4 + 3.8.5 3.6.0 2.2.1 3.2.0 @@ -96,30 +97,30 @@ 3.2.1 3.0.0-M6 2.24 - 4.2.8 + 4.2.9 4.5.1 2.3.1 - 8.0.27 + 8.0.29 4.1.77.Final 1.6.8 v12.19.0 4.9.3 4.5.6 3.1.5 - 3.3.0 + 3.4.1 2.3.2 - 3.4.14 + 3.4.18 2.0.0-rc.20 4.3.3 1.3.0 2.2.21 1.7.32 - 5.3.7 + 5.3.20 3.1.1 - 2.0.30 - 2.1.13 + 2.0.32 + 2.2.0 3.0.12.RELEASE - 1.1.2 + 1.1.3 1.1.6.RELEASE 2.2.17.Final 2.8.1 @@ -522,7 +523,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - ${jackson.version} + ${jackson-dataformat-yaml.version} jar @@ -1101,6 +1102,18 @@ ${plexus-utils.version} jar + + com.amazonaws + aws-java-sdk-chimesdkmediapipelines + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-ivschat + ${aws-java-sdk.version} + jar + com.amazonaws aws-java-sdk-pinpointsmsvoicev2 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index b608ce7321..3569387902 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 5651732e5a..a9919d1719 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 00774b4b51..7094c111c6 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 0e4e25245b..52f09a80c6 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 795018ee53..d4ab06fe2f 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 73eb51c36c..84065d35dd 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index c8bdcd1a81..99d30dfed6 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 31de226567..d8e00c6a5c 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 5d569607d8..886c87c10a 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 4885554a77..5acba69e98 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 02514feb35..9a20eb1f80 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 85cfca3b20..424859a34c 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 3404c9c827..f8b49d9e29 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index e0b04433e1..8a386f86f5 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index f6f1f91c14..3aa018833e 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 7bcf2bc905..19faa6e468 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 07f4ba683c..4ff7751ad7 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 738fb786cb..c608f45293 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index bff91c808a..e749703dac 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 52810b0060..a409f17c05 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index b987d92855..92c30cea38 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index efef902322..d9625cfe6a 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 179d75eafd..b724639039 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 5b7e0dcb9c..7d98413d53 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index a542c6d449..46666d4619 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 6b2f98792a..657cbdefe8 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index d0b1353e45..cdc5c34dea 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 95c80cdd7f..146b8920dc 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 5dde6f9aae..a5e2d3545f 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index d07b188c09..1849e43cdc 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index b5dec7a8d9..33dfb636ec 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index fb6356e8ef..5d764a3d59 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 2eb5d7e0f4..1d48246432 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index da6e49e7fb..95d8b76bec 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 9efd7f7d27..ece848c793 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 1a89604e39..3e5697ffed 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index c69fc01801..5ae9efcfb3 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 1bacbdf67b..5466e4cc02 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 8f7078e03e..495c1be9a1 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 38a306dd60..f642724d47 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index a87ae5e23f..b7ecdcc0f1 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 9182afc4f9..7fc7c0fb3b 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 41c56f3ae9..9be9ded333 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index b7cd5fed44..14dc3de742 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index eeba862759..b5c925ebb0 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index dbedfa0dce..0f2a65dd39 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 009bcb4973..e5b5f0e7a5 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 590c2043d4..7475f5c43c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2-SNAPSHOT + 2.14.2 modules diff --git a/pom.xml b/pom.xml index 18caa70dc1..e0e1c8ddc9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.14.2-SNAPSHOT + 2.14.2 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index bf522d76bd..62a4b69486 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2-SNAPSHOT + 2.14.2 4.0.0 From 2634521b23e6289d944f88a014c55d2df5387e77 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 15 May 2022 13:24:54 -0300 Subject: [PATCH 26/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 2 +- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 70f694a140..242cb2f7d9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 678524e1e6..47b695893f 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index c2c602feae..813008bf04 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 75b470fa0a..66f9291cc5 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 2bdbeada60..4f05c5d190 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 88217f23ff..e110659fbe 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 1fdb5fad47..0ada4eb396 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 3569387902..3f907e0df3 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index a9919d1719..f230c15406 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 7094c111c6..88f7dd88e8 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 52f09a80c6..fa70337eeb 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index d4ab06fe2f..df48fb0059 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 84065d35dd..127aa0e022 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 99d30dfed6..31836dc4e3 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index d8e00c6a5c..deeea74a69 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 886c87c10a..0d41c0362e 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 5acba69e98..dc1c4dbd9b 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 9a20eb1f80..92dd752263 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 424859a34c..747dbf7e10 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index f8b49d9e29..ea843f2491 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 8a386f86f5..5727a3b8ed 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 3aa018833e..a3db2f0d3b 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 19faa6e468..41db7ced12 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 4ff7751ad7..09cb3dbcc7 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index c608f45293..520c8b3f0a 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index e749703dac..1628e85b3f 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index a409f17c05..c7abf7526d 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 92c30cea38..1ba43885b2 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index d9625cfe6a..26bfb7de8d 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index b724639039..85cb99aa37 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 7d98413d53..8bfc702d21 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 46666d4619..ac74016303 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 657cbdefe8..a629867070 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index cdc5c34dea..d543e6a71a 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 146b8920dc..902094bd4c 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index a5e2d3545f..2f424f5b20 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 1849e43cdc..420bc21e15 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 33dfb636ec..a5c4bdcf6e 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 5d764a3d59..2bcaeb4fe0 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 1d48246432..54ed7e966e 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 95d8b76bec..fa9487bdba 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index ece848c793..76f329528b 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 3e5697ffed..bf812bf841 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 5ae9efcfb3..b234a86fcc 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 5466e4cc02..944fc67246 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 495c1be9a1..6855b9c3f4 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index f642724d47..bd5ee15dd2 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index b7ecdcc0f1..739e6b091f 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 7fc7c0fb3b..f0ee24b920 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 9be9ded333..aea8b962d6 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 14dc3de742..714393f7c5 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index b5c925ebb0..ffb8cda7fc 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 0f2a65dd39..8046621f7c 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index e5b5f0e7a5..d949454725 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 7475f5c43c..707000e662 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2 + 2.15.0-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index e0e1c8ddc9..ecf10fdb3d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.14.2 + 2.15.0-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 62a4b69486..7f839ea21e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.14.2 + 2.15.0-SNAPSHOT 4.0.0 From b6b606c8d824a74a97317e8802689bfd77b01593 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 15 May 2022 13:35:39 -0300 Subject: [PATCH 27/97] build: run on 17 and latest --- .github/workflows/full-build.yml | 2 +- .github/workflows/quick-build.yml | 2 +- modules/jooby-bom/pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml index a907b48f4b..d93180b1c4 100644 --- a/.github/workflows/full-build.yml +++ b/.github/workflows/full-build.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [1.8, 11, 13] + java_version: [1.8, 11, 17, 18] os: [ubuntu-latest, windows-latest, macOS-latest] steps: diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml index deaf400cfc..93c009e5af 100644 --- a/.github/workflows/quick-build.yml +++ b/.github/workflows/quick-build.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [1.8, 11, 13] + java_version: [1.8, 11, 17] os: [ubuntu-latest] steps: diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 0ada4eb396..e8f2c4fb2e 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -16,7 +16,7 @@ - 2.14.2 + 2.15.0-SNAPSHOT 4.0.3 3.2.0 9.3 @@ -62,8 +62,8 @@ 9.4.46.v20220331 0.0.9 1.12.220 - 2.14.2 - 2.14.2 + 2.15.0-SNAPSHOT + 2.15.0-SNAPSHOT 0.11.5 3.0.2 5.8.2 From ef7ec3f74f4c0777f8483ce90e1ea341f350e76e Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 15 May 2022 13:39:46 -0300 Subject: [PATCH 28/97] build: revert build on jdk 17 --- .github/workflows/full-build.yml | 2 +- .github/workflows/quick-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml index d93180b1c4..a907b48f4b 100644 --- a/.github/workflows/full-build.yml +++ b/.github/workflows/full-build.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [1.8, 11, 17, 18] + java_version: [1.8, 11, 13] os: [ubuntu-latest, windows-latest, macOS-latest] steps: diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml index 93c009e5af..deaf400cfc 100644 --- a/.github/workflows/quick-build.yml +++ b/.github/workflows/quick-build.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [1.8, 11, 17] + java_version: [1.8, 11, 13] os: [ubuntu-latest] steps: From bbbb14efbe4b5de09236333c6bc06c33e7189ebc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 00:01:02 +0000 Subject: [PATCH 29/97] Bump rest-assured from 4.3.3 to 5.0.1 Bumps [rest-assured](https://github.com/rest-assured/rest-assured) from 4.3.3 to 5.0.1. - [Release notes](https://github.com/rest-assured/rest-assured/releases) - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.3.3...rest-assured-5.0.1) --- updated-dependencies: - dependency-name: io.rest-assured:rest-assured dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index e8f2c4fb2e..d554918459 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -111,7 +111,7 @@ 2.3.2 3.4.18 2.0.0-rc.20 - 4.3.3 + 5.0.1 1.3.0 2.2.21 1.7.32 diff --git a/pom.xml b/pom.xml index ecf10fdb3d..d153ff03e1 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 0.8.8 5.8.2 - 4.3.3 + 5.0.1 8.42 4.5.1 30.1-jre From 012185d92e16e68795f419afdadf79e6da30a4f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 00:01:34 +0000 Subject: [PATCH 30/97] Bump logback-classic from 1.2.9 to 1.2.11 Bumps logback-classic from 1.2.9 to 1.2.11. --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index e8f2c4fb2e..aab8ef40bd 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -74,7 +74,7 @@ 4.1 2.17.1 1.2 - 1.2.9 + 1.2.11 3.0.0 3.2.0 3.3.0 diff --git a/pom.xml b/pom.xml index ecf10fdb3d..179b254287 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 5.1.0 - 1.2.9 + 1.2.11 2.17.1 1.7.32 From 0b857e955f302eedfc6bc274f10fb0bb012eba77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 00:01:47 +0000 Subject: [PATCH 31/97] Bump directory-watcher from 0.15.0 to 0.15.1 Bumps [directory-watcher](https://github.com/gmethvin/directory-watcher) from 0.15.0 to 0.15.1. - [Release notes](https://github.com/gmethvin/directory-watcher/releases) - [Commits](https://github.com/gmethvin/directory-watcher/compare/v0.15.0...v0.15.1) --- updated-dependencies: - dependency-name: io.methvin:directory-watcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 242cb2f7d9..dd55d29792 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -56,7 +56,7 @@ io.methvin directory-watcher - 0.15.0 + 0.15.1 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 944fc67246..3f4df85eac 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -30,7 +30,7 @@ io.methvin directory-watcher - 0.15.0 + 0.15.1 From 1e8f8b56449bef15cdcccdaeaf373a70a39decb5 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 18 May 2022 11:04:35 -0300 Subject: [PATCH 32/97] kotlin: upgrade to 1.6.x fix #2592 --- .../internal/openapi/ReturnTypeParser.java | 358 ++++++++++-------- .../jooby/internal/openapi/RouteParser.java | 136 +++++-- pom.xml | 4 +- 3 files changed, 292 insertions(+), 206 deletions(-) diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java index c3fa4438c5..3c90301d24 100644 --- a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java +++ b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java @@ -31,13 +31,17 @@ import org.objectweb.asm.tree.TypeInsnNode; import org.objectweb.asm.tree.VarInsnNode; +import io.jooby.Context; + public class ReturnTypeParser { public static List parse(ParserContext ctx, MethodNode node) { Type returnType = Type.getReturnType(node.desc); boolean notSynthetic = (node.access & Opcodes.ACC_SYNTHETIC) == 0; - if (notSynthetic && !TypeFactory.OBJECT.equals(returnType) && !TypeFactory.VOID - .equals(returnType)) { + if (notSynthetic + && !TypeFactory.OBJECT.equals(returnType) + && !TypeFactory.VOID.equals(returnType) + && !TypeFactory.JOOBY.equals(returnType)) { if (node.signature == null) { return Collections.singletonList(ASMType.parse(returnType.getDescriptor())); } else { @@ -53,172 +57,179 @@ public static List parse(ParserContext ctx, MethodNode node) { } public static List parseIgnoreSignature(ParserContext ctx, MethodNode node) { - Type returnType = Type.getReturnType(node.desc); List result = InsnSupport.next(node.instructions.getFirst()) .filter(it -> it.getOpcode() == Opcodes.ARETURN || it.getOpcode() == Opcodes.IRETURN || it.getOpcode() == Opcodes.RETURN) - .map(it -> { - if (it.getOpcode() == Opcodes.RETURN) { - return returnType.getClassName(); - } - /** IRETURN */ - if (it.getOpcode() == Opcodes.IRETURN) { - if (it instanceof InsnNode) { - AbstractInsnNode prev = it.getPrevious(); - if (prev instanceof IntInsnNode) { - return Integer.class.getName(); - } - if (prev instanceof InsnNode) { - if (prev.getOpcode() == Opcodes.ICONST_0 - || prev.getOpcode() == Opcodes.ICONST_1) { - return Boolean.class.getName(); - } - } - } + .map(it -> handleReturnType(ctx, node, it)) + .map(Object::toString) + .distinct() + .collect(Collectors.toList()); + return result; + } + + private static String handleReturnType(ParserContext ctx, MethodNode node, AbstractInsnNode it) { + Type returnType = Type.getReturnType(node.desc); + + if (it.getOpcode() == Opcodes.RETURN) { + return returnType.getClassName(); + } + /** IRETURN */ + if (it.getOpcode() == Opcodes.IRETURN) { + if (it instanceof InsnNode) { + AbstractInsnNode prev = it.getPrevious(); + if (prev instanceof IntInsnNode) { + return Integer.class.getName(); + } + if (prev instanceof InsnNode) { + if (prev.getOpcode() == Opcodes.ICONST_0 + || prev.getOpcode() == Opcodes.ICONST_1) { + return Boolean.class.getName(); } + } + } + } - for (Iterator iterator = InsnSupport - .prevIterator(it.getPrevious()); iterator.hasNext(); ) { - AbstractInsnNode i = iterator.next(); - if (i instanceof MethodInsnNode && (((MethodInsnNode) i).owner - .equals("kotlin/jvm/internal/Intrinsics"))) { - // skip Ldc and load var - // dup or aload - // visitLdcInsn("$receiver"); - // visitMethodInsn(INVOKESTATIC, "kotlin/jvm/internal/Intrinsics", "checkParameterIsNotNull", "(Ljava/lang/Object;Ljava/lang/String;)V", false); - iterator.next(); - iterator.next(); - continue; - } - if (i instanceof MethodInsnNode && (((MethodInsnNode) i).owner - .equals("kotlin/TypeCastException"))) { - continue; - } - if (i instanceof LineNumberNode || i instanceof LabelNode) { - continue; - } - String sourcedesc = null; - /** return 1; return true; return new Foo(); */ - if (i instanceof MethodInsnNode) { - MethodInsnNode minnsn = (MethodInsnNode) i; - if (minnsn.name.equals("")) { - return Type.getObjectType(minnsn.owner).getClassName(); - } - if (i.getOpcode() == Opcodes.INVOKEVIRTUAL) { - AbstractInsnNode invokeDynamic = InsnSupport.prev(i) - .filter(InvokeDynamicInsnNode.class::isInstance) - .findFirst() - .orElse(null); - if (invokeDynamic != null) { - sourcedesc = minnsn.desc; - i = invokeDynamic; - } else { - return fromMethodCall(ctx, minnsn); - } - } else { - return fromMethodCall(ctx, minnsn); - } - } - /** return "String" | int | double */ - if (i instanceof LdcInsnNode) { - Object cst = ((LdcInsnNode) i).cst; - if (cst instanceof Type) { - return ((Type) cst).getClassName(); - } - return cst.getClass().getName(); - } + for (Iterator iterator = InsnSupport + .prevIterator(it.getPrevious()); iterator.hasNext(); ) { + AbstractInsnNode i = iterator.next(); + if (i instanceof MethodInsnNode && (((MethodInsnNode) i).owner + .equals("kotlin/jvm/internal/Intrinsics"))) { + // skip Ldc and load var + // dup or aload + // visitLdcInsn("$receiver"); + // visitMethodInsn(INVOKESTATIC, "kotlin/jvm/internal/Intrinsics", "checkParameterIsNotNull", "(Ljava/lang/Object;Ljava/lang/String;)V", false); + iterator.next(); + iterator.next(); + continue; + } + if (i instanceof MethodInsnNode && (((MethodInsnNode) i).owner + .equals("kotlin/TypeCastException"))) { + continue; + } + if (i instanceof LineNumberNode || i instanceof LabelNode) { + continue; + } + String sourcedesc = null; + /** return 1; return true; return new Foo(); */ + if (i instanceof MethodInsnNode) { + MethodInsnNode minnsn = (MethodInsnNode) i; + if (minnsn.name.equals("")) { + return Type.getObjectType(minnsn.owner).getClassName(); + } + if (i.getOpcode() == Opcodes.INVOKEVIRTUAL) { + AbstractInsnNode invokeDynamic = InsnSupport.prev(i) + .filter(InvokeDynamicInsnNode.class::isInstance) + .findFirst() + .orElse(null); + if (invokeDynamic != null) { + sourcedesc = minnsn.desc; + i = invokeDynamic; + } else { + return fromMethodCall(ctx, minnsn); + } + } else { + return fromMethodCall(ctx, minnsn); + } + } + /** return "String" | int | double */ + if (i instanceof LdcInsnNode) { + Object cst = ((LdcInsnNode) i).cst; + if (cst instanceof Type) { + return ((Type) cst).getClassName(); + } + return cst.getClass().getName(); + } - /** return variable */ - if (i instanceof VarInsnNode) { - VarInsnNode varInsn = (VarInsnNode) i; - return localVariable(ctx, node, varInsn); - } - /** Invoke dynamic: */ - if (i instanceof InvokeDynamicInsnNode) { - InvokeDynamicInsnNode invokeDynamic = (InvokeDynamicInsnNode) i; - String handleDescriptor = Stream.of(invokeDynamic.bsmArgs) - .filter(Handle.class::isInstance) - .map(Handle.class::cast) - .findFirst() - .map(h -> { - String desc = Type.getReturnType(h.getDesc()).getDescriptor(); - return "V".equals(desc) ? "java/lang/Object" : desc; - }) - .orElse(null); - String descriptor = Type - .getReturnType(Optional.ofNullable(sourcedesc).orElse(invokeDynamic.desc)) - .getDescriptor(); - if (handleDescriptor != null && !handleDescriptor.equals("java/lang/Object")) { - if (descriptor.endsWith(";")) { - descriptor = descriptor.substring(0, descriptor.length() - 1); - } - descriptor += "<" + handleDescriptor + ">;"; - } - return ASMType.parse(descriptor); - } - /** array literal: */ - if (i.getOpcode() == Opcodes.NEWARRAY) { - // empty primitive array - if (i instanceof IntInsnNode) { - switch (((IntInsnNode) i).operand) { - case Opcodes.T_BOOLEAN: - return boolean[].class.getName(); - case Opcodes.T_CHAR: - return char[].class.getName(); - case Opcodes.T_BYTE: - return byte[].class.getName(); - case Opcodes.T_SHORT: - return short[].class.getName(); - case Opcodes.T_INT: - return int[].class.getName(); - case Opcodes.T_LONG: - return long[].class.getName(); - case Opcodes.T_FLOAT: - return float[].class.getName(); - case Opcodes.T_DOUBLE: - return double[].class.getName(); - } - } - } - // empty array of objects - if (i.getOpcode() == Opcodes.ANEWARRAY) { - TypeInsnNode typeInsn = (TypeInsnNode) i; - return ASMType.parse("[L" + typeInsn.desc + ";"); - } - // non empty array - switch (i.getOpcode()) { - case Opcodes.BASTORE: - return boolean[].class.getName(); - case Opcodes.CASTORE: - return char[].class.getName(); - case Opcodes.SASTORE: - return short[].class.getName(); - case Opcodes.IASTORE: - return int[].class.getName(); - case Opcodes.LASTORE: - return long[].class.getName(); - case Opcodes.FASTORE: - return float[].class.getName(); - case Opcodes.DASTORE: - return double[].class.getName(); - case Opcodes.AASTORE: - return InsnSupport.prev(i) - .filter(e -> e.getOpcode() == Opcodes.ANEWARRAY) - .findFirst() - .map(e -> { - TypeInsnNode typeInsn = (TypeInsnNode) e; - return ASMType.parse("[L" + typeInsn.desc + ";"); - }) - .orElse(Object.class.getName()); - } + /** return variable */ + if (i instanceof VarInsnNode) { + VarInsnNode varInsn = (VarInsnNode) i; + String varType = localVariable(ctx, node, varInsn); + // Is there local variable? + if (varType != null) { + return varType; + } + } + /** Invoke dynamic: */ + if (i instanceof InvokeDynamicInsnNode) { + InvokeDynamicInsnNode invokeDynamic = (InvokeDynamicInsnNode) i; + String handleDescriptor = Stream.of(invokeDynamic.bsmArgs) + .filter(Handle.class::isInstance) + .map(Handle.class::cast) + .findFirst() + .map(h -> { + String desc = Type.getReturnType(h.getDesc()).getDescriptor(); + return "V".equals(desc) ? "java/lang/Object" : desc; + }) + .orElse(null); + String descriptor = Type + .getReturnType(Optional.ofNullable(sourcedesc).orElse(invokeDynamic.desc)) + .getDescriptor(); + if (handleDescriptor != null && !handleDescriptor.equals("java/lang/Object")) { + if (descriptor.endsWith(";")) { + descriptor = descriptor.substring(0, descriptor.length() - 1); } + descriptor += "<" + handleDescriptor + ">;"; + } + return ASMType.parse(descriptor); + } + /** array literal: */ + if (i.getOpcode() == Opcodes.NEWARRAY) { + // empty primitive array + if (i instanceof IntInsnNode) { + switch (((IntInsnNode) i).operand) { + case Opcodes.T_BOOLEAN: + return boolean[].class.getName(); + case Opcodes.T_CHAR: + return char[].class.getName(); + case Opcodes.T_BYTE: + return byte[].class.getName(); + case Opcodes.T_SHORT: + return short[].class.getName(); + case Opcodes.T_INT: + return int[].class.getName(); + case Opcodes.T_LONG: + return long[].class.getName(); + case Opcodes.T_FLOAT: + return float[].class.getName(); + case Opcodes.T_DOUBLE: + return double[].class.getName(); + } + } + } + // empty array of objects + if (i.getOpcode() == Opcodes.ANEWARRAY) { + TypeInsnNode typeInsn = (TypeInsnNode) i; + return ASMType.parse("[L" + typeInsn.desc + ";"); + } + // non empty array + switch (i.getOpcode()) { + case Opcodes.BASTORE: + return boolean[].class.getName(); + case Opcodes.CASTORE: + return char[].class.getName(); + case Opcodes.SASTORE: + return short[].class.getName(); + case Opcodes.IASTORE: + return int[].class.getName(); + case Opcodes.LASTORE: + return long[].class.getName(); + case Opcodes.FASTORE: + return float[].class.getName(); + case Opcodes.DASTORE: + return double[].class.getName(); + case Opcodes.AASTORE: + return InsnSupport.prev(i) + .filter(e -> e.getOpcode() == Opcodes.ANEWARRAY) + .findFirst() + .map(e -> { + TypeInsnNode typeInsn = (TypeInsnNode) e; + return ASMType.parse("[L" + typeInsn.desc + ";"); + }) + .orElse(Object.class.getName()); + } + } - return returnType.getClassName(); - }) - .map(Object::toString) - .distinct() - .collect(Collectors.toList()); - return result; + return returnType.getClassName(); } private static String fromMethodCall(ParserContext ctx, MethodInsnNode node) { @@ -239,8 +250,13 @@ private static String fromMethodCall(ParserContext ctx, MethodInsnNode node) { return Object.class.getName(); } Type returnType = Type.getReturnType(node.desc); - return classMethods(ctx, node.owner).stream() - .filter(m -> m.name.equals(node.name) && m.desc.equals(node.desc)) + // Since Kotlin 1.6+ + String methodName = node.name.startsWith("access$invoke$") + ? node.name.substring("access$".length()) + : node.name; + List methodNodes = classMethods(ctx, node.owner); + return methodNodes.stream() + .filter(m -> m.name.equals(methodName) && m.desc.equals(node.desc)) .findFirst() .map(m -> Optional.ofNullable(m.signature) .map(s -> { @@ -321,17 +337,31 @@ private static String localVariable(final ParserContext ctx, final MethodNode m, String returnType = fromMethodCall(ctx, methodCall); if (!returnType.equals(Object.class.getName()) && !returnType .equals(void.class.getName())) { - return returnType; + type = returnType; } } } } + if (type.equals(Context.class.getName())) { + // No var, look for last STORE matching index var + VarInsnNode store = InsnSupport.prev(varInsn.getPrevious()) + .filter( + it -> (it.getOpcode() >= Opcodes.ISTORE && it.getOpcode() <= Opcodes.SASTORE)) + .filter(VarInsnNode.class::isInstance) + .map(VarInsnNode.class::cast) + .filter(it -> it.var == varInsn.var) + .findFirst() + .orElse(null); + if (store != null) { + type = handleReturnType(ctx, m, store); + } + } return type; } return ASMType.parse(var.signature); } } - return Object.class.getName(); + return null;//Object.class.getName(); } private static Predicate kotlinIntrinsics() { diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java index 53328992c1..1c74bf947f 100644 --- a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java +++ b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java @@ -19,6 +19,7 @@ import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -666,69 +667,124 @@ private List findMethods(ClassNode clazz, String name, private List kotlinHandler(ParserContext ctx, String httpMethod, String prefix, MethodInsnNode node) { List handlerList = new ArrayList<>(); - String owner = InsnSupport.prev(node.getPrevious()) - .filter(it -> { + // [0] - Owner + // [1] - Method name. Optional + // [2] - Method descriptor. Optional + List lookup = InsnSupport.prev(node.getPrevious()) + .map(it -> { + if (it instanceof InvokeDynamicInsnNode) { + InvokeDynamicInsnNode invokeDynamic = (InvokeDynamicInsnNode) it; + Object[] args = invokeDynamic.bsmArgs; + if (args.length > 1 && args[1] instanceof Handle) { + Handle handle = (Handle) args[1]; + return Arrays.asList(handle.getOwner(), handle.getName(), handle.getDesc()); + } + } if (it instanceof FieldInsnNode) { - return true; + return Collections.singletonList(((FieldInsnNode) it).owner); } if (it instanceof MethodInsnNode) { - return !Signature.create((MethodInsnNode) it).matches("", KT_FUN_1); + Signature signature = Signature.create((MethodInsnNode) it); + if (!signature.matches("", KT_FUN_1)) { + return Collections.singletonList(((MethodInsnNode) it).owner); + } } - return false; + return null; }) + .filter(Objects::nonNull) .findFirst() - .map(e -> { - if (e instanceof FieldInsnNode) { - return ((FieldInsnNode) e).owner; - } - return ((MethodInsnNode) e).owner; - }) .orElseThrow(() -> new IllegalStateException( "Kotlin lambda not found: " + InsnSupport.toString(node))); - ClassNode classNode = ctx.classNode(Type.getObjectType(owner)); + ClassNode classNode = ctx.classNode(Type.getObjectType(lookup.get(0))); MethodNode apply = null; - for (MethodNode method : classNode.methods) { - Signature signature = Signature.create(method); - if (signature.matches("invoke", TypeFactory.KOOBY)) { - ctx.debugHandlerLink(method); - handlerList.addAll(routeHandler(ctx, prefix, method)); - } else if (signature.matches("invoke", TypeFactory.COROUTINE_ROUTER)) { - ctx.debugHandlerLink(method); + if (lookup.size() > 1) { + MethodNode method = classNode.methods.stream() + .filter(it -> it.name.equals(lookup.get(1)) && it.desc.equals(lookup.get(2))) + .findFirst() + .orElseThrow(() -> new IllegalStateException( + "Kotlin lambda not found: " + InsnSupport.toString(node))); + ctx.debugHandlerLink(method); + boolean synthetic = (method.access & Opcodes.ACC_PRIVATE) != 0; + if (synthetic && method.name.startsWith("invoke$")) { + method = ktFunRef160(ctx, method); + } + if (httpMethod == null) { handlerList.addAll(routeHandler(ctx, prefix, method)); - } else if (signature.matches("invoke", TypeFactory.HANDLER_CONTEXT)) { - ctx.debugHandler(method); - handlerList.add(newRouteDescriptor(ctx, method, httpMethod, prefix)); - } else if (signature.matches("invoke", TypeFactory.CONTEXT)) { - // fun reference - MethodNode ref = kotlinFunctionReference(ctx, classNode, method); - ctx.debugHandler(ref); - handlerList.add(newRouteDescriptor(ctx, ref, httpMethod, prefix)); - } else if (signature.matches("invokeSuspend", Object.class)) { - ctx.debugHandler(method); + } else { handlerList.add(newRouteDescriptor(ctx, method, httpMethod, prefix)); - } else if (signature.matches("apply", TypeFactory.CONTEXT)) { - if (apply == null) { - apply = method; - } else { - // Should be a more specific apply method - if (returnTypePrecedence(method) > returnTypePrecedence(apply)) { + } + } else { + for (MethodNode method : classNode.methods) { + Signature signature = Signature.create(method); + if (signature.matches("invoke", TypeFactory.KOOBY)) { + ctx.debugHandlerLink(method); + handlerList.addAll(routeHandler(ctx, prefix, method)); + } else if (signature.matches("invoke", TypeFactory.COROUTINE_ROUTER)) { + ctx.debugHandlerLink(method); + handlerList.addAll(routeHandler(ctx, prefix, method)); + } else if (signature.matches("invoke", TypeFactory.HANDLER_CONTEXT)) { + ctx.debugHandler(method); + handlerList.add(newRouteDescriptor(ctx, method, httpMethod, prefix)); + } else if (signature.matches("invoke", TypeFactory.CONTEXT)) { + // fun reference + MethodNode ref = kotlinFunctionReference(ctx, classNode, method); + ctx.debugHandler(ref); + handlerList.add(newRouteDescriptor(ctx, ref, httpMethod, prefix)); + } else if (signature.matches("invokeSuspend", Object.class)) { + ctx.debugHandler(method); + handlerList.add(newRouteDescriptor(ctx, method, httpMethod, prefix)); + } else if (signature.matches("apply", TypeFactory.CONTEXT)) { + if (apply == null) { apply = method; + } else { + // Should be a more specific apply method + if (returnTypePrecedence(method) > returnTypePrecedence(apply)) { + apply = method; + } } + } else if (signature.matches("run")) { + ctx.debugHandlerLink(method); + handlerList.addAll(routeHandler(ctx, prefix, method)); } - } else if (signature.matches("run")) { - ctx.debugHandlerLink(method); - handlerList.addAll(routeHandler(ctx, prefix, method)); } } if (apply != null) { // almost there can be one of two: 1) lambda itself or 2) method reference + Signature signature = Signature.create(node); + if (signature.matches(String.class, Route.Handler.class)) { + apply = ktFunRef160(ctx, apply); + } ctx.debugHandler(apply); handlerList.add(newRouteDescriptor(ctx, apply, httpMethod, prefix)); } return handlerList; } + private MethodNode ktFunRef160(ParserContext ctx, MethodNode method) { + AbstractInsnNode ref = InsnSupport.prev(method.instructions.getLast()) + .filter(MethodInsnNode.class::isInstance) + .map(MethodInsnNode.class::cast) + .filter(it -> Signature.create(it).matches(Context.class)) + .findFirst() + .orElse(null); + if (ref != null) { + MethodInsnNode call = (MethodInsnNode) ref; + ClassNode owner = ctx.classNodeOrNull(Type.getObjectType(call.owner)); + if (owner != null) { + MethodNode methodRef = owner.methods.stream() + .filter(it -> it.name.equals(call.name) && it.desc.equals(call.desc)) + .findFirst() + .orElse(null); + if (methodRef != null) { + return methodRef; + } + } + } + // fallback to what we found previously + return method; + } + private MethodNode kotlinFunctionReference(ParserContext ctx, ClassNode classNode, MethodNode node) { MethodInsnNode ref = InsnSupport.prev(node.instructions.getLast()) @@ -767,7 +823,7 @@ private OperationExt newRouteDescriptor(ParserContext ctx, MethodNode node, OperationExt operation = new OperationExt(node, httpMethod, prefix, arguments, response); boolean notSynthetic = (node.access & Opcodes.ACC_SYNTHETIC) == 0; - boolean lambda = node.name.equals("apply") || node.name.equals("invoke"); + boolean lambda = node.name.equals("apply") || node.name.equals("invoke") || node.name.startsWith("invoke$"); if (notSynthetic && !lambda) { operation.setOperationId(node.name); } @@ -815,7 +871,7 @@ private MethodNode findLambda(ParserContext ctx, InvokeDynamicInsnNode node) { return contextReference(handle); } else { return ctx.classNode(owner).methods.stream() - .filter(n -> n.name.equals(handle.getName())) + .filter(n -> n.name.equals(handle.getName()) && n.desc.equals(handle.getDesc())) .findFirst() .orElseThrow(() -> new IllegalStateException("Handler not found: " + InsnSupport.toString(node)) diff --git a/pom.xml b/pom.xml index ecf10fdb3d..7bbed0f394 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ 1.1.6.RELEASE - 1.4.32 - 1.4.1 + 1.6.21 + 1.6.1 true From 7335467c43106cd7dda2598330221713ea6d2dac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 14:29:19 +0000 Subject: [PATCH 33/97] build(deps): bump slf4j.version from 1.7.32 to 1.7.36 Bumps `slf4j.version` from 1.7.32 to 1.7.36. Updates `slf4j-api` from 1.7.32 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36) Updates `log4j-over-slf4j` from 1.7.32 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36) Updates `jcl-over-slf4j` from 1.7.32 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36) Updates `jul-to-slf4j` from 1.7.32 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36) Updates `slf4j-simple` from 1.7.32 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:log4j-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:jul-to-slf4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index e8f2c4fb2e..88bfdc1dc2 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -114,7 +114,7 @@ 4.3.3 1.3.0 2.2.21 - 1.7.32 + 1.7.36 5.3.20 3.1.1 2.0.32 diff --git a/pom.xml b/pom.xml index ecf10fdb3d..ebfa7931f1 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.2.9 2.17.1 - 1.7.32 + 1.7.36 1.5 @@ -109,8 +109,8 @@ 1.1.6.RELEASE - 1.4.32 - 1.4.1 + 1.6.21 + 1.6.1 true From d489ac86b66ba845d8e44e3403fe55cafd5aafab Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Thu, 19 May 2022 07:33:18 -0300 Subject: [PATCH 34/97] mvc: don't generate send call on void controller method - Stop generating a send call with status code on void web method - Make them to return StatusCode - Added tests - Fix #2477 --- .../jooby/internal/apt/HandlerCompiler.java | 28 +++++------------- .../io/jooby/internal/apt/ModuleCompiler.java | 3 +- .../src/test/java/output/MyController.java | 4 ++- .../test/java/output/MyControllerHandler.java | 20 ++++--------- .../test/java/tests/HandlerCompilerTest.java | 8 ++--- modules/jooby-bom/pom.xml | 4 +-- .../test/java/examples/InstanceRouter.java | 1 - tests/src/test/java/io/jooby/MvcTest.java | 1 - .../java/io/jooby/i2477/Controller2477.java | 19 ++++++++++++ .../test/java/io/jooby/i2477/Issue2477.java | 29 +++++++++++++++++++ 10 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 tests/src/test/java/io/jooby/i2477/Controller2477.java create mode 100644 tests/src/test/java/io/jooby/i2477/Issue2477.java diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java index ad4a1f7010..e7bc5b3aed 100644 --- a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java +++ b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java @@ -231,25 +231,9 @@ private void setDefaultResponseType(MethodVisitor visitor) throws Exception { private void processReturnType(MethodVisitor visitor) throws Exception { TypeKind kind = executable.getReturnType().getKind(); if (kind == TypeKind.VOID) { - visitor.visitVarInsn(ALOAD, 1); - Method isResponseStarted = Context.class.getDeclaredMethod("isResponseStarted"); - visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), isResponseStarted.getName(), - getMethodDescriptor(isResponseStarted), true); - Label label0 = new Label(); - visitor.visitJumpInsn(IFEQ, label0); - visitor.visitVarInsn(ALOAD, 1); - visitor.visitInsn(ARETURN); - visitor.visitLabel(label0); - visitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null); - - visitor.visitVarInsn(ALOAD, 1); - visitor.visitVarInsn(ALOAD, 1); Method getResponseCode = Context.class.getDeclaredMethod("getResponseCode"); - visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), getResponseCode.getName(), - getMethodDescriptor(getResponseCode), true); - Method sendStatusCode = Context.class.getDeclaredMethod("send", StatusCode.class); - visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), sendStatusCode.getName(), - getMethodDescriptor(sendStatusCode), true); + visitor.visitVarInsn(ALOAD, 1); + visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), getResponseCode.getName(), getMethodDescriptor(getResponseCode), true); } else { Method wrapper = Primitives.wrapper(kind); if (wrapper == null) { @@ -258,9 +242,11 @@ private void processReturnType(MethodVisitor visitor) throws Exception { visitor.visitVarInsn(ASTORE, 2); visitor.visitVarInsn(ALOAD, 1); visitor.visitVarInsn(ALOAD, 2); - Method send = Context.class.getDeclaredMethod("send", StatusCode.class); - visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), send.getName(), - getMethodDescriptor(send), true); + Method setResponseCode = Context.class.getDeclaredMethod("setResponseCode", StatusCode.class); + visitor.visitMethodInsn(INVOKEINTERFACE, CTX.getInternalName(), setResponseCode.getName(), + getMethodDescriptor(setResponseCode), true); + visitor.visitInsn(POP); + visitor.visitVarInsn(ALOAD, 2); } } else { // Primitive wrapper diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java index e33f23481a..4abf78fc5f 100644 --- a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java +++ b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java @@ -10,6 +10,7 @@ import io.jooby.MvcFactory; import io.jooby.Reified; import io.jooby.Route; +import io.jooby.StatusCode; import io.jooby.annotations.Dispatch; import io.jooby.internal.apt.asm.ArrayWriter; import io.jooby.internal.apt.asm.NameGenerator; @@ -266,7 +267,7 @@ private void setReturnType(MethodVisitor visitor, HandlerCompiler handler) if (handler.isSuspendFunction()) { visitor.visitLdcInsn(Type.getType("Lkotlin/coroutines/Continuation;")); } else if (returnType.isVoid()) { - visitor.visitLdcInsn(Type.getType(Context.class)); + visitor.visitLdcInsn(Type.getType(StatusCode.class)); } else if (returnType.isPrimitive()) { Method wrapper = Primitives.wrapper(returnType); visitor.visitFieldInsn(GETSTATIC, Type.getInternalName(wrapper.getDeclaringClass()), "TYPE", diff --git a/modules/jooby-apt/src/test/java/output/MyController.java b/modules/jooby-apt/src/test/java/output/MyController.java index ad5723bf67..0b00e40bf3 100644 --- a/modules/jooby-apt/src/test/java/output/MyController.java +++ b/modules/jooby-apt/src/test/java/output/MyController.java @@ -1,6 +1,7 @@ package output; import io.jooby.Context; +import io.jooby.StatusCode; import io.jooby.annotations.GET; import io.jooby.annotations.Path; import io.jooby.annotations.PathParam; @@ -11,6 +12,7 @@ public class MyController { @GET("/default") - public void controllerMethod() { + public StatusCode controllerMethod() { + return StatusCode.CREATED; } } diff --git a/modules/jooby-apt/src/test/java/output/MyControllerHandler.java b/modules/jooby-apt/src/test/java/output/MyControllerHandler.java index 4c3128454f..b50bd6185f 100644 --- a/modules/jooby-apt/src/test/java/output/MyControllerHandler.java +++ b/modules/jooby-apt/src/test/java/output/MyControllerHandler.java @@ -1,15 +1,11 @@ package output; +import javax.annotation.Nonnull; +import javax.inject.Provider; + import io.jooby.Context; -import io.jooby.Reified; import io.jooby.Route; import io.jooby.StatusCode; -import io.jooby.ValueNode; - -import javax.annotation.Nonnull; -import javax.inject.Provider; -import java.lang.reflect.Type; -import java.util.Map; public class MyControllerHandler implements Route.Handler { @@ -20,12 +16,8 @@ public MyControllerHandler(Provider provider) { } @Nonnull @Override public Object apply(@Nonnull Context ctx) throws Exception { - ctx.setResponseCode(StatusCode.NO_CONTENT); - provider.get().controllerMethod(); - if (ctx.isResponseStarted()) { - return ctx; - } else { - return ctx.send(ctx.getResponseCode()); - } + StatusCode statusCode = provider.get().controllerMethod(); + ctx.setResponseCode(statusCode); + return statusCode; } } diff --git a/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java b/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java index e3ef6fa6bf..0c316e506e 100644 --- a/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java +++ b/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java @@ -324,21 +324,21 @@ public void returnTypes() throws Exception { router.get("/p/returnChar", MockContextHelper.mockContext()).value()); MockContext ctx = MockContextHelper.mockContext(); - assertEquals(ctx, + assertEquals(StatusCode.NO_CONTENT, router.get("/p/returnStatusCode", ctx).value()); assertEquals(StatusCode.NO_CONTENT, ctx.getResponseCode()); - assertEquals(ctx, + assertEquals(StatusCode.OK, router.get("/p/statusCode", ctx.setQueryString("?statusCode=200&q=*:*")).value()); assertEquals(StatusCode.OK, ctx.getResponseCode()); ctx = MockContextHelper.mockContext(); - assertEquals(ctx, + assertEquals(StatusCode.NO_CONTENT, router.delete("/p/noContent", ctx.setQueryString(null)).value()); assertEquals(StatusCode.NO_CONTENT, ctx.getResponseCode()); ctx = MockContextHelper.mockContext(); - assertEquals(ctx, router.get("/p/sideEffect", ctx).value()); + assertEquals(StatusCode.CREATED, router.get("/p/sideEffect", ctx).value()); assertEquals(StatusCode.CREATED, ctx.getResponseCode()); }); } diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index d7c10f2a28..f18c5263db 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -68,8 +68,8 @@ 3.0.2 5.8.2 2.7.0 - 1.4.32 - 1.4.1 + 1.6.21 + 1.6.1 6.1.8.RELEASE 4.1 2.17.1 diff --git a/tests/src/test/java/examples/InstanceRouter.java b/tests/src/test/java/examples/InstanceRouter.java index 69eddd5c3a..4d80d9374a 100644 --- a/tests/src/test/java/examples/InstanceRouter.java +++ b/tests/src/test/java/examples/InstanceRouter.java @@ -30,7 +30,6 @@ public String subpath() { @DELETE @Path("/void") public void noContent() { - } @GET diff --git a/tests/src/test/java/io/jooby/MvcTest.java b/tests/src/test/java/io/jooby/MvcTest.java index a842e30c6f..ebaf3eb75f 100644 --- a/tests/src/test/java/io/jooby/MvcTest.java +++ b/tests/src/test/java/io/jooby/MvcTest.java @@ -14,7 +14,6 @@ import io.jooby.json.JacksonModule; import io.jooby.junit.ServerTest; import io.jooby.junit.ServerTestRunner; -import io.jooby.netty.Netty; import okhttp3.FormBody; import okhttp3.MediaType; import okhttp3.MultipartBody; diff --git a/tests/src/test/java/io/jooby/i2477/Controller2477.java b/tests/src/test/java/io/jooby/i2477/Controller2477.java new file mode 100644 index 0000000000..4c8f3ea144 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2477/Controller2477.java @@ -0,0 +1,19 @@ +package io.jooby.i2477; + +import io.jooby.StatusCode; +import io.jooby.annotations.POST; +import io.jooby.annotations.PUT; +import io.jooby.annotations.Path; + +public class Controller2477 { + @PUT + @Path("/2477") + public void doPut() { + } + + @POST + @Path("/2477") + public StatusCode doPost() { + return StatusCode.CREATED; + } +} diff --git a/tests/src/test/java/io/jooby/i2477/Issue2477.java b/tests/src/test/java/io/jooby/i2477/Issue2477.java new file mode 100644 index 0000000000..f5bd155206 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2477/Issue2477.java @@ -0,0 +1,29 @@ +package io.jooby.i2477; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class Issue2477 { + @ServerTest + public void shouldNotGet200WhenFilterFailPostControllerExecution(ServerTestRunner runner) { + runner.define(app -> { + app.decorator(next -> ctx -> { + Object value = next.apply(ctx); + if (ctx.query("failure").booleanValue(true)) { + throw new IllegalStateException("Intentional error"); + } + return value; + }); + app.mvc(new Controller2477()); + }).ready(http -> { + http.put("/2477", rsp -> { + assertEquals(500, rsp.code()); + }); + http.post("/2477", rsp -> { + assertEquals(500, rsp.code()); + }); + }); + } +} From 18758a46ce3b02a615709a0cc70251e31c1a5735 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Thu, 19 May 2022 21:06:14 -0300 Subject: [PATCH 35/97] type analyzer: detects completablefuture from kotlin - fix #2553 --- .../io/jooby/internal/asm/MethodFinder.java | 7 --- .../io/jooby/internal/asm/ReturnType.java | 62 ++++++++++++++----- tests/src/test/kotlin/i2553/App2553.kt | 16 +++++ tests/src/test/kotlin/i2553/Issue2553.kt | 45 ++++++++++++++ 4 files changed, 109 insertions(+), 21 deletions(-) create mode 100644 tests/src/test/kotlin/i2553/App2553.kt create mode 100644 tests/src/test/kotlin/i2553/Issue2553.kt diff --git a/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java b/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java index 23ccf292b0..c641cdee8b 100644 --- a/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java +++ b/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java @@ -42,13 +42,6 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str return new TraceMethodVisitor(this.node, printer); } return this.node; - } else { - if (debug) { - if (printer == null) { - printer = new ASMifier(); - } - return new TraceMethodVisitor(this.node, printer); - } } return up; } diff --git a/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java b/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java index 388a30e4fa..35731ebf02 100644 --- a/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java +++ b/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java @@ -5,6 +5,16 @@ */ package io.jooby.internal.asm; +import static io.jooby.internal.asm.Insns.last; + +import java.lang.reflect.Method; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.objectweb.asm.Handle; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; @@ -21,22 +31,30 @@ import org.objectweb.asm.tree.TypeInsnNode; import org.objectweb.asm.tree.VarInsnNode; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static io.jooby.internal.asm.Insns.last; - public class ReturnType extends MethodVisitor { private static final Predicate LABEL = LabelNode.class::isInstance; private static final Predicate LINE_NUMBER = LineNumberNode.class::isInstance; + private static final Predicate KT_INTERNAL = it -> { + if (it instanceof MethodInsnNode) { + return ((MethodInsnNode) it).owner.startsWith("kotlin/jvm/internal"); + } + return false; + }; + + private static final Predicate KT_LDC = it -> { + if (it instanceof LdcInsnNode) { + return it.getPrevious() != null && it.getPrevious().getOpcode() == Opcodes.DUP; + } + return false; + }; + + private static final Predicate IGNORE = KT_INTERNAL + .or(LABEL) + .or(LINE_NUMBER); + private final TypeParser typeParser; public ReturnType(TypeParser typeParser, MethodNode visitor) { @@ -49,10 +67,11 @@ public java.lang.reflect.Type returnType() { Set result = last(node.instructions) .filter(it -> it.getOpcode() == Opcodes.ARETURN) .map(it -> { - AbstractInsnNode previous = Insns.previous(it.getPrevious()) - .filter(LABEL.negate().and(LINE_NUMBER.negate())) - .findFirst() - .orElse(it.getPrevious()); + AbstractInsnNode previous = findReturnInstruction(it.getPrevious()); + if (previous == null) { + // Nothing found: + return Object.class; + } String sourcedesc = null; /** return 1; return true; return new Foo(); */ if (previous instanceof MethodInsnNode) { @@ -188,6 +207,21 @@ public java.lang.reflect.Type returnType() { return typeParser.commonAncestor(result); } + private AbstractInsnNode findReturnInstruction(AbstractInsnNode it) { + while (it != null) { + if (IGNORE.test(it)) { + it = it.getPrevious(); + } else { + if (KT_LDC.test(it)) { + it = it.getPrevious().getPrevious(); + } else { + return it; + } + } + } + return null; + } + private java.lang.reflect.Type localVariable(final MethodNode m, final VarInsnNode varInsn) { if (varInsn.getOpcode() == Opcodes.ALOAD) { List vars = m.localVariables; diff --git a/tests/src/test/kotlin/i2553/App2553.kt b/tests/src/test/kotlin/i2553/App2553.kt new file mode 100644 index 0000000000..7eaf0b3939 --- /dev/null +++ b/tests/src/test/kotlin/i2553/App2553.kt @@ -0,0 +1,16 @@ +package i2553 + +import io.jooby.Kooby +import java.util.concurrent.CompletableFuture + +class App2553 : Kooby({ + get("/2553/line") { + CompletableFuture.supplyAsync { "line" } + } + + get("/2553/var") { + val future: CompletableFuture = CompletableFuture.supplyAsync { "var" } + future + } +}) + diff --git a/tests/src/test/kotlin/i2553/Issue2553.kt b/tests/src/test/kotlin/i2553/Issue2553.kt new file mode 100644 index 0000000000..0707c698e2 --- /dev/null +++ b/tests/src/test/kotlin/i2553/Issue2553.kt @@ -0,0 +1,45 @@ +package i2553 + +import io.jooby.internal.RouteAnalyzer +import io.jooby.internal.asm.ClassSource +import io.jooby.jetty.Jetty +import io.jooby.junit.ServerTest +import io.jooby.junit.ServerTestRunner +import org.junit.jupiter.api.Assertions.assertEquals +import java.util.concurrent.CompletableFuture + +class Issue2553 { + + @ServerTest(server = [Jetty::class]) + fun analyzerShouldDetectCompletableFuture(runner: ServerTestRunner) { + val analyzer = RouteAnalyzer(ClassSource(javaClass.classLoader), false) + + val app = App2553() + runner.use { + app + }.ready { http -> + val router = app.router + val route = router.routes.get(0) + val type = analyzer.returnType(route.handle) + + assertEquals(CompletableFuture::class.java, type) + } + } + + @ServerTest + fun shouldDetectCompletableFuture(runner: ServerTestRunner) { + runner.use { + App2553() + }.ready { http -> + http.get("/2553/var") { rsp -> + assertEquals("var", rsp.body!!.string()) + } + + http.get("/2553/line") { rsp -> + assertEquals("line", rsp.body!!.string()) + } + } + } + +} + From 9367813474f242affb6f982ff7e5033cf60e5b6d Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 20 May 2022 07:28:10 -0300 Subject: [PATCH 36/97] build: fix random failure caused by GC? --- .../test/java/io/jooby/i2572/Issue2572.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/src/test/java/io/jooby/i2572/Issue2572.java b/tests/src/test/java/io/jooby/i2572/Issue2572.java index dcbf20daa0..9d08cb691c 100644 --- a/tests/src/test/java/io/jooby/i2572/Issue2572.java +++ b/tests/src/test/java/io/jooby/i2572/Issue2572.java @@ -8,21 +8,22 @@ import org.json.JSONObject; import io.jooby.ExecutionMode; +import io.jooby.Jooby; import io.jooby.json.JacksonModule; import io.jooby.junit.ServerTest; import io.jooby.junit.ServerTestRunner; public class Issue2572 { - @ServerTest(executionMode = {ExecutionMode.EVENT_LOOP, ExecutionMode.WORKER}) - public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { - runner.define(app -> { - Map state = new LinkedHashMap<>(); - app.install(new JacksonModule()); + private static class App2572 extends Jooby { + Map state = new LinkedHashMap<>(); + + { + install(new JacksonModule()); - app.get("/2572/state", ctx -> state); + get("/2572/state", ctx -> state); - app.decorator(next -> ctx -> { + decorator(next -> ctx -> { state.put("caller", Thread.currentThread().getName()); ctx.onComplete(context -> { state.put("onComplete", Thread.currentThread().getName()); @@ -30,9 +31,13 @@ public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { return next.apply(ctx); }); - app.get("/2572/init", ctx -> "Initialized"); + get("/2572/init", ctx -> "Initialized"); + } + } - }).ready(http -> { + @ServerTest(executionMode = {ExecutionMode.EVENT_LOOP, ExecutionMode.WORKER}) + public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { + runner.use(App2572::new).ready(http -> { http.get("/2572/init", rsp -> { assertEquals("Initialized", rsp.body().string()); }); From f25d3aebde3a054bd32dc997b9eaaf7fd0751f58 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 20 May 2022 09:51:29 -0300 Subject: [PATCH 37/97] build: upgrade gradle + use java 17/18 --- .github/workflows/full-build.yml | 2 +- .github/workflows/quick-build.yml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml index a907b48f4b..d93180b1c4 100644 --- a/.github/workflows/full-build.yml +++ b/.github/workflows/full-build.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [1.8, 11, 13] + java_version: [1.8, 11, 17, 18] os: [ubuntu-latest, windows-latest, macOS-latest] steps: diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml index deaf400cfc..93c009e5af 100644 --- a/.github/workflows/quick-build.yml +++ b/.github/workflows/quick-build.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [1.8, 11, 13] + java_version: [1.8, 11, 17] os: [ubuntu-latest] steps: diff --git a/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 68ca99ac45..0dfb4f8c7e 100644 --- a/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip From 49ed7593b588d159b972e4325fc41988e93cfead Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 20 May 2022 12:02:20 -0300 Subject: [PATCH 38/97] build: fix random failure caused by raise condition --- .../test/java/io/jooby/i2572/Issue2572.java | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/src/test/java/io/jooby/i2572/Issue2572.java b/tests/src/test/java/io/jooby/i2572/Issue2572.java index 9d08cb691c..bc8be7c0af 100644 --- a/tests/src/test/java/io/jooby/i2572/Issue2572.java +++ b/tests/src/test/java/io/jooby/i2572/Issue2572.java @@ -2,48 +2,51 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import java.util.LinkedHashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; import org.json.JSONObject; -import io.jooby.ExecutionMode; -import io.jooby.Jooby; import io.jooby.json.JacksonModule; import io.jooby.junit.ServerTest; import io.jooby.junit.ServerTestRunner; public class Issue2572 { - private static class App2572 extends Jooby { - Map state = new LinkedHashMap<>(); + @ServerTest + public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { + runner.define(app -> { + Map state = new ConcurrentHashMap<>(); - { - install(new JacksonModule()); + CountDownLatch latch = new CountDownLatch(1); + app.install(new JacksonModule()); - get("/2572/state", ctx -> state); + app.get("/2572/state", ctx -> { + latch.await(); + return state; + }); - decorator(next -> ctx -> { + app.decorator(next -> ctx -> { state.put("caller", Thread.currentThread().getName()); ctx.onComplete(context -> { state.put("onComplete", Thread.currentThread().getName()); + latch.countDown(); }); return next.apply(ctx); }); - get("/2572/init", ctx -> "Initialized"); - } - } - - @ServerTest(executionMode = {ExecutionMode.EVENT_LOOP, ExecutionMode.WORKER}) - public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { - runner.use(App2572::new).ready(http -> { + app.get("/2572/init", ctx -> "Initialized"); + }).ready(http -> { http.get("/2572/init", rsp -> { + System.out.println(Thread.currentThread()); assertEquals("Initialized", rsp.body().string()); }); http.get("/2572/state", rsp -> { + System.out.println(Thread.currentThread()); JSONObject json = new JSONObject(rsp.body().string()); + System.out.println(json.get("caller") + " = " + json.get("onComplete")); assertEquals(json.get("caller"), json.get("onComplete")); }); }); From 2e6243b9fffdec5b2cfb4029a5255adcaaca75d3 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 22 May 2022 12:05:30 -0300 Subject: [PATCH 39/97] v2.15.0 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 8 ++++---- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index dd55d29792..f600a41d5e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 47b695893f..e3957414ac 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 813008bf04..546214b4dd 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 66f9291cc5..1c7cc48cdb 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 4f05c5d190..07d1d22af4 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index e110659fbe..1f4bcde21b 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 3d99e7de6c..6f53289ad1 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 @@ -16,7 +16,7 @@ - 2.15.0-SNAPSHOT + 2.15.0 4.0.3 3.2.0 9.3 @@ -62,8 +62,8 @@ 9.4.46.v20220331 0.0.9 1.12.220 - 2.15.0-SNAPSHOT - 2.15.0-SNAPSHOT + 2.15.0 + 2.15.0 0.11.5 3.0.2 5.8.2 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 3f907e0df3..13531f208f 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index f230c15406..1bf541df07 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 88f7dd88e8..5c61b33526 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index fa70337eeb..e920551163 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index df48fb0059..eb6e4d9388 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 127aa0e022..f783b1da51 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 31836dc4e3..5a1a2df845 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index deeea74a69..f6b3be08c4 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 0d41c0362e..fc0e9e4f5b 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index dc1c4dbd9b..1637aca258 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 92dd752263..2ca1b8ddc1 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 747dbf7e10..8fca5d048b 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index ea843f2491..f31f1b42e4 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 5727a3b8ed..34ff746922 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index a3db2f0d3b..8832131d08 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 41db7ced12..668b45dac2 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 09cb3dbcc7..c6e010f39e 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 520c8b3f0a..6e6ecfdedb 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 1628e85b3f..ce7568a223 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index c7abf7526d..770e9bff0b 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 1ba43885b2..1118b2a1f6 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 26bfb7de8d..a375e101b0 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 85cb99aa37..a75933daf5 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 8bfc702d21..85ad1920e9 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index ac74016303..f208601a46 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index a629867070..cb9b5a7cd7 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index d543e6a71a..aa9c01488d 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 902094bd4c..b53e74ce88 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 2f424f5b20..067e2328fc 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 420bc21e15..caa1a8330a 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index a5c4bdcf6e..e377761187 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 2bcaeb4fe0..25f35ea2aa 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 54ed7e966e..b372dc2ce6 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index fa9487bdba..b78c7cddc6 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 76f329528b..3f71005b37 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index bf812bf841..ab978491a8 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index b234a86fcc..ea9d1c8feb 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 3f4df85eac..4d8a1805e6 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 6855b9c3f4..0b8929c84f 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index bd5ee15dd2..b78605d982 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 739e6b091f..bc7eb0abc9 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index f0ee24b920..de3055af9d 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index aea8b962d6..5f4de21374 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 714393f7c5..6ffe410534 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index ffb8cda7fc..a6c1e67943 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 8046621f7c..499ad2b5f2 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index d949454725..83b0f28572 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 707000e662..f2ebc8d418 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0-SNAPSHOT + 2.15.0 modules diff --git a/pom.xml b/pom.xml index 9f61dd315e..57df5f2578 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.15.0-SNAPSHOT + 2.15.0 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 7f839ea21e..592e65a982 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0-SNAPSHOT + 2.15.0 4.0.0 From e5973159e20704a8fdceaacf412cddf0bc71f0a2 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 22 May 2022 12:10:27 -0300 Subject: [PATCH 40/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 8 ++++---- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f600a41d5e..40014528fd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index e3957414ac..ef01424bc4 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 546214b4dd..82d247c95f 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 1c7cc48cdb..b1567f5804 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 07d1d22af4..f86582f9ba 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 1f4bcde21b..9d01cbd55c 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 6f53289ad1..58a3efb8ec 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 @@ -16,7 +16,7 @@ - 2.15.0 + 2.15.1-SNAPSHOT 4.0.3 3.2.0 9.3 @@ -62,8 +62,8 @@ 9.4.46.v20220331 0.0.9 1.12.220 - 2.15.0 - 2.15.0 + 2.15.1-SNAPSHOT + 2.15.1-SNAPSHOT 0.11.5 3.0.2 5.8.2 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 13531f208f..f6233357c6 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 1bf541df07..2a7f8c1c37 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 5c61b33526..29e6a8f23e 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index e920551163..643c60ac84 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index eb6e4d9388..bfe4a7d3b4 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index f783b1da51..17e83a3a4a 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 5a1a2df845..6515631a5f 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index f6b3be08c4..1b69b9f524 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index fc0e9e4f5b..36bbf5260a 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 1637aca258..83ee3bc65d 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 2ca1b8ddc1..b57b83ad46 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 8fca5d048b..5c87344c36 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index f31f1b42e4..544c760178 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 34ff746922..0f2d358800 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 8832131d08..e40b5d69c2 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 668b45dac2..e83837f112 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index c6e010f39e..5caba5a0a4 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 6e6ecfdedb..79b54ad246 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index ce7568a223..5d30313e2e 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 770e9bff0b..efc0de8264 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 1118b2a1f6..d8a80d2a38 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index a375e101b0..02467202e5 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index a75933daf5..55c7a874f8 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 85ad1920e9..e9a5f4c5a2 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index f208601a46..3f2fe79204 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index cb9b5a7cd7..fca29b5395 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index aa9c01488d..2e304d612e 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index b53e74ce88..ccdb030662 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 067e2328fc..86744d5cc3 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index caa1a8330a..102e2d07c8 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index e377761187..625df5b9f2 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 25f35ea2aa..b11e8c4764 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index b372dc2ce6..707f071208 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index b78c7cddc6..51a59890cd 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 3f71005b37..e06436b9ed 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index ab978491a8..ac48f35f5b 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index ea9d1c8feb..c4c212938e 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 4d8a1805e6..4aa75eb9a1 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 0b8929c84f..180bb97361 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index b78605d982..a88ad78425 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index bc7eb0abc9..211e15915e 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index de3055af9d..3bc8de4794 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 5f4de21374..0d4fcf835a 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 6ffe410534..6d3dfd3517 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index a6c1e67943..b1bea09ea4 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 499ad2b5f2..acc9dbb4a0 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 83b0f28572..4187b4a813 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index f2ebc8d418..c8106e494a 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0 + 2.15.1-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index 57df5f2578..e3dcd1fc54 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.15.0 + 2.15.1-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 592e65a982..068a8bb740 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.0 + 2.15.1-SNAPSHOT 4.0.0 From af980f5d841a5931609c9815d7fcdb4c527b2c0f Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 27 May 2022 20:33:16 -0300 Subject: [PATCH 41/97] Application startup resulted in exception: Caused by: java.lang.ClassNotFoundException: Z Fixes #2598 --- .../java/io/jooby/internal/RouteAnalyzer.java | 3 +- .../io/jooby/internal/asm/MethodFinder.java | 2 +- .../io/jooby/internal/asm/ReturnType.java | 297 ++++++++---------- .../main/kotlin/io/jooby/HandlerContext.kt | 2 +- .../io/jooby/internal/ReturnTypeTest.java | 2 +- .../internal/openapi/ReturnTypeParser.java | 15 +- .../src/test/kotlin/kt/i2598/App2598.kt | 13 + .../src/test/kotlin/kt/i2598/Issue2598.kt | 16 + tests/src/test/kotlin/i2553/Issue2553.kt | 4 +- tests/src/test/kotlin/i2598/App2598.kt | 14 + tests/src/test/kotlin/i2598/Issue2598.kt | 30 ++ 11 files changed, 219 insertions(+), 179 deletions(-) create mode 100644 modules/jooby-openapi/src/test/kotlin/kt/i2598/App2598.kt create mode 100644 modules/jooby-openapi/src/test/kotlin/kt/i2598/Issue2598.kt create mode 100644 tests/src/test/kotlin/i2598/App2598.kt create mode 100644 tests/src/test/kotlin/i2598/Issue2598.kt diff --git a/jooby/src/main/java/io/jooby/internal/RouteAnalyzer.java b/jooby/src/main/java/io/jooby/internal/RouteAnalyzer.java index ad427abf63..73c607d94f 100644 --- a/jooby/src/main/java/io/jooby/internal/RouteAnalyzer.java +++ b/jooby/src/main/java/io/jooby/internal/RouteAnalyzer.java @@ -44,7 +44,6 @@ public java.lang.reflect.Type returnType(Object handler) { ClassReader reader = new ClassReader(source.byteCode(method.getDeclaringClass())); MethodFinder visitor = new MethodFinder(method, debug); reader.accept(visitor, 0); - ReturnType returnTypeVisitor = new ReturnType(typeParser, visitor.node); if (debug) { System.out.println(method); @@ -53,7 +52,7 @@ public java.lang.reflect.Type returnType(Object handler) { writer.flush(); } - return returnTypeVisitor.returnType(); + return ReturnType.find(typeParser, visitor.node); } catch (Exception x) { throw SneakyThrows.propagate(x); } diff --git a/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java b/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java index c641cdee8b..d87036be09 100644 --- a/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java +++ b/jooby/src/main/java/io/jooby/internal/asm/MethodFinder.java @@ -23,7 +23,7 @@ public class MethodFinder extends ClassVisitor { public ASMifier printer; public MethodFinder(Method method, boolean debug) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.descriptor = Type.getMethodDescriptor(method); this.name = method.getName(); this.debug = debug; diff --git a/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java b/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java index 35731ebf02..7883ec838c 100644 --- a/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java +++ b/jooby/src/main/java/io/jooby/internal/asm/ReturnType.java @@ -5,18 +5,17 @@ */ package io.jooby.internal.asm; -import static io.jooby.internal.asm.Insns.last; +import static java.util.Optional.ofNullable; -import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; import java.util.Set; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.objectweb.asm.Handle; -import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.tree.AbstractInsnNode; @@ -31,7 +30,7 @@ import org.objectweb.asm.tree.TypeInsnNode; import org.objectweb.asm.tree.VarInsnNode; -public class ReturnType extends MethodVisitor { +public class ReturnType { private static final Predicate LABEL = LabelNode.class::isInstance; @@ -44,6 +43,10 @@ public class ReturnType extends MethodVisitor { return false; }; + private static final Predicate IGNORE = KT_INTERNAL + .or(LABEL) + .or(LINE_NUMBER); + private static final Predicate KT_LDC = it -> { if (it instanceof LdcInsnNode) { return it.getPrevious() != null && it.getPrevious().getOpcode() == Opcodes.DUP; @@ -51,163 +54,130 @@ public class ReturnType extends MethodVisitor { return false; }; - private static final Predicate IGNORE = KT_INTERNAL - .or(LABEL) - .or(LINE_NUMBER); - - private final TypeParser typeParser; - - public ReturnType(TypeParser typeParser, MethodNode visitor) { - super(Opcodes.ASM6, visitor); - this.typeParser = typeParser; - } - - public java.lang.reflect.Type returnType() { - MethodNode node = (MethodNode) mv; - Set result = last(node.instructions) - .filter(it -> it.getOpcode() == Opcodes.ARETURN) - .map(it -> { - AbstractInsnNode previous = findReturnInstruction(it.getPrevious()); - if (previous == null) { - // Nothing found: - return Object.class; - } - String sourcedesc = null; - /** return 1; return true; return new Foo(); */ - if (previous instanceof MethodInsnNode) { - MethodInsnNode minnsn = (MethodInsnNode) previous; - if (minnsn.name.equals("")) { - return typeParser.resolve(minnsn.owner); - } - if (previous.getOpcode() == Opcodes.INVOKEVIRTUAL) { - AbstractInsnNode invokeDynamic = Insns.previous(previous) - .filter(InvokeDynamicInsnNode.class::isInstance) - .findFirst() - .orElse(null); - if (invokeDynamic != null) { - sourcedesc = minnsn.desc; - previous = invokeDynamic; - } else { - return typeParser - .parseTypeDescriptor( - Type.getReturnType(minnsn.desc).getDescriptor()); - } - } else if (previous.getOpcode() == Opcodes.INVOKESPECIAL) { - try { - MethodInsnNode invokeSpecial = (MethodInsnNode) previous; - Class owner = typeParser.resolve(invokeSpecial.owner); - Class[] args = Stream.of(Type.getArgumentTypes(invokeSpecial.desc)) - .map(e -> typeParser.resolve(e.getInternalName())) - .toArray(Class[]::new); - Method reference = owner.getDeclaredMethod(invokeSpecial.name, args); - return reference.getGenericReturnType(); - } catch (NoSuchMethodException x) { - return Object.class; - } - } else { - return typeParser - .parseTypeDescriptor(Type.getReturnType(minnsn.desc).getDescriptor()); - } + public static java.lang.reflect.Type find(TypeParser typeParser, MethodNode node) { + List returns = findReturns(node); + Set types = new LinkedHashSet<>(); + for (AbstractInsnNode aReturn : returns) { + AbstractInsnNode previous = previous(aReturn.getPrevious()); + if (previous instanceof MethodInsnNode) { + MethodInsnNode call = (MethodInsnNode) previous; + // Constructor? + if (call.name.equals("")) { + types.add(typeParser.resolve(call.owner)); + } else { + types.add(typeParser.parseTypeDescriptor(Type.getReturnType(call.desc).getDescriptor())); + } + } else if (previous instanceof VarInsnNode) { + localVariable(typeParser, node, (VarInsnNode) previous) + .ifPresent(types::add); + } else if (previous instanceof InvokeDynamicInsnNode) { + // visitInvokeDynamicInsn("call", "()Ljava/util/concurrent/Callable;", new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;", false), new Object[]{Type.getType("()Ljava/lang/Object;"), new Handle(Opcodes.H_INVOKESTATIC, "io/jooby/internal/ReturnTypeTest", "lambda$null$11", "()Ljava/lang/Character;", false), Type.getType("()Ljava/lang/Character;")}); + // (Callable) () -> 'x' + InvokeDynamicInsnNode invokeDynamic = (InvokeDynamicInsnNode) previous; + String handleDescriptor = Stream.of(invokeDynamic.bsmArgs) + .filter(Handle.class::isInstance) + .map(Handle.class::cast) + .findFirst() + .map(h -> { + String desc = Type.getReturnType(h.getDesc()).getDescriptor(); + return "V".equals(desc) ? "java/lang/Object" : desc; + }) + .orElse(null); + // Ljava/util/concurrent/Callable; + String descriptor = Type + .getReturnType(invokeDynamic.desc) + .getDescriptor(); + if (handleDescriptor != null) { + // Handle: ()Ljava/lang/Character; + if (descriptor.endsWith(";")) { + descriptor = descriptor.substring(0, descriptor.length() - 1); } - /** return "String" | int | double */ - if (previous instanceof LdcInsnNode) { - Object cst = ((LdcInsnNode) previous).cst; - if (cst instanceof Type) { - return typeParser.parseTypeDescriptor(((Type) cst).getDescriptor()); - } - return cst.getClass(); + descriptor += "<" + handleDescriptor + ">"; + } + types.add(typeParser.parseTypeDescriptor(descriptor)); + } else if (previous instanceof LdcInsnNode) { + /** return "String" | int | double */ + Object cst = ((LdcInsnNode) previous).cst; + if (cst instanceof Type) { + types.add(typeParser.parseTypeDescriptor(((Type) cst).getDescriptor())); + } else { + types.add(cst.getClass()); + } + } else { + // array + switch (previous.getOpcode()) { + case Opcodes.NEWARRAY: { + ofNullable(primitiveEmptyArray(previous)) + .ifPresent(types::add); } - /** return variable */ - if (previous instanceof VarInsnNode) { - VarInsnNode varInsn = (VarInsnNode) previous; - return localVariable(node, varInsn); + break; + case Opcodes.ANEWARRAY: { + TypeInsnNode typeInsn = (TypeInsnNode) previous; + types.add(typeParser.parseTypeDescriptor("[" + typeInsn.desc)); } - /** Invoke dynamic: */ - if (previous instanceof InvokeDynamicInsnNode) { - InvokeDynamicInsnNode invokeDynamic = (InvokeDynamicInsnNode) previous; - String handleDescriptor = Stream.of(invokeDynamic.bsmArgs) - .filter(Handle.class::isInstance) - .map(Handle.class::cast) + break; + case Opcodes.BASTORE: + types.add(boolean[].class); + break; + case Opcodes.CASTORE: + types.add(char[].class); + break; + case Opcodes.SASTORE: + types.add(short[].class); + break; + case Opcodes.IASTORE: + types.add(int[].class); + break; + case Opcodes.LASTORE: + types.add(long[].class); + break; + case Opcodes.FASTORE: + types.add(float[].class); + break; + case Opcodes.DASTORE: + types.add(double[].class); + break; + case Opcodes.AASTORE: + return Insns.previous(previous) + .filter(e -> e.getOpcode() == Opcodes.ANEWARRAY) .findFirst() - .map(h -> { - String desc = Type.getReturnType(h.getDesc()).getDescriptor(); - return "V".equals(desc) ? "java/lang/Object" : desc; + .map(e -> { + TypeInsnNode typeInsn = (TypeInsnNode) e; + return typeParser.parseTypeDescriptor("[" + typeInsn.desc); }) - .orElse(null); - String descriptor = Type - .getReturnType(Optional.ofNullable(sourcedesc).orElse(invokeDynamic.desc)) - .getDescriptor(); - if (handleDescriptor != null) { - if (descriptor.endsWith(";")) { - descriptor = descriptor.substring(0, descriptor.length() - 1); - } - descriptor += "<" + handleDescriptor + ">"; - } - return typeParser.parseTypeDescriptor(descriptor); - } - /** array literal: */ - if (previous.getOpcode() == Opcodes.NEWARRAY) { - // empty primitive array - if (previous instanceof IntInsnNode) { - switch (((IntInsnNode) previous).operand) { - case Opcodes.T_BOOLEAN: - return boolean[].class; - case Opcodes.T_CHAR: - return char[].class; - case Opcodes.T_BYTE: - return byte[].class; - case Opcodes.T_SHORT: - return short[].class; - case Opcodes.T_INT: - return int[].class; - case Opcodes.T_LONG: - return long[].class; - case Opcodes.T_FLOAT: - return float[].class; - case Opcodes.T_DOUBLE: - return double[].class; - } - } - } - // empty array of objects - if (previous.getOpcode() == Opcodes.ANEWARRAY) { - TypeInsnNode typeInsn = (TypeInsnNode) previous; - return typeParser.parseTypeDescriptor("[" + typeInsn.desc); - } - // non empty array - switch (previous.getOpcode()) { - case Opcodes.BASTORE: - return boolean[].class; - case Opcodes.CASTORE: - return char[].class; - case Opcodes.SASTORE: - return short[].class; - case Opcodes.IASTORE: - return int[].class; - case Opcodes.LASTORE: - return long[].class; - case Opcodes.FASTORE: - return float[].class; - case Opcodes.DASTORE: - return double[].class; - case Opcodes.AASTORE: - return Insns.previous(previous) - .filter(e -> e.getOpcode() == Opcodes.ANEWARRAY) - .findFirst() - .map(e -> { - TypeInsnNode typeInsn = (TypeInsnNode) e; - return typeParser.parseTypeDescriptor("[" + typeInsn.desc); - }) - .orElse(Object.class); - } + .orElse(Object.class); + } + } + } + return types.isEmpty() ? Object.class : typeParser.commonAncestor(types); + } - return Object.class; - }) - .collect(Collectors.toSet()); - return typeParser.commonAncestor(result); + private static Class primitiveEmptyArray(AbstractInsnNode previous) { + // empty primitive array + if (previous instanceof IntInsnNode) { + switch (((IntInsnNode) previous).operand) { + case Opcodes.T_BOOLEAN: + return boolean[].class; + case Opcodes.T_CHAR: + return char[].class; + case Opcodes.T_BYTE: + return byte[].class; + case Opcodes.T_SHORT: + return short[].class; + case Opcodes.T_INT: + return int[].class; + case Opcodes.T_LONG: + return long[].class; + case Opcodes.T_FLOAT: + return float[].class; + case Opcodes.T_DOUBLE: + return double[].class; + } + } + return null; } - private AbstractInsnNode findReturnInstruction(AbstractInsnNode it) { + private static AbstractInsnNode previous(AbstractInsnNode it) { while (it != null) { if (IGNORE.test(it)) { it = it.getPrevious(); @@ -222,7 +192,18 @@ private AbstractInsnNode findReturnInstruction(AbstractInsnNode it) { return null; } - private java.lang.reflect.Type localVariable(final MethodNode m, final VarInsnNode varInsn) { + private static List findReturns(MethodNode node) { + List result = new ArrayList<>(); + for (AbstractInsnNode instruction : node.instructions) { + if (instruction.getOpcode() == Opcodes.ARETURN) { + result.add(instruction); + } + } + return result; + } + + private static Optional localVariable(TypeParser typeParser, MethodNode m, + VarInsnNode varInsn) { if (varInsn.getOpcode() == Opcodes.ALOAD) { List vars = m.localVariables; LocalVariableNode var = vars.stream() @@ -230,10 +211,10 @@ private java.lang.reflect.Type localVariable(final MethodNode m, final VarInsnNo .findFirst() .orElse(null); if (var != null) { - String signature = Optional.ofNullable(var.signature).orElse(var.desc); - return typeParser.parseTypeDescriptor(signature); + String signature = ofNullable(var.signature).orElse(var.desc); + return Optional.of(typeParser.parseTypeDescriptor(signature)); } } - return Object.class; + return Optional.empty(); } } diff --git a/jooby/src/main/kotlin/io/jooby/HandlerContext.kt b/jooby/src/main/kotlin/io/jooby/HandlerContext.kt index ee46afdcc4..91c6dc133e 100644 --- a/jooby/src/main/kotlin/io/jooby/HandlerContext.kt +++ b/jooby/src/main/kotlin/io/jooby/HandlerContext.kt @@ -9,7 +9,7 @@ class AfterContext(val ctx: Context, val result: Any?, val failure: Any?) class DecoratorContext(val ctx: Context, val next: Route.Handler) -class HandlerContext(val ctx: Context) +class HandlerContext(val ctx: Context): java.io.Serializable class WebSocketInitContext(val ctx: Context, val configurer: WebSocketConfigurer) diff --git a/jooby/src/test/java/io/jooby/internal/ReturnTypeTest.java b/jooby/src/test/java/io/jooby/internal/ReturnTypeTest.java index 34ef199b89..e5534813db 100644 --- a/jooby/src/test/java/io/jooby/internal/ReturnTypeTest.java +++ b/jooby/src/test/java/io/jooby/internal/ReturnTypeTest.java @@ -104,7 +104,7 @@ public void completableFuture() { return future; }); - assertType(Reified.completableFuture(String.class), ctx -> + assertType(CompletableFuture.class, ctx -> CompletableFuture.supplyAsync(() -> 4) .thenApply(x -> x * 42) .thenApply(x -> x * 53) diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java index 3c90301d24..f5f5a84f57 100644 --- a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java +++ b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ReturnTypeParser.java @@ -109,24 +109,11 @@ private static String handleReturnType(ParserContext ctx, MethodNode node, Abstr if (i instanceof LineNumberNode || i instanceof LabelNode) { continue; } - String sourcedesc = null; /** return 1; return true; return new Foo(); */ if (i instanceof MethodInsnNode) { MethodInsnNode minnsn = (MethodInsnNode) i; if (minnsn.name.equals("")) { return Type.getObjectType(minnsn.owner).getClassName(); - } - if (i.getOpcode() == Opcodes.INVOKEVIRTUAL) { - AbstractInsnNode invokeDynamic = InsnSupport.prev(i) - .filter(InvokeDynamicInsnNode.class::isInstance) - .findFirst() - .orElse(null); - if (invokeDynamic != null) { - sourcedesc = minnsn.desc; - i = invokeDynamic; - } else { - return fromMethodCall(ctx, minnsn); - } } else { return fromMethodCall(ctx, minnsn); } @@ -162,7 +149,7 @@ private static String handleReturnType(ParserContext ctx, MethodNode node, Abstr }) .orElse(null); String descriptor = Type - .getReturnType(Optional.ofNullable(sourcedesc).orElse(invokeDynamic.desc)) + .getReturnType(invokeDynamic.desc) .getDescriptor(); if (handleDescriptor != null && !handleDescriptor.equals("java/lang/Object")) { if (descriptor.endsWith(";")) { diff --git a/modules/jooby-openapi/src/test/kotlin/kt/i2598/App2598.kt b/modules/jooby-openapi/src/test/kotlin/kt/i2598/App2598.kt new file mode 100644 index 0000000000..33dca6b583 --- /dev/null +++ b/modules/jooby-openapi/src/test/kotlin/kt/i2598/App2598.kt @@ -0,0 +1,13 @@ +package kt.i2598 + +import io.jooby.Kooby + +class App2598 : Kooby({ + get("/2598") { + val sign = mutableListOf() + ctx.send("{\"success\":\"true\"}") + //some imaginary long running operation here + sign.removeIf { it == 1 } + return@get ctx + } +}) diff --git a/modules/jooby-openapi/src/test/kotlin/kt/i2598/Issue2598.kt b/modules/jooby-openapi/src/test/kotlin/kt/i2598/Issue2598.kt new file mode 100644 index 0000000000..5bc4fa501a --- /dev/null +++ b/modules/jooby-openapi/src/test/kotlin/kt/i2598/Issue2598.kt @@ -0,0 +1,16 @@ +package kt.i2598 + +import io.jooby.Context +import io.jooby.openapi.OpenAPITest +import io.jooby.openapi.RouteIterator +import org.junit.jupiter.api.Assertions.assertEquals + +class Issue2598 { + + @OpenAPITest(value = App2598::class) + fun shouldParseTypeWithoutError(iterator: RouteIterator) { + iterator.next {route -> + assertEquals(Context::class.java.name, route.defaultResponse.javaType) + }.verify() + } +} diff --git a/tests/src/test/kotlin/i2553/Issue2553.kt b/tests/src/test/kotlin/i2553/Issue2553.kt index 0707c698e2..f94ddff083 100644 --- a/tests/src/test/kotlin/i2553/Issue2553.kt +++ b/tests/src/test/kotlin/i2553/Issue2553.kt @@ -17,9 +17,9 @@ class Issue2553 { val app = App2553() runner.use { app - }.ready { http -> + }.ready { _ -> val router = app.router - val route = router.routes.get(0) + val route = router.routes[0] val type = analyzer.returnType(route.handle) assertEquals(CompletableFuture::class.java, type) diff --git a/tests/src/test/kotlin/i2598/App2598.kt b/tests/src/test/kotlin/i2598/App2598.kt new file mode 100644 index 0000000000..65bba41162 --- /dev/null +++ b/tests/src/test/kotlin/i2598/App2598.kt @@ -0,0 +1,14 @@ +package i2598 + +import io.jooby.Kooby + +class App2598 : Kooby({ + get("/2598") { + val sign = mutableListOf() + ctx.send("{\"success\":\"true\"}") + //some imaginary long running operation here + sign.removeIf { it == 1 } + return@get ctx + } +}) + diff --git a/tests/src/test/kotlin/i2598/Issue2598.kt b/tests/src/test/kotlin/i2598/Issue2598.kt new file mode 100644 index 0000000000..4e107ca8ee --- /dev/null +++ b/tests/src/test/kotlin/i2598/Issue2598.kt @@ -0,0 +1,30 @@ +package i2598 + +import io.jooby.Context +import io.jooby.internal.RouteAnalyzer +import io.jooby.internal.asm.ClassSource +import io.jooby.jetty.Jetty +import io.jooby.junit.ServerTest +import io.jooby.junit.ServerTestRunner +import org.junit.jupiter.api.Assertions.assertEquals + +class Issue2598 { + + @ServerTest(server = [Jetty::class]) + fun analyzerShouldDetectCompletableFuture(runner: ServerTestRunner) { + val analyzer = RouteAnalyzer(ClassSource(javaClass.classLoader), false) + + val app = App2598() + runner.use { + app + }.ready { _ -> + val router = app.router + val route = router.routes[0] + val type = analyzer.returnType(route.handle) + + assertEquals(Context::class.java, type) + } + } + +} + From 1484ff79b16b617255fbf12e06db021e2c1461c8 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 27 May 2022 20:43:45 -0300 Subject: [PATCH 42/97] dependencies: version bump --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e3dcd1fc54..b170948414 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.1.212 5.6.3.Final 12.16.0 - 3.28.0 + 3.29.0 7.5.1 16.2 6.1.8.RELEASE @@ -55,7 +55,7 @@ 1.2.11 - 2.17.1 + 2.17.2 1.7.36 @@ -82,7 +82,7 @@ 2.2.0 - 2.0.32 + 2.0.33 2.0.0-rc.20 @@ -100,7 +100,7 @@ 2.3.2 9.1.6 6.4.1 - 1.12.220 + 1.12.230 ${aws-java-sdk.version} 1.12.1 1.9.3 @@ -110,16 +110,16 @@ 1.6.21 - 1.6.1 + 1.6.2 true 0.8.8 5.8.2 - 5.0.1 + 5.1.0 8.42 - 4.5.1 - 30.1-jre + 4.6.0 + 31.1-jre 1.0.1 0.19 From eb3bfacb5909fc17ad8b67f161b57f197c8ba7f7 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 27 May 2022 21:39:23 -0300 Subject: [PATCH 43/97] v2.15.1 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 32 ++++++++++++++---------- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 75 insertions(+), 69 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 40014528fd..a2c1cf2568 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index ef01424bc4..d21cc19d21 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 82d247c95f..92ba7baf4e 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index b1567f5804..55d8ae69e4 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index f86582f9ba..490ff8b1b3 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 9d01cbd55c..35da2a3364 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 58a3efb8ec..48941996dd 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 @@ -16,12 +16,12 @@ - 2.15.1-SNAPSHOT + 2.15.1 4.0.3 3.2.0 9.3 1.0.1 - 1.12.220 + 1.12.230 6.4.1 2.8.8 8.42 @@ -43,7 +43,7 @@ 2.6 16.2 2.9.0 - 30.1-jre + 31.1-jre 5.1.0 2.1.212 4.3.0 @@ -58,21 +58,21 @@ 1.9.3 1 1.11.0.Final - 3.28.0 + 3.29.0 9.4.46.v20220331 0.0.9 - 1.12.220 - 2.15.1-SNAPSHOT - 2.15.1-SNAPSHOT + 1.12.230 + 2.15.1 + 2.15.1 0.11.5 3.0.2 5.8.2 2.7.0 1.6.21 - 1.6.1 + 1.6.2 6.1.8.RELEASE 4.1 - 2.17.1 + 2.17.2 1.2 1.2.11 3.0.0 @@ -98,7 +98,7 @@ 3.0.0-M6 2.24 4.2.9 - 4.5.1 + 4.6.0 2.3.1 8.0.29 4.1.77.Final @@ -111,13 +111,13 @@ 2.3.2 3.4.18 2.0.0-rc.20 - 5.0.1 + 5.1.0 1.3.0 2.2.21 1.7.36 5.3.20 3.1.1 - 2.0.32 + 2.0.33 2.2.0 3.0.12.RELEASE 1.1.3 @@ -1102,6 +1102,12 @@ ${plexus-utils.version} jar + + com.amazonaws + aws-java-sdk-emrserverless + ${aws-java-sdk.version} + jar + com.amazonaws aws-java-sdk-chimesdkmediapipelines diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index f6233357c6..c121d53dda 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 2a7f8c1c37..75981b5047 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 29e6a8f23e..9a9607798f 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 643c60ac84..189cfe2e65 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index bfe4a7d3b4..c85d7f9b57 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 17e83a3a4a..6670a63d35 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 6515631a5f..eb08bfe8e7 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 1b69b9f524..9af50b6609 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 36bbf5260a..32c84c8002 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 83ee3bc65d..69eb0ef959 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index b57b83ad46..d398a8a7fb 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 5c87344c36..78d01f8426 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 544c760178..ae0d70cae5 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 0f2d358800..d43e177a99 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index e40b5d69c2..8d7af8a3d4 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index e83837f112..9b79f4cb2c 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 5caba5a0a4..f7c497a7d2 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 79b54ad246..a6aa115ff8 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 5d30313e2e..cfaacfba85 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index efc0de8264..f301cc4796 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index d8a80d2a38..8f7cc6ada7 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 02467202e5..ae20411fe5 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 55c7a874f8..ef6639cd57 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index e9a5f4c5a2..f3d01c4994 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 3f2fe79204..7ba3ddb772 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index fca29b5395..06c1fb87ef 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 2e304d612e..feaf151ffd 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index ccdb030662..840fed29d0 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 86744d5cc3..1c10cb3d90 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 102e2d07c8..ed0a28dad8 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 625df5b9f2..5afbce40b5 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index b11e8c4764..6baa4dd6c0 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 707f071208..8fc53e90fe 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 51a59890cd..2b060e1193 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index e06436b9ed..5339fa53e6 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index ac48f35f5b..c8c6c2b7f9 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index c4c212938e..611bc9f281 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 4aa75eb9a1..bc64baa339 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 180bb97361..f1929dfc55 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index a88ad78425..e2bf9a1c0a 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 211e15915e..fedb175c51 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 3bc8de4794..76044a3098 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 0d4fcf835a..8b5647cfc0 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 6d3dfd3517..028dbcfc3b 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index b1bea09ea4..4a8e709561 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index acc9dbb4a0..fe8f327518 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 4187b4a813..25cc680e6a 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index c8106e494a..a82bb02b98 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1-SNAPSHOT + 2.15.1 modules diff --git a/pom.xml b/pom.xml index b170948414..7f0833fb1b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.15.1-SNAPSHOT + 2.15.1 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 068a8bb740..d6c28d11ec 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1-SNAPSHOT + 2.15.1 4.0.0 From 6d0d33356ce32fb9aaa9b6e4cfac8502a77a7046 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 27 May 2022 21:45:31 -0300 Subject: [PATCH 44/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 8 ++++---- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a2c1cf2568..6894a5406d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index d21cc19d21..081462a2f4 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 92ba7baf4e..7cc0c06544 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 55d8ae69e4..f8da431352 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 490ff8b1b3..635ef3e6d7 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 35da2a3364..4fbf88874b 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 48941996dd..efdd7bf7e4 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 @@ -16,7 +16,7 @@ - 2.15.1 + 2.15.2-SNAPSHOT 4.0.3 3.2.0 9.3 @@ -62,8 +62,8 @@ 9.4.46.v20220331 0.0.9 1.12.230 - 2.15.1 - 2.15.1 + 2.15.2-SNAPSHOT + 2.15.2-SNAPSHOT 0.11.5 3.0.2 5.8.2 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index c121d53dda..f2debcbb81 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 75981b5047..89ade49a01 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 9a9607798f..63b1e68a69 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 189cfe2e65..fbb884538d 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index c85d7f9b57..fdadfe0a84 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 6670a63d35..4e36a8b689 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index eb08bfe8e7..dabe282a78 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 9af50b6609..7caabf4b4b 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 32c84c8002..9294c037b4 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 69eb0ef959..2750cf5177 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index d398a8a7fb..9aa230abbc 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 78d01f8426..e2794db3b1 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index ae0d70cae5..4d1744c882 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index d43e177a99..79d018919b 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 8d7af8a3d4..83e9620ef6 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 9b79f4cb2c..6100b73d61 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index f7c497a7d2..92f1b62590 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index a6aa115ff8..1e7fcd3515 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index cfaacfba85..5f9ee16ee7 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index f301cc4796..86f4071a70 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 8f7cc6ada7..790a2afe19 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index ae20411fe5..ee601ecdda 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index ef6639cd57..76b6bec6a8 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index f3d01c4994..9a5164e85d 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 7ba3ddb772..b967ae155f 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 06c1fb87ef..d6d9e5e501 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index feaf151ffd..f3161b59cc 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 840fed29d0..d056b699a0 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 1c10cb3d90..a63c89e284 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index ed0a28dad8..265d5d0068 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 5afbce40b5..416fef6479 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 6baa4dd6c0..6f605c7b59 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 8fc53e90fe..45a5582579 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 2b060e1193..2a87e65195 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 5339fa53e6..9640a9b3b7 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index c8c6c2b7f9..d0c86947f1 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 611bc9f281..e57fa947b4 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index bc64baa339..cc6a91e54e 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index f1929dfc55..dfffd31822 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index e2bf9a1c0a..2eff971775 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index fedb175c51..81c34084ec 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 76044a3098..a35c3a4d59 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 8b5647cfc0..e208d5c20e 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 028dbcfc3b..56ef46bee0 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 4a8e709561..5a5c9dc52f 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index fe8f327518..2ae25182ff 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 25cc680e6a..fd7b949dbf 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index a82bb02b98..d73a3eef8f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1 + 2.15.2-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index 7f0833fb1b..67bb4c2bc1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.15.1 + 2.15.2-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index d6c28d11ec..3505a13e93 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.1 + 2.15.2-SNAPSHOT 4.0.0 From 32cda3fcf45fc230f5d681f252c8c8bb6fb2eb45 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 28 May 2022 13:39:45 -0300 Subject: [PATCH 45/97] [openapi] Duplicated endpoints for the mounted applications fix #2594 --- .../jooby/internal/openapi/ParserContext.java | 1 + .../jooby/internal/openapi/RouteParser.java | 18 +++--- .../src/test/java/issues/i2594/App2594.java | 16 ++++++ .../java/issues/i2594/ControllerV12594.java | 23 ++++++++ .../java/issues/i2594/ControllerV22594.java | 18 ++++++ .../issues/i2594/ControllersAppV12594.java | 10 ++++ .../issues/i2594/ControllersAppV22594.java | 10 ++++ .../issues/i2594/HealthController2594.java | 25 +++++++++ .../src/test/java/issues/i2594/Issue2594.java | 55 +++++++++++++++++++ .../java/issues/i2594/WelcomeService2594.java | 8 +++ .../src/test/resources/issues/i2594/App2594 | 4 ++ 11 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/App2594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/ControllerV12594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/ControllerV22594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV12594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV22594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/HealthController2594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/Issue2594.java create mode 100644 modules/jooby-openapi/src/test/java/issues/i2594/WelcomeService2594.java create mode 100644 modules/jooby-openapi/src/test/resources/issues/i2594/App2594 diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ParserContext.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ParserContext.java index 42712f28fe..a85ba9a7c4 100644 --- a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ParserContext.java +++ b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/ParserContext.java @@ -37,6 +37,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java index 1c74bf947f..d6fd10f3fb 100644 --- a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java +++ b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/RouteParser.java @@ -75,6 +75,13 @@ public RouteParser(String metaInf) { public List parse(ParserContext ctx) { List operations = parse(ctx, null, ctx.classNode(ctx.getRouter())); + // Checkout controllers without explicit mapping, just META-INF + Set controllers = operations.stream() + .map(OperationExt::getControllerName) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + operations.addAll(metaInf(ctx, null, name -> !controllers.contains(name))); + String applicationName = Optional.ofNullable(ctx.getMainClass()) .orElse(ctx.getRouter().getClassName()); ClassNode application = ctx.classNode(Type.getObjectType(applicationName.replace(".", "/"))); @@ -274,12 +281,6 @@ public List parse(ParserContext ctx, String prefix, ClassNode node for (MethodNode method : node.methods) { handlerList.addAll(routeHandler(ctx, prefix, method)); } - Set controllers = handlerList.stream() - .map(OperationExt::getControllerName) - .filter(Objects::nonNull) - .collect(Collectors.toSet()); - - handlerList.addAll(metaInf(ctx, prefix, name -> !controllers.contains(name))); return handlerList; } @@ -698,7 +699,7 @@ private List kotlinHandler(ParserContext ctx, String httpMethod, ClassNode classNode = ctx.classNode(Type.getObjectType(lookup.get(0))); MethodNode apply = null; - if (lookup.size() > 1) { + if (lookup.size() > 1) { MethodNode method = classNode.methods.stream() .filter(it -> it.name.equals(lookup.get(1)) && it.desc.equals(lookup.get(2))) .findFirst() @@ -823,7 +824,8 @@ private OperationExt newRouteDescriptor(ParserContext ctx, MethodNode node, OperationExt operation = new OperationExt(node, httpMethod, prefix, arguments, response); boolean notSynthetic = (node.access & Opcodes.ACC_SYNTHETIC) == 0; - boolean lambda = node.name.equals("apply") || node.name.equals("invoke") || node.name.startsWith("invoke$"); + boolean lambda = + node.name.equals("apply") || node.name.equals("invoke") || node.name.startsWith("invoke$"); if (notSynthetic && !lambda) { operation.setOperationId(node.name); } diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/App2594.java b/modules/jooby-openapi/src/test/java/issues/i2594/App2594.java new file mode 100644 index 0000000000..e51651d762 --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/App2594.java @@ -0,0 +1,16 @@ +package issues.i2594; + +import io.jooby.Jooby; +import io.jooby.OpenAPIModule; + +public class App2594 extends Jooby { + { + + install(new OpenAPIModule()); + + mvc(HealthController2594.class); + + mount("/api/v1", new ControllersAppV12594()); + mount("/api/v2", new ControllersAppV22594()); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV12594.java b/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV12594.java new file mode 100644 index 0000000000..07c1bf2b37 --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV12594.java @@ -0,0 +1,23 @@ +package issues.i2594; + +import javax.inject.Inject; + +import io.jooby.annotations.GET; +import io.jooby.annotations.Path; + +@Path("/") +public class ControllerV12594 { + + @Inject + private WelcomeService2594 welcomeService; + + @GET("/welcome") + public String sayHi() { + return welcomeService.welcome("v1"); + } + + @GET("/should-not-be-duplicated-under-v2") + public String demo() { + return welcomeService.welcome("v1"); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV22594.java b/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV22594.java new file mode 100644 index 0000000000..3af262d1dd --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV22594.java @@ -0,0 +1,18 @@ +package issues.i2594; + +import javax.inject.Inject; + +import io.jooby.annotations.GET; +import io.jooby.annotations.Path; + +@Path("/") +public class ControllerV22594 { + + @Inject + private WelcomeService2594 welcomeService; + + @GET("/welcome") + public String sayHi() { + return welcomeService.welcome("v2"); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV12594.java b/modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV12594.java new file mode 100644 index 0000000000..a2e0b900d6 --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV12594.java @@ -0,0 +1,10 @@ +package issues.i2594; + +import io.jooby.Jooby; + +public class ControllersAppV12594 extends Jooby { + + public ControllersAppV12594() { + mvc(ControllerV12594.class); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV22594.java b/modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV22594.java new file mode 100644 index 0000000000..e09d4f3f00 --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/ControllersAppV22594.java @@ -0,0 +1,10 @@ +package issues.i2594; + +import io.jooby.Jooby; + +public class ControllersAppV22594 extends Jooby { + + public ControllersAppV22594() { + mvc(ControllerV22594.class); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/HealthController2594.java b/modules/jooby-openapi/src/test/java/issues/i2594/HealthController2594.java new file mode 100644 index 0000000000..785d75e752 --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/HealthController2594.java @@ -0,0 +1,25 @@ +package issues.i2594; + +import javax.inject.Inject; + +import com.google.common.collect.ImmutableMap; +import io.jooby.Context; +import io.jooby.annotations.GET; +import io.jooby.annotations.Path; + +@Path("/") +public class HealthController2594 { + + @Inject + private WelcomeService2594 welcomeService; + + @GET("/healthcheck") + public void healthCheck(Context ctx) { + String welcome = welcomeService.welcome("healthcheck"); + ctx.setResponseCode(200) + .render(ImmutableMap.of( + "status", "Ok", + "welcome", welcome) + ); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/Issue2594.java b/modules/jooby-openapi/src/test/java/issues/i2594/Issue2594.java new file mode 100644 index 0000000000..d9e804f25a --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/Issue2594.java @@ -0,0 +1,55 @@ +package issues.i2594; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import io.jooby.openapi.OpenAPIResult; +import io.jooby.openapi.OpenAPITest; + +public class Issue2594 { + + @OpenAPITest(value = App2594.class) + public void shouldNotDuplicateMountedApp(OpenAPIResult result) { + assertEquals("openapi: 3.0.1\n" + + "info:\n" + + " title: 2594 API\n" + + " description: 2594 API description\n" + + " version: \"1.0\"\n" + + "paths:\n" + + " /healthcheck:\n" + + " get:\n" + + " operationId: healthCheck\n" + + " responses:\n" + + " \"200\":\n" + + " description: Success\n" + + " /api/v1/welcome:\n" + + " get:\n" + + " operationId: sayHi\n" + + " responses:\n" + + " \"200\":\n" + + " description: Success\n" + + " content:\n" + + " application/json:\n" + + " schema:\n" + + " type: string\n" + + " /api/v1/should-not-be-duplicated-under-v2:\n" + + " get:\n" + + " operationId: demo\n" + + " responses:\n" + + " \"200\":\n" + + " description: Success\n" + + " content:\n" + + " application/json:\n" + + " schema:\n" + + " type: string\n" + + " /api/v2/welcome:\n" + + " get:\n" + + " operationId: sayHi2\n" + + " responses:\n" + + " \"200\":\n" + + " description: Success\n" + + " content:\n" + + " application/json:\n" + + " schema:\n" + + " type: string\n", result.toYaml()); + } +} diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/WelcomeService2594.java b/modules/jooby-openapi/src/test/java/issues/i2594/WelcomeService2594.java new file mode 100644 index 0000000000..fb6c1387ec --- /dev/null +++ b/modules/jooby-openapi/src/test/java/issues/i2594/WelcomeService2594.java @@ -0,0 +1,8 @@ +package issues.i2594; + +public class WelcomeService2594 { + + public String welcome(String version) { + return "[API " + version + "] Welcome Jooby!"; + } +} diff --git a/modules/jooby-openapi/src/test/resources/issues/i2594/App2594 b/modules/jooby-openapi/src/test/resources/issues/i2594/App2594 new file mode 100644 index 0000000000..9395075a62 --- /dev/null +++ b/modules/jooby-openapi/src/test/resources/issues/i2594/App2594 @@ -0,0 +1,4 @@ +issues.i2594.ControllerV12594$Module +issues.i2594.ControllerV22594$Module +issues.i2594.HealthController2594$Module + From e22d03d9f3c476dafd19a7cff26447d11eb1c7cd Mon Sep 17 00:00:00 2001 From: lukasbarti <37272752+lukasbarti@users.noreply.github.com> Date: Sun, 12 Jun 2022 19:25:47 +0200 Subject: [PATCH 46/97] Fix typo ("NO_CONENT" => "NO_CONTENT") --- docs/asciidoc/modules/openapi.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/asciidoc/modules/openapi.adoc b/docs/asciidoc/modules/openapi.adoc index 4a8468af5c..11e6e551c7 100644 --- a/docs/asciidoc/modules/openapi.adoc +++ b/docs/asciidoc/modules/openapi.adoc @@ -393,7 +393,7 @@ and/or `@Operation` annotations. ==== Responses & Status -The default response code is `Success(200)` (or `NO_CONENT(204)` for DELETE mvc routes). Now, if +The default response code is `Success(200)` (or `NO_CONTENT(204)` for DELETE mvc routes). Now, if you need to: - document the default response From 88df1599de62c25b7906885f1b56642576d67c68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 21:13:35 +0000 Subject: [PATCH 47/97] build(deps): bump aws-java-sdk-s3 in /modules/jooby-bom Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.12.230 to 1.12.261. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.230...1.12.261) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index efdd7bf7e4..9dc2dce1ff 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -21,7 +21,7 @@ 3.2.0 9.3 1.0.1 - 1.12.230 + 1.12.261 6.4.1 2.8.8 8.42 From 94e1e395a2a219904b2a4150facfe3dd67c3aef2 Mon Sep 17 00:00:00 2001 From: Eugene Podolskiy Date: Thu, 21 Jul 2022 23:22:28 +0300 Subject: [PATCH 48/97] App should return 400 code if file form field is missing --- .../java/io/jooby/internal/MultipartNode.java | 11 ++----- tests/src/test/java/io/jooby/Issue2611.java | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 tests/src/test/java/io/jooby/Issue2611.java diff --git a/jooby/src/main/java/io/jooby/internal/MultipartNode.java b/jooby/src/main/java/io/jooby/internal/MultipartNode.java index 5cb03e072e..ea0dfd660c 100644 --- a/jooby/src/main/java/io/jooby/internal/MultipartNode.java +++ b/jooby/src/main/java/io/jooby/internal/MultipartNode.java @@ -11,13 +11,7 @@ import io.jooby.SneakyThrows; import javax.annotation.Nonnull; -import java.io.FileNotFoundException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; public class MultipartNode extends FormdataNode implements Multipart { @@ -42,7 +36,8 @@ public MultipartNode(Context ctx) { @Nonnull @Override public FileUpload file(@Nonnull String name) { List files = files(name); if (files.isEmpty()) { - throw SneakyThrows.propagate(new FileNotFoundException(name)); + final String error = "Field '" + name + "' is missing"; + throw SneakyThrows.propagate(new NoSuchElementException(error)); } return files.get(0); } diff --git a/tests/src/test/java/io/jooby/Issue2611.java b/tests/src/test/java/io/jooby/Issue2611.java new file mode 100644 index 0000000000..2683237ea4 --- /dev/null +++ b/tests/src/test/java/io/jooby/Issue2611.java @@ -0,0 +1,29 @@ +package io.jooby; + +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; +import io.restassured.http.ContentType; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.equalTo; + +public class Issue2611 { + + @ServerTest + public void shouldReturnBadRequestIfFileFormFieldIsMissing(ServerTestRunner runner) { + runner.define(app -> + app.post("/2611/files", ctx -> ctx.file("nonExistentField")) + ).ready(client -> + given() + .port(client.getPort()) + .multiPart("testKey", "testValue") + .accept(ContentType.JSON) + .when() + .post("/2611/files") + .then() + .assertThat() + .statusCode(StatusCode.BAD_REQUEST_CODE) + .body("message", equalTo("Field 'nonExistentField' is missing")) + ); + } +} From 9481d17626bab1d5f31f85d26876e5843a81e320 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 29 Jul 2022 12:55:21 -0300 Subject: [PATCH 49/97] Add FUNDING/sponsor file --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000000..3ac0a4edd8 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [jknack] From 23e154150561a087e2ecb317a1449768ed23eccb Mon Sep 17 00:00:00 2001 From: Jonathan Ryan Date: Thu, 4 Aug 2022 15:41:13 -0400 Subject: [PATCH 50/97] Fix httpsOnly config file example `server.ssl.httpsOnly` doesn't do anything, the code references `server.httpsOnly`, so fix the docs. --- docs/asciidoc/servers.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/asciidoc/servers.adoc b/docs/asciidoc/servers.adoc index 19cf2c5570..29af8eeb8c 100644 --- a/docs/asciidoc/servers.adoc +++ b/docs/asciidoc/servers.adoc @@ -110,7 +110,7 @@ server.defaultHeaders = true server.maxRequestSize = 10485760 server.securePort = 8443 server.ssl.type = self-signed | PKCS12 | X509 -server.ssl.httpsOnly = false +server.httpsOnly = false server.http2 = true server.expectContinue = false ---- From 1400b6823d076e7a583fa39fe47b3a03a33948c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:08:55 +0000 Subject: [PATCH 51/97] build(deps): bump undertow-core in /modules/jooby-bom Bumps [undertow-core](https://github.com/undertow-io/undertow) from 2.2.17.Final to 2.2.19.Final. - [Release notes](https://github.com/undertow-io/undertow/releases) - [Commits](https://github.com/undertow-io/undertow/compare/2.2.17.Final...2.2.19.Final) --- updated-dependencies: - dependency-name: io.undertow:undertow-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index efdd7bf7e4..c132bb4568 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -122,7 +122,7 @@ 3.0.12.RELEASE 1.1.3 1.1.6.RELEASE - 2.2.17.Final + 2.2.19.Final 2.8.1 3.1.5.Final 1.0.9 From e97cd38221577a8bbb3d00b8fee5e8953c403fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:09:06 +0000 Subject: [PATCH 52/97] build(deps): bump undertow-core from 2.2.17.Final to 2.2.19.Final Bumps [undertow-core](https://github.com/undertow-io/undertow) from 2.2.17.Final to 2.2.19.Final. - [Release notes](https://github.com/undertow-io/undertow/releases) - [Commits](https://github.com/undertow-io/undertow/compare/2.2.17.Final...2.2.19.Final) --- updated-dependencies: - dependency-name: io.undertow:undertow-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- modules/jooby-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index efdd7bf7e4..c132bb4568 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -122,7 +122,7 @@ 3.0.12.RELEASE 1.1.3 1.1.6.RELEASE - 2.2.17.Final + 2.2.19.Final 2.8.1 3.1.5.Final 1.0.9 diff --git a/pom.xml b/pom.xml index 67bb4c2bc1..d5dd3a6c90 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 9.3 - 2.2.17.Final + 2.2.19.Final 9.4.46.v20220331 4.1.77.Final From 11c6097f816daa0756d2aa268034b1eee358c55b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 23:09:28 +0000 Subject: [PATCH 53/97] build(deps): bump jsoup from 1.14.2 to 1.15.3 in /docs Bumps [jsoup](https://github.com/jhy/jsoup) from 1.14.2 to 1.15.3. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.14.2...jsoup-1.15.3) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index 6894a5406d..d0fb98859f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -70,7 +70,7 @@ org.jsoup jsoup - 1.14.2 + 1.15.3 From e7b62122ca650c65c7d7d0e4c12adfc0d4d990e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 23:49:29 +0000 Subject: [PATCH 54/97] build(deps-dev): bump jsoup in /modules/jooby-whoops Bumps [jsoup](https://github.com/jhy/jsoup) from 1.14.2 to 1.15.3. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.14.2...jsoup-1.15.3) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- modules/jooby-whoops/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 2ae25182ff..4e32d3d2e8 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -42,7 +42,7 @@ org.jsoup jsoup - 1.14.2 + 1.15.3 test From d62c04c779dc9af7fea204ad557f4e0f8024e5ff Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 5 Sep 2022 20:31:12 -0300 Subject: [PATCH 55/97] cli: move configuration files to `.config/jooby.conf` fixes #2599 --- .../src/main/java/io/jooby/cli/Cli.java | 4 +-- .../src/main/java/io/jooby/cli/Version.java | 4 +-- .../internal/cli/CommandContextImpl.java | 30 ++++++++++++++----- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/Cli.java b/modules/jooby-cli/src/main/java/io/jooby/cli/Cli.java index 48839a09e9..09616e7b06 100644 --- a/modules/jooby-cli/src/main/java/io/jooby/cli/Cli.java +++ b/modules/jooby-cli/src/main/java/io/jooby/cli/Cli.java @@ -71,8 +71,8 @@ public class Cli extends Cmd { } else if ("-V".equalsIgnoreCase(arg) || "--version".equals(arg)) { ctx.println(ctx.getVersion()); } else { - ctx.println( - "Unknown command or option(s): " + args.stream().collect(Collectors.joining(" "))); + ctx.println("Unknown command or option(s): " + args.stream().collect(Collectors.joining(" "))); + ctx.println(" " + ctx); ctx.println(spec.commandLine().getUsageMessage()); } } else { diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java b/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java index 633a81ebe1..becf24dbdf 100644 --- a/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java +++ b/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java @@ -35,7 +35,7 @@ public class Version implements CommandLine.IVersionProvider { private static String doVersion() { try { URL url = URI - .create("http://search.maven.org/solrsearch/select?q=+g:io.jooby+a:jooby&start=0&rows=1") + .create("https://search.maven.org/solrsearch/select?q=+g:io.jooby+a:jooby&start=0&rows=1") .toURL(); URLConnection connection = url.openConnection(); try (Reader in = new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)) { @@ -49,7 +49,7 @@ private static String doVersion() { return Optional.ofNullable(Version.class.getPackage()) .map(Package::getImplementationVersion) .filter(Objects::nonNull) - .orElse("2.0.6"); + .orElse("2.15.0"); } } } diff --git a/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java b/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java index 1644d337cf..20e457f94e 100644 --- a/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java +++ b/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; +import java.io.Reader; import java.io.Writer; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -46,6 +47,8 @@ public class CommandContextImpl implements Context { private Properties versions; + private Path configurationFile; + public CommandContextImpl(LineReader reader, String version) throws IOException { this.reader = reader; this.out = reader.getTerminal().writer(); @@ -54,17 +57,27 @@ public CommandContextImpl(LineReader reader, String version) throws IOException this.templates.setPrettyPrint(true); this.version = version; - Path file = configurationPath(); + // move from .jooby to .config/jooby.conf + configurationFile = Paths.get(System.getProperty("user.home"), ".config", "jooby.conf"); + migrateOldConfiguration(Paths.get(System.getProperty("user.home"), ".jooby"), configurationFile); - if (Files.exists(file)) { - configuration = Cli.gson.fromJson(Files.newBufferedReader(file), LinkedHashMap.class); + if (Files.exists(configurationFile)) { + try (Reader in = Files.newBufferedReader(configurationFile)) { + configuration = Cli.gson.fromJson(in, LinkedHashMap.class); + } } else { configuration = new LinkedHashMap(); } } - private Path configurationPath() { - return Paths.get(System.getProperty("user.home"), ".jooby"); + private void migrateOldConfiguration(Path from, Path to) throws IOException { + if (Files.exists(from)) { + if (!Files.exists(to.getParent())) { + Files.createDirectories(to.getParent()); + } + Files.copy(from, to); + Files.delete(from); + } } @Nonnull @Override public String getVersion() { @@ -83,8 +96,7 @@ private Path configurationPath() { } configuration.put("workspace", workspace.toAbsolutePath().toString()); String json = Cli.gson.toJson(configuration); - Files.write(configurationPath(), json.getBytes(StandardCharsets.UTF_8)); - + Files.write(configurationFile, json.getBytes(StandardCharsets.UTF_8)); } @Override public void exit(int code) { @@ -154,4 +166,8 @@ public Map getDependencyMap() throws IOException { } return result; } + + @Override public String toString() { + return "version: " + getVersion() + "; conf: " + configurationFile; + } } From aac8aaf340149f0fbeb779ca20659d5b7f48a1dd Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 09:42:40 -0300 Subject: [PATCH 56/97] version bump: upgrade major dependencies --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index d5dd3a6c90..56dae1eade 100644 --- a/pom.xml +++ b/pom.xml @@ -22,10 +22,10 @@ 2.3.31 4.3.0 3.1.5 - 2.13.3 - 2.13.2 - 2.13.3 - 2.9.0 + 2.13.4 + ${jackson.version} + ${jackson.version} + 2.9.1 1.0.2 1.0.9 1.3.0 @@ -33,12 +33,12 @@ 4.0.3 - 8.0.29 + 8.0.30 1.2 2.1.212 5.6.3.Final 12.16.0 - 3.29.0 + 3.32.0 7.5.1 16.2 6.1.8.RELEASE @@ -73,8 +73,8 @@ 2.2.19.Final - 9.4.46.v20220331 - 4.1.77.Final + 9.4.48.v20220622 + 4.1.80.Final 2.2.21 From de306b3f2982a4c5879329e3f05ec70c55eee842 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 10:18:18 -0300 Subject: [PATCH 57/97] doc: Number of worker threads fixes #2616 --- docs/asciidoc/execution-model.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/asciidoc/execution-model.adoc b/docs/asciidoc/execution-model.adoc index 5811564536..2ce07ead16 100644 --- a/docs/asciidoc/execution-model.adoc +++ b/docs/asciidoc/execution-model.adoc @@ -364,13 +364,13 @@ workerThreads = Math.max(Runtime.getRuntime().availableProcessors(), 2) * 8 For example `8` cores gives us `64` worker threads. - Undertow: The javadoc:utow.Utow[text=Undertow server] implementation multiply the number of available processors -(with a minimum of 2) by 8. +by 8. ---- -workerThreads = Math.max(Runtime.getRuntime().availableProcessors(), 2) * 8 +workerThreads = Runtime.getRuntime().availableProcessors() * 8 ---- -For example `8` cores gives us `64` worker threads. +For `8` cores gives us `64` worker threads. - Jetty: The javadoc:jetty.Jetty[text=Jetty server] implementation uses the default configuration with `200` worker threads. From 9ae88d4833a488065ad2f8b811c6235bb7f0b3b6 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 10:22:30 -0300 Subject: [PATCH 58/97] ServerOptions#setHost missing a 0? fixes #2614 --- jooby/src/main/java/io/jooby/ServerOptions.java | 8 +++++--- jooby/src/test/java/io/jooby/ServerOptionsTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/jooby/src/main/java/io/jooby/ServerOptions.java b/jooby/src/main/java/io/jooby/ServerOptions.java index aac459ef03..d630022d31 100644 --- a/jooby/src/main/java/io/jooby/ServerOptions.java +++ b/jooby/src/main/java/io/jooby/ServerOptions.java @@ -61,6 +61,8 @@ public class ServerOptions { /** 10mb constant in bytes. */ public static final int _10MB = 10485760; + private static final String LOCAL_HOST = "0.0.0.0"; + /** Buffer size used by server. Usually for reading/writing data. */ private int bufferSize = _16KB; @@ -86,7 +88,7 @@ public class ServerOptions { */ private boolean defaultHeaders = true; - /** Name of server: Jetty, Netty or Utow. */ + /** Name of server: Jetty, Netty or Undertow. */ private String server; /** @@ -95,7 +97,7 @@ public class ServerOptions { */ private int maxRequestSize = _10MB; - private String host = "0.0.0.0"; + private String host = LOCAL_HOST; private SslOptions ssl; @@ -481,7 +483,7 @@ public String getHost() { */ public void setHost(String host) { if (host == null || host.trim().length() == 0 || "localhost".equalsIgnoreCase(host.trim())) { - this.host = "0.0.0"; + this.host = LOCAL_HOST; } else { this.host = host; } diff --git a/jooby/src/test/java/io/jooby/ServerOptionsTest.java b/jooby/src/test/java/io/jooby/ServerOptionsTest.java index 6ffde15611..7d091d95b2 100644 --- a/jooby/src/test/java/io/jooby/ServerOptionsTest.java +++ b/jooby/src/test/java/io/jooby/ServerOptionsTest.java @@ -37,4 +37,16 @@ public void shouldParseFromConfig() { assertEquals("0.0.0.0", options.getHost()); assertEquals(true, options.isHttpsOnly()); } + + @Test + public void shouldSetCorrectLocalHost() { + ServerOptions options = new ServerOptions(); + assertEquals("0.0.0.0", options.getHost()); + options.setHost("localhost"); + assertEquals("0.0.0.0", options.getHost()); + options.setHost(null); + assertEquals("0.0.0.0", options.getHost()); + options.setHost(""); + assertEquals("0.0.0.0", options.getHost()); + } } From 9640984a949890948f15c472e47df3086005b890 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 11:08:11 -0300 Subject: [PATCH 59/97] encoder: should consider route produce types, fixes #2613 --- .../main/java/io/jooby/DefaultContext.java | 3 +- .../io/jooby/internal/HttpMessageEncoder.java | 6 ++- .../test/java/io/jooby/i2613/Issue2613.java | 50 +++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 tests/src/test/java/io/jooby/i2613/Issue2613.java diff --git a/jooby/src/main/java/io/jooby/DefaultContext.java b/jooby/src/main/java/io/jooby/DefaultContext.java index 538a8e0296..a95f62d46a 100644 --- a/jooby/src/main/java/io/jooby/DefaultContext.java +++ b/jooby/src/main/java/io/jooby/DefaultContext.java @@ -23,6 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -205,7 +206,7 @@ public interface DefaultContext extends Context { } @Override default boolean accept(@Nonnull MediaType contentType) { - return accept(singletonList(contentType)) == contentType; + return accept(singletonList(contentType)).equals(contentType); } @Override default MediaType accept(@Nonnull List produceTypes) { diff --git a/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java b/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java index 31987fadbd..e73819b404 100644 --- a/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java +++ b/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java @@ -100,7 +100,11 @@ public HttpMessageEncoder add(MediaType type, MessageEncoder encoder) { } if (encoders != null) { // Content negotiation, find best: - MediaType type = ctx.accept(new ArrayList<>(encoders.keySet())); + List produces = ctx.getRoute().getProduces(); + if (produces.isEmpty()) { + produces = new ArrayList<>(encoders.keySet()); + } + MediaType type = ctx.accept(produces); MessageEncoder encoder = encoders.getOrDefault(type, MessageEncoder.TO_STRING); return encoder.encode(ctx, value); } else { diff --git a/tests/src/test/java/io/jooby/i2613/Issue2613.java b/tests/src/test/java/io/jooby/i2613/Issue2613.java new file mode 100644 index 0000000000..8623409fd0 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2613/Issue2613.java @@ -0,0 +1,50 @@ +package io.jooby.i2613; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.nio.charset.StandardCharsets; + +import org.json.JSONObject; + +import com.google.common.collect.ImmutableMap; +import io.jooby.Context; +import io.jooby.MediaType; +import io.jooby.MessageEncoder; +import io.jooby.json.JacksonModule; +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class Issue2613 { + + public static class ThemeResult { + public String html() { + return ""; + } + } + + public static class ThemeResultEncoder implements MessageEncoder { + + @Override public byte[] encode(Context ctx, Object value) throws Exception { + if (value instanceof ThemeResult) { + ctx.setDefaultResponseType(MediaType.html); + return ((ThemeResult) value).html().getBytes(StandardCharsets.UTF_8); + } + return null; + } + + } + + @ServerTest public void shouldConsiderRouteProduces(ServerTestRunner runner) { + runner.define(app -> { + app.encoder(MediaType.html, new ThemeResultEncoder()); + app.install(new JacksonModule()); + + app.get("/2613/json", ctx -> ImmutableMap.of("foo", "bar")) + .produces(MediaType.json); + }).ready(http -> { + http.get("/2613/json", rsp -> { + assertEquals("{\"foo\":\"bar\"}", rsp.body().string()); + }); + }); + } +} From 2ed1342c56c41be47ca499b1483b684fcda7a4f6 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 11:37:33 -0300 Subject: [PATCH 60/97] v2.16.0 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 26 ++++++++++++------------ modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 69 insertions(+), 69 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d0fb98859f..f74eb03fe8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 081462a2f4..a4f140da71 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 7cc0c06544..cd09863cef 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index f8da431352..500e305fba 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 635ef3e6d7..d734f7db97 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 4fbf88874b..a0464e73ee 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 719735071c..b9e530dd27 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 @@ -16,12 +16,12 @@ - 2.15.2-SNAPSHOT + 2.16.0 4.0.3 3.2.0 9.3 1.0.1 - 1.12.261 + 1.12.230 6.4.1 2.8.8 8.42 @@ -42,15 +42,15 @@ 0.9-rc-1 2.6 16.2 - 2.9.0 + 2.9.1 31.1-jre 5.1.0 2.1.212 4.3.0 5.6.3.Final - 2.13.3 - 2.13.2 - 2.13.3 + 2.13.4 + 2.13.4 + 2.13.4 0.8.8 0.8.8 1.0.2 @@ -58,12 +58,12 @@ 1.9.3 1 1.11.0.Final - 3.29.0 - 9.4.46.v20220331 + 3.32.0 + 9.4.48.v20220622 0.0.9 1.12.230 - 2.15.2-SNAPSHOT - 2.15.2-SNAPSHOT + 2.16.0 + 2.16.0 0.11.5 3.0.2 5.8.2 @@ -100,8 +100,8 @@ 4.2.9 4.6.0 2.3.1 - 8.0.29 - 4.1.77.Final + 8.0.30 + 4.1.80.Final 1.6.8 v12.19.0 4.9.3 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index f2debcbb81..11bb0f4638 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 89ade49a01..1169bc99d9 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 63b1e68a69..8b89ef959b 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index fbb884538d..85e95825b7 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index fdadfe0a84..d5cae1bf4a 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 4e36a8b689..efaaa3a0e1 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index dabe282a78..fca3f5e410 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 7caabf4b4b..a0b12128bc 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 9294c037b4..5ec03e4db2 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 2750cf5177..d34b52c3d3 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 9aa230abbc..1af6d89ebc 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index e2794db3b1..e9c827fd6e 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 4d1744c882..438402c075 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 79d018919b..185d22051e 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 83e9620ef6..e5e309ab45 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 6100b73d61..1e74765f6b 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 92f1b62590..1bd7c57065 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 1e7fcd3515..35c091f15a 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 5f9ee16ee7..e1bca12475 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 86f4071a70..4f5a3cfd3b 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 790a2afe19..9127f09acc 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index ee601ecdda..08a75ce80e 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 76b6bec6a8..d34dd13fba 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 9a5164e85d..9834dd9392 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index b967ae155f..05f088d27b 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index d6d9e5e501..db98c5d468 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index f3161b59cc..ce03a486eb 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index d056b699a0..3999785690 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index a63c89e284..149323380f 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 265d5d0068..1320a68d92 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 416fef6479..d7ebd87cd6 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 6f605c7b59..3bc56ac610 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 45a5582579..72f43497ca 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 2a87e65195..17776b9687 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 9640a9b3b7..f011626277 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index d0c86947f1..4a48f31617 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index e57fa947b4..c4db55f795 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index cc6a91e54e..2a421603ef 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index dfffd31822..d2ca238273 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 2eff971775..b987657444 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 81c34084ec..328bbfe160 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index a35c3a4d59..0da2699aec 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index e208d5c20e..d37f70706d 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 56ef46bee0..f0770ed76e 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 5a5c9dc52f..ac4269e28d 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 4e32d3d2e8..4bc3c83806 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index fd7b949dbf..b5e367ab48 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index d73a3eef8f..3e481b64a4 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.2-SNAPSHOT + 2.16.0 modules diff --git a/pom.xml b/pom.xml index 56dae1eade..3a1dbaf3be 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.15.2-SNAPSHOT + 2.16.0 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 3505a13e93..11cb98ccfe 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.15.2-SNAPSHOT + 2.16.0 4.0.0 From 157a1c197c4b3b9f35bdad9b8fd24a3e45b0b5a1 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 11:44:22 -0300 Subject: [PATCH 61/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 8 ++++---- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f74eb03fe8..14a2d8736d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index a4f140da71..7a5e137f92 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index cd09863cef..54dc670d70 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 500e305fba..a5368ea932 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index d734f7db97..b74254a431 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index a0464e73ee..2a1c4a4be8 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index b9e530dd27..97465ceb3b 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 @@ -16,7 +16,7 @@ - 2.16.0 + 2.16.1-SNAPSHOT 4.0.3 3.2.0 9.3 @@ -62,8 +62,8 @@ 9.4.48.v20220622 0.0.9 1.12.230 - 2.16.0 - 2.16.0 + 2.16.1-SNAPSHOT + 2.16.1-SNAPSHOT 0.11.5 3.0.2 5.8.2 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 11bb0f4638..1ee2b0e7aa 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 1169bc99d9..0bac876e4f 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 8b89ef959b..11ec04c42e 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 85e95825b7..9fb7a8cb6c 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index d5cae1bf4a..8f492fe748 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index efaaa3a0e1..3e330639be 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index fca3f5e410..c0cd53cd28 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index a0b12128bc..ec972c2cfc 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 5ec03e4db2..290831b14f 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index d34b52c3d3..95cd55d4a4 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 1af6d89ebc..e7232c93ef 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index e9c827fd6e..1778ab3578 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 438402c075..2a9dc5f89d 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 185d22051e..e8d8feaf28 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index e5e309ab45..d1419e594e 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 1e74765f6b..27fb89918c 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 1bd7c57065..ee1dba7ba5 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 35c091f15a..d4b383dba1 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index e1bca12475..a87c10a049 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 4f5a3cfd3b..84133847fe 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 9127f09acc..e7739419ca 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 08a75ce80e..70f5317553 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index d34dd13fba..e378f88de4 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 9834dd9392..572211d565 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 05f088d27b..2f1430998f 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index db98c5d468..1955b7bdac 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index ce03a486eb..99c01b7131 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 3999785690..15066f900d 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 149323380f..664fd53d32 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 1320a68d92..017a5660b5 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index d7ebd87cd6..df3abed976 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 3bc56ac610..ff99a086fd 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 72f43497ca..15b31793a7 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 17776b9687..f5c1ea973e 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index f011626277..80970de848 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 4a48f31617..593ca9259c 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index c4db55f795..542f42c01a 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 2a421603ef..ace31ba3ce 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index d2ca238273..0f1ed16145 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index b987657444..5b072ea875 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 328bbfe160..c2462aa6b2 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 0da2699aec..0eebc5ead3 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index d37f70706d..5f72621372 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index f0770ed76e..6cd6acf9e0 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index ac4269e28d..6678c46368 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 4bc3c83806..475dcca5fd 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index b5e367ab48..f5b87be2e5 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 3e481b64a4..00f48f9925 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.0 + 2.16.1-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index 3a1dbaf3be..04daf85870 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.0 + 2.16.1-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 11cb98ccfe..ef25ce75b2 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.0 + 2.16.1-SNAPSHOT 4.0.0 From 932946286e719c10dc4b71b5cd626bef7fed3276 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 14:52:57 -0300 Subject: [PATCH 62/97] Regression: Bug: Fix NullPointerException, will fixing content negotation --- jooby/src/main/java/io/jooby/DefaultContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jooby/src/main/java/io/jooby/DefaultContext.java b/jooby/src/main/java/io/jooby/DefaultContext.java index a95f62d46a..8966933ad4 100644 --- a/jooby/src/main/java/io/jooby/DefaultContext.java +++ b/jooby/src/main/java/io/jooby/DefaultContext.java @@ -206,7 +206,7 @@ public interface DefaultContext extends Context { } @Override default boolean accept(@Nonnull MediaType contentType) { - return accept(singletonList(contentType)).equals(contentType); + return Objects.equals(accept(singletonList(contentType)), contentType); } @Override default MediaType accept(@Nonnull List produceTypes) { From 4d7be54dad429b5aeb5266387df14b0781c78357 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 15:35:58 -0300 Subject: [PATCH 63/97] v2.16.1 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 8 ++++---- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 14a2d8736d..f99da61a90 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 7a5e137f92..8c772115c6 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 54dc670d70..0488624774 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index a5368ea932..520a3d4e8d 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index b74254a431..5c7a1f4cb8 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 2a1c4a4be8..e3be721009 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 97465ceb3b..2da4d88d76 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 @@ -16,7 +16,7 @@ - 2.16.1-SNAPSHOT + 2.16.1 4.0.3 3.2.0 9.3 @@ -62,8 +62,8 @@ 9.4.48.v20220622 0.0.9 1.12.230 - 2.16.1-SNAPSHOT - 2.16.1-SNAPSHOT + 2.16.1 + 2.16.1 0.11.5 3.0.2 5.8.2 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 1ee2b0e7aa..4a55616940 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 0bac876e4f..afd09e88e6 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 11ec04c42e..750d6439a7 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 9fb7a8cb6c..660c5c88a3 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 8f492fe748..119417af98 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 3e330639be..bfb7fa4e6a 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index c0cd53cd28..9fc721ed9f 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index ec972c2cfc..2e5e21d990 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 290831b14f..f574c80978 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 95cd55d4a4..57dd7f2054 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index e7232c93ef..71d31afd5e 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 1778ab3578..9798868ab3 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 2a9dc5f89d..8f1cf8d803 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index e8d8feaf28..9b4b4b5e8a 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index d1419e594e..509234f3ff 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 27fb89918c..cd681a4d09 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index ee1dba7ba5..265eb1866f 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index d4b383dba1..fa2f1ae190 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index a87c10a049..fdba23aa7a 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 84133847fe..c74c33b4b7 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index e7739419ca..854066b36f 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 70f5317553..8f8d58d400 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index e378f88de4..6c10389a37 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 572211d565..f5e2d0f6d7 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 2f1430998f..37f17a8ffc 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 1955b7bdac..7b44ef00c5 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 99c01b7131..22563bb738 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 15066f900d..7cefb2505c 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 664fd53d32..50d862d9d3 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 017a5660b5..a58c5ec358 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index df3abed976..e75830abf8 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index ff99a086fd..8fac147925 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 15b31793a7..76f1146454 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index f5c1ea973e..3501be751c 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 80970de848..d980f97d32 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 593ca9259c..604b8bd4eb 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 542f42c01a..00a8f174db 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index ace31ba3ce..251755d3f7 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 0f1ed16145..692fc9e990 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 5b072ea875..4d50507e7d 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index c2462aa6b2..97f8238552 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 0eebc5ead3..edda14f829 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 5f72621372..7d0867a9ff 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 6cd6acf9e0..b36dbea023 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 6678c46368..531afcceba 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 475dcca5fd..e73b11c24c 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index f5b87be2e5..a2543687ae 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 00f48f9925..b50d105070 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1-SNAPSHOT + 2.16.1 modules diff --git a/pom.xml b/pom.xml index 04daf85870..cee6a85523 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.1-SNAPSHOT + 2.16.1 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index ef25ce75b2..1f84652701 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1-SNAPSHOT + 2.16.1 4.0.0 From 0f5e57aeba9e6aa2eb7b17fbd13a4896340d47ea Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 6 Sep 2022 15:43:53 -0300 Subject: [PATCH 64/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 2 +- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f99da61a90..5b332e4894 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 8c772115c6..677f236555 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 0488624774..7124fe0aa6 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 520a3d4e8d..170b4c6d3f 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 5c7a1f4cb8..c8d1689c1b 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index e3be721009..35e48f5889 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 2da4d88d76..fdfba01ffd 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 4a55616940..a83f2e1d67 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index afd09e88e6..f1fa5f42b2 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 750d6439a7..26df52a786 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 660c5c88a3..bedcdd7a5c 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 119417af98..2ed9622407 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index bfb7fa4e6a..760b6007de 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 9fc721ed9f..c01139a9cb 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 2e5e21d990..e3d2074d72 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index f574c80978..3066975203 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 57dd7f2054..7ada977560 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 71d31afd5e..d2c4407437 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 9798868ab3..383ebf2896 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 8f1cf8d803..2fcab81e39 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 9b4b4b5e8a..c2886c57e6 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 509234f3ff..40f9b3d01d 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index cd681a4d09..0fa92b8230 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 265eb1866f..df46d9b03c 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index fa2f1ae190..d11352cb78 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index fdba23aa7a..ba3a459f44 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index c74c33b4b7..ee2385b37f 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 854066b36f..c69435e170 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 8f8d58d400..e03f47fdf0 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 6c10389a37..9755b0d625 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index f5e2d0f6d7..9e81c565e5 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 37f17a8ffc..bb1ba870ef 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 7b44ef00c5..349f7c1494 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 22563bb738..840281135a 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 7cefb2505c..e247b13db0 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index 50d862d9d3..ec5e6f9f6d 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index a58c5ec358..03ce128033 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index e75830abf8..c35f01d2e9 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 8fac147925..47c03f7859 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 76f1146454..4a47a521b7 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 3501be751c..6bcc8beef3 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index d980f97d32..3c891337ea 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 604b8bd4eb..5bb0fe6e04 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 00a8f174db..48ed58d5b3 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 251755d3f7..5a9cb51463 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 692fc9e990..b71bf3d49f 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 4d50507e7d..e2258d42ce 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 97f8238552..a8036ae617 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index edda14f829..f848e3d61b 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 7d0867a9ff..40ae8bb20b 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index b36dbea023..53020275d0 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 531afcceba..1033ded407 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index e73b11c24c..0b4747f7f5 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index a2543687ae..f63371eb74 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index b50d105070..8a8515a567 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1 + 2.16.2-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index cee6a85523..8db2602179 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.1 + 2.16.2-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 1f84652701..931b388c8d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.1 + 2.16.2-SNAPSHOT 4.0.0 From a420491375d2c7655c179dfaf7d96fec6d5113be Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 24 Oct 2022 17:04:02 -0300 Subject: [PATCH 65/97] version: upgrade jooby dependencies --- modules/jooby-cli/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- pom.xml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index f1fa5f42b2..97d72f55a9 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -29,7 +29,7 @@ info.picocli picocli - 4.6.1 + 4.6.3 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 5a9cb51463..25b0ad5271 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -30,7 +30,7 @@ io.methvin directory-watcher - 0.15.1 + 0.16.1 diff --git a/pom.xml b/pom.xml index 8db2602179..8e7c9e174d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,11 @@ 2.3.31 - 4.3.0 - 3.1.5 + 4.3.1 + 3.1.6 2.13.4 ${jackson.version} - ${jackson.version} + 2.13.4.2 2.9.1 1.0.2 1.0.9 @@ -43,7 +43,7 @@ 16.2 6.1.8.RELEASE 2.11.1 - 2.7.0 + 2.7.2 2.8.8 1.4.2 @@ -96,11 +96,11 @@ 4.9.3 0.11.5 - 4.5.6 + 4.5.7 2.3.2 9.1.6 6.4.1 - 1.12.230 + 1.12.261 ${aws-java-sdk.version} 1.12.1 1.9.3 @@ -115,8 +115,8 @@ 0.8.8 - 5.8.2 - 5.1.0 + 5.9.1 + 5.2.0 8.42 4.6.0 31.1-jre From 82c4281fe3736d7ab82d5edd15f71381e574a8fa Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 24 Oct 2022 18:09:35 -0300 Subject: [PATCH 66/97] Preflight requests fail with 415 when MVC Controller method has @Consumes Annotation fix #2649 --- jooby/src/main/java/io/jooby/Context.java | 9 +++++ jooby/src/main/java/io/jooby/CorsHandler.java | 6 +-- jooby/src/main/java/io/jooby/Route.java | 14 ++++--- tests/src/test/java/io/jooby/Issue2649.java | 38 +++++++++++++++++++ 4 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 tests/src/test/java/io/jooby/Issue2649.java diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java index 9a955d02a2..2ad77c252b 100644 --- a/jooby/src/main/java/io/jooby/Context.java +++ b/jooby/src/main/java/io/jooby/Context.java @@ -424,6 +424,15 @@ public interface Context extends Registry { */ @Nullable MediaType getRequestType(); + /** + * Test whenever this is a CORS preflight request. + * + * @return Test whenever this is a CORS preflight request. + */ + default boolean isPreflight() { + return getMethod().equals(Router.OPTIONS) && !header("Access-Control-Request-Method").isMissing(); + } + /** * Request Content-Type header or null when missing. * diff --git a/jooby/src/main/java/io/jooby/CorsHandler.java b/jooby/src/main/java/io/jooby/CorsHandler.java index 3b90d369ff..55ac1b1a73 100644 --- a/jooby/src/main/java/io/jooby/CorsHandler.java +++ b/jooby/src/main/java/io/jooby/CorsHandler.java @@ -73,7 +73,7 @@ public CorsHandler() { return ctx.send(StatusCode.FORBIDDEN); } log.debug("allowed origin: {}", origin); - if (isPreflight(ctx)) { + if (ctx.isPreflight()) { log.debug("handling preflight for: {}", origin); if (preflight(ctx, options, origin)) { return ctx; @@ -135,10 +135,6 @@ private static void simple(final Context ctx, final Cors options, final String o route.setHttpOptions(true); } - private boolean isPreflight(final Context ctx) { - return ctx.getMethod().equals(Router.OPTIONS) && !ctx.header(AC_REQUEST_METHOD).isMissing(); - } - private boolean preflight(final Context ctx, final Cors options, final String origin) { /* Allowed method diff --git a/jooby/src/main/java/io/jooby/Route.java b/jooby/src/main/java/io/jooby/Route.java index 1ab06a9a15..5d69a25c8e 100644 --- a/jooby/src/main/java/io/jooby/Route.java +++ b/jooby/src/main/java/io/jooby/Route.java @@ -337,12 +337,14 @@ public interface Handler extends Serializable, Aware { /** Handler for {@link StatusCode#UNSUPPORTED_MEDIA_TYPE} responses. */ public static final Route.Before SUPPORT_MEDIA_TYPE = ctx -> { - MediaType contentType = ctx.getRequestType(); - if (contentType == null) { - throw new UnsupportedMediaType(null); - } - if (!ctx.getRoute().getConsumes().stream().anyMatch(contentType::matches)) { - throw new UnsupportedMediaType(contentType.getValue()); + if (!ctx.isPreflight()) { + MediaType contentType = ctx.getRequestType(); + if (contentType == null) { + throw new UnsupportedMediaType(null); + } + if (!ctx.getRoute().getConsumes().stream().anyMatch(contentType::matches)) { + throw new UnsupportedMediaType(contentType.getValue()); + } } }; diff --git a/tests/src/test/java/io/jooby/Issue2649.java b/tests/src/test/java/io/jooby/Issue2649.java new file mode 100644 index 0000000000..64f152c27c --- /dev/null +++ b/tests/src/test/java/io/jooby/Issue2649.java @@ -0,0 +1,38 @@ +package io.jooby; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class Issue2649 { + + @ServerTest + public void shouldDoPreflightWithout415(ServerTestRunner runner) { + runner.define(app -> { + app.decorator(new CorsHandler(new Cors())); + + app.post("/consumes", Context::getRequestPath) + .consumes(MediaType.json); + app.post("/produces", Context::getRequestPath) + .produces(MediaType.json); + + }).ready(client -> { + // OPTIONS (Pre-flight), checking GET Method => OK and Access Control Headers Present + client + .header("Access-Control-Request-Method", "POST") + .options("/consumes", rsp -> { + assertEquals("/consumes", rsp.body().string()); + assertEquals(200, rsp.code()); + }); + + client + .header("Access-Control-Request-Method", "POST") + .options("/produces", rsp -> { + assertEquals("/produces", rsp.body().string()); + assertEquals(200, rsp.code()); + }); + }); + } + +} From 0a4b38a69d47a586478248446537f631d7dbe4f4 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 29 Oct 2022 11:40:28 -0300 Subject: [PATCH 67/97] version: updates bom file --- modules/jooby-bom/pom.xml | 48 +++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index fdfba01ffd..a2772c4e09 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -16,12 +16,12 @@ - 2.16.1 + 2.16.2-SNAPSHOT 4.0.3 3.2.0 9.3 1.0.1 - 1.12.230 + 1.12.261 6.4.1 2.8.8 8.42 @@ -46,9 +46,9 @@ 31.1-jre 5.1.0 2.1.212 - 4.3.0 + 4.3.1 5.6.3.Final - 2.13.4 + 2.13.4.2 2.13.4 2.13.4 0.8.8 @@ -61,13 +61,13 @@ 3.32.0 9.4.48.v20220622 0.0.9 - 1.12.230 - 2.16.1 - 2.16.1 + 1.12.261 + 2.16.2-SNAPSHOT + 2.16.2-SNAPSHOT 0.11.5 3.0.2 - 5.8.2 - 2.7.0 + 5.9.1 + 2.7.2 1.6.21 1.6.2 6.1.8.RELEASE @@ -105,13 +105,13 @@ 1.6.8 v12.19.0 4.9.3 - 4.5.6 - 3.1.5 + 4.5.7 + 3.1.6 3.4.1 2.3.2 3.4.18 2.0.0-rc.20 - 5.1.0 + 5.2.0 1.3.0 2.2.21 1.7.36 @@ -1102,6 +1102,30 @@ ${plexus-utils.version} jar + + com.amazonaws + aws-java-sdk-iamrolesanywhere + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-redshiftserverless + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-connectcampaign + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-mainframemodernization + ${aws-java-sdk.version} + jar + com.amazonaws aws-java-sdk-emrserverless From ad803e81445f8137b0885638ea68dd6aa98fbda2 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 30 Oct 2022 13:31:30 -0300 Subject: [PATCH 68/97] dependencies: upgrade dependencies --- modules/jooby-bom/pom.xml | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index a2772c4e09..f2f62ae48b 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -77,7 +77,7 @@ 1.2.11 3.0.0 3.2.0 - 3.3.0 + 3.4.2 3.1.2 3.8.1 3.8.5 @@ -116,7 +116,7 @@ 2.2.21 1.7.36 5.3.20 - 3.1.1 + 3.1.3 2.0.33 2.2.0 3.0.12.RELEASE diff --git a/pom.xml b/pom.xml index 8e7c9e174d..78d32fc959 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 4.1 3.0.0 3.2.0 - 3.3.0 + 3.4.2 2.24 3.1.2 3.8.1 @@ -158,7 +158,7 @@ 2.3.1 1.6.8 3.4.1 - 3.1.1 + 3.1.3 2.8.1 3.0.0 3.1.2 From 0ad14855eebd2a630ef4ad5b2cb5d86a261e1689 Mon Sep 17 00:00:00 2001 From: Dmitry Barannik Date: Thu, 3 Nov 2022 01:27:05 +0200 Subject: [PATCH 69/97] Added jax-rs path-param --- .../src/main/java/io/jooby/apt/Annotations.java | 6 +++++- .../src/test/java/io/jooby/apt/JaxrsTest.java | 2 +- .../src/test/java/source/JaxrsController.java | 10 ++++++---- .../src/test/java/tests/HandlerCompilerTest.java | 3 +++ .../java/io/jooby/openapi/OpenAPIGeneratorTest.java | 11 +++++++++++ .../jooby-openapi/src/test/kotlin/kt/KtController.kt | 12 +++++++----- .../src/test/kotlin/kt/KtObjectController.kt | 12 +++++++----- 7 files changed, 40 insertions(+), 16 deletions(-) diff --git a/modules/jooby-apt/src/main/java/io/jooby/apt/Annotations.java b/modules/jooby-apt/src/main/java/io/jooby/apt/Annotations.java index 077d412f2d..675175eb92 100644 --- a/modules/jooby-apt/src/main/java/io/jooby/apt/Annotations.java +++ b/modules/jooby-apt/src/main/java/io/jooby/apt/Annotations.java @@ -69,6 +69,8 @@ public interface Annotations { String JAXRS_CONTEXT = "javax.ws.rs.core.Context"; /** JAXRS Query Param. */ String JAXRS_QUERY = "javax.ws.rs.QueryParam"; + /** JAXRS Path Param. */ + String JAXRS_PATH_PARAM = "javax.ws.rs.PathParam"; /** JAXRS Cookie Param. */ String JAXRS_COOKIE = "javax.ws.rs.CookieParam"; /** JAXRS Header Param. */ @@ -108,7 +110,9 @@ public interface Annotations { /** * Path parameters. */ - Set PATH_PARAMS = unmodifiableSet(new LinkedHashSet<>(asList(PathParam.class.getName()))); + Set PATH_PARAMS = unmodifiableSet(new LinkedHashSet<>(asList( + PathParam.class.getName(), JAXRS_PATH_PARAM + ))); /** Context params. */ Set CONTEXT_PARAMS = unmodifiableSet( diff --git a/modules/jooby-apt/src/test/java/io/jooby/apt/JaxrsTest.java b/modules/jooby-apt/src/test/java/io/jooby/apt/JaxrsTest.java index 82c78b08c7..e35b364d05 100644 --- a/modules/jooby-apt/src/test/java/io/jooby/apt/JaxrsTest.java +++ b/modules/jooby-apt/src/test/java/io/jooby/apt/JaxrsTest.java @@ -20,7 +20,7 @@ public void shouldValidateJaxRSNames() { .map(SneakyThrows.throwingFunction(it -> it.get(null).toString())) .collect(Collectors.toList()); - assertEquals(15, annotations.size()); + assertEquals(16, annotations.size()); annotations.forEach(SneakyThrows.throwingConsumer(annotation -> loader.loadClass(annotation))); } } diff --git a/modules/jooby-apt/src/test/java/source/JaxrsController.java b/modules/jooby-apt/src/test/java/source/JaxrsController.java index 2f8f877a40..1ee8dc6a15 100644 --- a/modules/jooby-apt/src/test/java/source/JaxrsController.java +++ b/modules/jooby-apt/src/test/java/source/JaxrsController.java @@ -2,10 +2,7 @@ import io.jooby.Context; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import javax.ws.rs.*; @Path("/jaxrs") public class JaxrsController { @@ -24,4 +21,9 @@ public String doPost(Context ctx) { public String doGet(@QueryParam("q1") String queryParam) { return queryParam; } + + @PUT @Path("/put/{id}") + public String doPut(@PathParam("id") String id) { + return id; + } } diff --git a/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java b/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java index 0c316e506e..9aa3e9a69e 100644 --- a/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java +++ b/modules/jooby-apt/src/test/java/tests/HandlerCompilerTest.java @@ -467,6 +467,9 @@ public void jarxs() throws Exception { assertEquals("doPost", router.post("/jaxrs/post", MockContextHelper.mockContext()).value()); + + assertEquals("1431", + router.put("/jaxrs/put/1431", MockContextHelper.mockContext()).value()); }) ; } diff --git a/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIGeneratorTest.java b/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIGeneratorTest.java index c726e4e61f..a904f539c8 100644 --- a/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIGeneratorTest.java +++ b/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIGeneratorTest.java @@ -1236,6 +1236,17 @@ private void assertKtController(RouteIterator iterator) { assertEquals("GET /", route.toString()); assertEquals(String.class.getName(), route.getDefaultResponse().toString()); }) + .next((route, args) -> { + assertEquals("PUT /entity/{id}", route.toString()); + assertEquals(String.class.getName(), route.getDefaultResponse().toString()); + args + .next(arg -> { + assertEquals("id", arg.getName()); + assertEquals("java.lang.String", arg.getJavaType()); + assertEquals("path", arg.getIn()); + assertTrue(arg.getRequired()); + }); + }) .next(route -> { assertEquals("DELETE /unit", route.toString()); assertEquals(void.class.getName(), route.getDefaultResponse().toString()); diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtController.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtController.kt index c74a598f9d..253238bed9 100644 --- a/modules/jooby-openapi/src/test/kotlin/kt/KtController.kt +++ b/modules/jooby-openapi/src/test/kotlin/kt/KtController.kt @@ -4,11 +4,7 @@ import examples.ABean import kotlinx.coroutines.delay import java.util.concurrent.CompletableFuture import javax.inject.Named -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.HeaderParam -import javax.ws.rs.Path -import javax.ws.rs.QueryParam +import javax.ws.rs.* class KtController { @@ -17,6 +13,12 @@ class KtController { return "" } + @PUT + @Path("/entity/{id}") + fun replaceEntity(@PathParam("id") id: String): String { + return id + } + @DELETE @Path("/unit") fun doUnit() { diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt index 8fd23ed476..001ea867e2 100644 --- a/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt +++ b/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt @@ -4,11 +4,7 @@ import examples.ABean import kotlinx.coroutines.delay import java.util.concurrent.CompletableFuture import javax.inject.Named -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.HeaderParam -import javax.ws.rs.Path -import javax.ws.rs.QueryParam +import javax.ws.rs.* object KtObjectController { @@ -17,6 +13,12 @@ object KtObjectController { return "" } + @PUT + @Path("/entity/{id}") + fun replaceEntity(@PathParam("id") id: String): String { + return id + } + @DELETE @Path("/unit") fun doUnit() { From a5558d58a889f89ba0f847cd1e3c6a5d25065f4e Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 26 Nov 2022 20:54:26 -0300 Subject: [PATCH 70/97] version bump - netty upgrade - jackson upgrade --- pom.xml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 78d32fc959..c8e7e5250a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,9 +22,9 @@ 2.3.31 4.3.1 3.1.6 - 2.13.4 + 2.14.1 ${jackson.version} - 2.13.4.2 + ${jackson.version} 2.9.1 1.0.2 1.0.9 @@ -74,7 +74,7 @@ 2.2.19.Final 9.4.48.v20220622 - 4.1.80.Final + 4.1.85.Final 2.2.21 @@ -100,8 +100,7 @@ 2.3.2 9.1.6 6.4.1 - 1.12.261 - ${aws-java-sdk.version} + 1.12.349 1.12.1 1.9.3 @@ -226,6 +225,21 @@ + + io.netty + netty-bom + ${netty.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + io.jooby @@ -994,15 +1008,6 @@ ${jasypt.version} - - - com.amazonaws - aws-java-sdk-bom - ${aws-java-sdk.version} - pom - import - - org.jetbrains.kotlin From e1e122d616c66ab8b9f07be041779a2389ef3e13 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 26 Nov 2022 21:21:07 -0300 Subject: [PATCH 71/97] Reproducible byte for byte jars fix #2670 --- modules/jooby-cli/pom.xml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 97d72f55a9..61e2e43128 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -75,7 +75,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + 1.1.0 generate-resources diff --git a/pom.xml b/pom.xml index c8e7e5250a..3ef9d5a554 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,7 @@ 1.8 yyyy-MM-dd HH:mm:ssa UTF-8 + 10 ${maven.build.timestamp} From 30cd4e5457155bd19aac43fcd7699e56b47aeb1b Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sun, 27 Nov 2022 11:11:23 -0300 Subject: [PATCH 72/97] version bump: upgrade h2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ef9d5a554..07c56dbdf8 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 4.0.3 8.0.30 1.2 - 2.1.212 + 2.1.214 5.6.3.Final 12.16.0 3.32.0 From 7088fd32ebe45ebbc4ea0ca522222cfe6d101e32 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 7 Dec 2022 11:34:33 -0300 Subject: [PATCH 73/97] build+deps: get back build upgrade servers dependencies --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 07c56dbdf8..52ccda4b21 100644 --- a/pom.xml +++ b/pom.xml @@ -72,8 +72,8 @@ 9.3 - 2.2.19.Final - 9.4.48.v20220622 + 2.2.21.Final + 9.4.49.v20220914 4.1.85.Final @@ -173,7 +173,6 @@ 1.8 yyyy-MM-dd HH:mm:ssa UTF-8 - 10 ${maven.build.timestamp} From a7537a74d17b19d243eb56651f1c89600bfe27da Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Mon, 26 Dec 2022 13:59:47 -0300 Subject: [PATCH 74/97] AccessLogger logs miss protocol and content length when using Kotlin Coroutines fix #2710 --- .../io/jooby/internal/jetty/JettyContext.java | 6 +-- tests/src/test/kotlin/i2710/Issue2710.kt | 38 +++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 tests/src/test/kotlin/i2710/Issue2710.kt diff --git a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java index b7aa77f887..37c5cef6b1 100644 --- a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java +++ b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java @@ -616,12 +616,12 @@ void responseDone() { clearFiles(); } finally { - if (request.isAsyncStarted()) { - request.getAsyncContext().complete(); - } if (listeners != null) { listeners.run(this); } + if (request.isAsyncStarted()) { + request.getAsyncContext().complete(); + } } } diff --git a/tests/src/test/kotlin/i2710/Issue2710.kt b/tests/src/test/kotlin/i2710/Issue2710.kt new file mode 100644 index 0000000000..2a2eb16f77 --- /dev/null +++ b/tests/src/test/kotlin/i2710/Issue2710.kt @@ -0,0 +1,38 @@ +/* + * Jooby https://jooby.io + * Apache License Version 2.0 https://jooby.io/LICENSE.txt + * Copyright 2014 Edgar Espina + */ +package i2710 + +import io.jooby.AccessLogHandler +import io.jooby.Kooby +import io.jooby.junit.ServerTest +import io.jooby.junit.ServerTestRunner +import java.util.concurrent.CountDownLatch +import org.junit.jupiter.api.Assertions + +class Issue2710 { + @ServerTest + fun shouldLogLine(runner: ServerTestRunner) { + val latch = CountDownLatch(1) + runner + .use { + Kooby { -> + decorator( + AccessLogHandler().log { line -> + Assertions.assertTrue(line.contains("\"GET /2710 HTTP/1.1\" 200 2")) + log.info(line) + latch.countDown() + } + ) + + coroutine { get("/2710") { "OK" } } + } + } + .ready { client -> + client.get("/2710") { rsp -> Assertions.assertEquals("OK", rsp.body!!.string()) } + } + latch.await() + } +} From 36cde519d761d581122de87dbb3c9bbc515818fc Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 1 Mar 2023 08:36:19 -0300 Subject: [PATCH 75/97] version bump: upgrade major dependencies --- pom.xml | 14 +++++++------- tests/src/test/java/io/jooby/FeaturedTest.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 52ccda4b21..4b4a7e4b0e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.3.31 4.3.1 3.1.6 - 2.14.1 + 2.14.2 ${jackson.version} ${jackson.version} 2.9.1 @@ -36,7 +36,7 @@ 8.0.30 1.2 2.1.214 - 5.6.3.Final + 5.6.15.Final 12.16.0 3.32.0 7.5.1 @@ -72,9 +72,9 @@ 9.3 - 2.2.21.Final - 9.4.49.v20220914 - 4.1.85.Final + 2.3.4.Final + 9.4.51.v20230217 + 4.1.89.Final 2.2.21 @@ -108,8 +108,8 @@ 1.1.6.RELEASE - 1.6.21 - 1.6.2 + 1.8.10 + 1.6.4 true diff --git a/tests/src/test/java/io/jooby/FeaturedTest.java b/tests/src/test/java/io/jooby/FeaturedTest.java index 08e28d218a..63e52ec2e6 100644 --- a/tests/src/test/java/io/jooby/FeaturedTest.java +++ b/tests/src/test/java/io/jooby/FeaturedTest.java @@ -1797,7 +1797,7 @@ public void cookies(ServerTestRunner runner) { client.get("/cookies", response -> { assertEquals("{foo=bar, x=y}", response.body().string()); }); - client.header("Cookie", "$Version=1; X=x; $Path=/set;"); + client.header("Cookie", "X=x"); client.get("/cookies", response -> { assertEquals("{X=x}", response.body().string()); }); From 7d85f96a89131d07c415ac0c2b0c7c35031d0a5b Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Thu, 2 Mar 2023 16:51:32 +0000 Subject: [PATCH 76/97] encoder: should consider all produce types before default TO_STRING fixes #2804 Fixes regression introduced by 9640984a949890948f15c472e47df3086005b890 to fix issue #2613 internal.HttpMessageEncoder should consider the Route produces for determining MediaType --- .../io/jooby/internal/HttpMessageEncoder.java | 19 +++++- .../test/java/io/jooby/i2804/Issue2804.java | 63 +++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 tests/src/test/java/io/jooby/i2804/Issue2804.java diff --git a/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java b/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java index e73819b404..6dbce011d6 100644 --- a/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java +++ b/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java @@ -12,9 +12,13 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import javax.annotation.Nonnull; @@ -104,9 +108,18 @@ public HttpMessageEncoder add(MediaType type, MessageEncoder encoder) { if (produces.isEmpty()) { produces = new ArrayList<>(encoders.keySet()); } - MediaType type = ctx.accept(produces); - MessageEncoder encoder = encoders.getOrDefault(type, MessageEncoder.TO_STRING); - return encoder.encode(ctx, value); + + List producesSubList = new ArrayList<>(produces); + while (!producesSubList.isEmpty()){ + final MediaType type = ctx.accept(producesSubList); + MessageEncoder encoder = encoders.get(type); + if (encoder != null){ + return encoder.encode(ctx, value); + } + producesSubList = producesSubList.subList(1, producesSubList.size()); + } + + return MessageEncoder.TO_STRING.encode(ctx, value); } else { return MessageEncoder.TO_STRING.encode(ctx, value); } diff --git a/tests/src/test/java/io/jooby/i2804/Issue2804.java b/tests/src/test/java/io/jooby/i2804/Issue2804.java new file mode 100644 index 0000000000..e47b613f6e --- /dev/null +++ b/tests/src/test/java/io/jooby/i2804/Issue2804.java @@ -0,0 +1,63 @@ +package io.jooby.i2804; + +import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import io.jooby.MediaType; +import io.jooby.StatusCode; +import io.jooby.json.JacksonModule; +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class Issue2804 { + + public static class Error { + public String message; + } + + public static class Errors { + public List errors = new ArrayList<>(); + } + + @ServerTest + public void shouldConsiderRouteProduces(ServerTestRunner runner) { + runner.define(app -> { + + app.install(new JacksonModule()); + app.get("/pdf", ctx -> { + + if (ctx.header("Authorization").isMissing()){ + ctx.setResponseCode(StatusCode.UNAUTHORIZED).setResponseType(MediaType.json); + final Errors errors = new Errors(); + final Error error = new Error(); + error.message = "No Authorization provided"; + errors.errors.add(error); + return errors; + } + + ctx.setResponseCode(StatusCode.OK).setResponseType(MediaType.byFileExtension("pdf")); + byte[] dummyData = new byte[1024]; + Arrays.fill(dummyData, (byte) 0x0a); + return new ByteArrayInputStream(dummyData); + + }).produces(MediaType.byFileExtension("pdf"), MediaType.json); + + }).ready(http -> { + http.get("/pdf", rsp -> { + assertEquals(StatusCode.UNAUTHORIZED_CODE, rsp.code()); + assertEquals(MediaType.json.toContentTypeHeader(StandardCharsets.UTF_8).toLowerCase(), rsp.header("Content-Type").toLowerCase()); + assertEquals("{\"errors\":[{\"message\":\"No Authorization provided\"}]}", rsp.body().string()); + }); + http.get("/pdf").prepare(req -> req.addHeader("Authorization", "foo")).execute(rsp -> { + assertEquals(StatusCode.OK_CODE, rsp.code()); + assertEquals(MediaType.byFileExtension("pdf").getValue(), rsp.header("Content-Type")); + assertEquals(1024, rsp.body().bytes().length); + }); + }); + } +} From 25c4fdb8a01caf63e7faf55982ae8d712a04e098 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Fri, 3 Mar 2023 21:23:06 -0300 Subject: [PATCH 77/97] revert: Regression with encoder: should consider route produce types fix #2804 --- .../io/jooby/internal/HttpMessageEncoder.java | 18 +++--------------- pom.xml | 2 +- .../test/java/io/jooby/i2804/Issue2804.java | 10 +++++++++- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java b/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java index 6dbce011d6..5effc2040a 100644 --- a/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java +++ b/jooby/src/main/java/io/jooby/internal/HttpMessageEncoder.java @@ -12,13 +12,9 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import javax.annotation.Nonnull; @@ -109,17 +105,9 @@ public HttpMessageEncoder add(MediaType type, MessageEncoder encoder) { produces = new ArrayList<>(encoders.keySet()); } - List producesSubList = new ArrayList<>(produces); - while (!producesSubList.isEmpty()){ - final MediaType type = ctx.accept(producesSubList); - MessageEncoder encoder = encoders.get(type); - if (encoder != null){ - return encoder.encode(ctx, value); - } - producesSubList = producesSubList.subList(1, producesSubList.size()); - } - - return MessageEncoder.TO_STRING.encode(ctx, value); + MediaType type = ctx.accept(produces); + MessageEncoder encoder = encoders.getOrDefault(type, MessageEncoder.TO_STRING); + return encoder.encode(ctx, value); } else { return MessageEncoder.TO_STRING.encode(ctx, value); } diff --git a/pom.xml b/pom.xml index 4b4a7e4b0e..83a4d4ca5d 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 9.3 - 2.3.4.Final + 2.2.23.Final 9.4.51.v20230217 4.1.89.Final diff --git a/tests/src/test/java/io/jooby/i2804/Issue2804.java b/tests/src/test/java/io/jooby/i2804/Issue2804.java index e47b613f6e..efbc483b5f 100644 --- a/tests/src/test/java/io/jooby/i2804/Issue2804.java +++ b/tests/src/test/java/io/jooby/i2804/Issue2804.java @@ -18,10 +18,18 @@ public class Issue2804 { public static class Error { public String message; + + @Override public String toString() { + return message; + } } public static class Errors { public List errors = new ArrayList<>(); + + @Override public String toString() { + return errors.toString(); + } } @ServerTest @@ -45,7 +53,7 @@ public void shouldConsiderRouteProduces(ServerTestRunner runner) { Arrays.fill(dummyData, (byte) 0x0a); return new ByteArrayInputStream(dummyData); - }).produces(MediaType.byFileExtension("pdf"), MediaType.json); + }).produces(MediaType.json, MediaType.byFileExtension("pdf")); }).ready(http -> { http.get("/pdf", rsp -> { From 81dcd674d86258db556726102818a1f4ef3e6062 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 4 Mar 2023 09:17:43 -0300 Subject: [PATCH 78/97] build: rename test with wrong name --- .../{i2858/Issue2858.java => i2585/Issue2585.java} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename tests/src/test/java/io/jooby/{i2858/Issue2858.java => i2585/Issue2585.java} (84%) diff --git a/tests/src/test/java/io/jooby/i2858/Issue2858.java b/tests/src/test/java/io/jooby/i2585/Issue2585.java similarity index 84% rename from tests/src/test/java/io/jooby/i2858/Issue2858.java rename to tests/src/test/java/io/jooby/i2585/Issue2585.java index 0dff8ccfe5..a4fa84dcfd 100644 --- a/tests/src/test/java/io/jooby/i2858/Issue2858.java +++ b/tests/src/test/java/io/jooby/i2585/Issue2585.java @@ -1,4 +1,4 @@ -package io.jooby.i2858; +package io.jooby.i2585; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,14 +8,14 @@ import io.jooby.junit.ServerTest; import io.jooby.junit.ServerTestRunner; -public class Issue2858 { +public class Issue2585 { - public static class App2858 extends Jooby { + public static class App2585 extends Jooby { public static volatile boolean error = false; { - ws("/2858", (ctx, initializer) -> { + ws("/2585", (ctx, initializer) -> { initializer.onConnect(ws -> { try { ws.send(new JSONObject().put("connected", true).toString()); @@ -42,10 +42,10 @@ public static class App2858 extends Jooby { @ServerTest public void shouldBeAbleToSendMessageOnConnect(ServerTestRunner runner) { - App2858 app = new App2858(); + App2585 app = new App2585(); runner.use(() -> app) .ready(client -> { - client.syncWebSocket("/2858", ws -> { + client.syncWebSocket("/2585", ws -> { assertEquals("{\"connected\":true}", ws.lastMessage()); assertEquals("{\"error\":false}", ws.send("error")); }); From 716182010508010dde337da5f133700751b32348 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 4 Mar 2023 09:19:09 -0300 Subject: [PATCH 79/97] build: remove System.out calls --- tests/src/test/java/io/jooby/i2572/Issue2572.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/src/test/java/io/jooby/i2572/Issue2572.java b/tests/src/test/java/io/jooby/i2572/Issue2572.java index bc8be7c0af..db54741e45 100644 --- a/tests/src/test/java/io/jooby/i2572/Issue2572.java +++ b/tests/src/test/java/io/jooby/i2572/Issue2572.java @@ -39,14 +39,11 @@ public void onCompleteShouldRunOnCallerThread(ServerTestRunner runner) { app.get("/2572/init", ctx -> "Initialized"); }).ready(http -> { http.get("/2572/init", rsp -> { - System.out.println(Thread.currentThread()); assertEquals("Initialized", rsp.body().string()); }); http.get("/2572/state", rsp -> { - System.out.println(Thread.currentThread()); JSONObject json = new JSONObject(rsp.body().string()); - System.out.println(json.get("caller") + " = " + json.get("onComplete")); assertEquals(json.get("caller"), json.get("onComplete")); }); }); From 7a53ee11a1590c13831ea98a2645c16248cf13a9 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 4 Mar 2023 13:43:34 -0300 Subject: [PATCH 80/97] 2.15][Netty] Cannot access encoder in case of "413 Content Too Large" fix #2806 --- jooby/src/main/java/io/jooby/Route.java | 7 +++ jooby/src/main/java/io/jooby/Router.java | 6 ++- .../java/io/jooby/internal/RouterMatch.java | 6 ++- .../io/jooby/internal/StaticRouterMatch.java | 6 ++- .../io/jooby/internal/netty/NettyHandler.java | 21 +++----- .../jooby/internal/netty/NettyPipeline.java | 3 +- .../jooby/internal/utow/UtowBodyHandler.java | 5 +- .../io/jooby/internal/utow/UtowHandler.java | 12 +++-- .../test/java/io/jooby/i2806/Issue2806.java | 48 +++++++++++++++++++ 9 files changed, 86 insertions(+), 28 deletions(-) create mode 100644 tests/src/test/java/io/jooby/i2806/Issue2806.java diff --git a/jooby/src/main/java/io/jooby/Route.java b/jooby/src/main/java/io/jooby/Route.java index 5d69a25c8e..bb88b549a7 100644 --- a/jooby/src/main/java/io/jooby/Route.java +++ b/jooby/src/main/java/io/jooby/Route.java @@ -9,6 +9,7 @@ import io.jooby.exception.MethodNotAllowedException; import io.jooby.exception.NotAcceptableException; import io.jooby.exception.NotFoundException; +import io.jooby.exception.StatusCodeException; import io.jooby.exception.UnsupportedMediaType; import javax.annotation.Nonnull; @@ -309,6 +310,12 @@ public interface Handler extends Serializable, Aware { public static final Handler NOT_FOUND = ctx -> ctx .sendError(new NotFoundException(ctx.getRequestPath())); + /** + * Handler for {@link StatusCode#REQUEST_ENTITY_TOO_LARGE} responses. + */ + public static final Handler REQUEST_ENTITY_TOO_LARGE = ctx -> ctx + .sendError(new StatusCodeException(StatusCode.REQUEST_ENTITY_TOO_LARGE)); + /** * Handler for {@link StatusCode#METHOD_NOT_ALLOWED} responses. */ diff --git a/jooby/src/main/java/io/jooby/Router.java b/jooby/src/main/java/io/jooby/Router.java index e117ddcdff..7dafd05dae 100644 --- a/jooby/src/main/java/io/jooby/Router.java +++ b/jooby/src/main/java/io/jooby/Router.java @@ -62,7 +62,11 @@ interface Match { */ @Nonnull Route route(); - void execute(@Nonnull Context context); + void execute(@Nonnull Context context, @Nonnull Route.Handler pipeline); + + default void execute(@Nonnull Context context) { + execute(context, route().getPipeline()); + } /** * Path pattern variables. diff --git a/jooby/src/main/java/io/jooby/internal/RouterMatch.java b/jooby/src/main/java/io/jooby/internal/RouterMatch.java index 09f9b7bfe3..233f254d2a 100644 --- a/jooby/src/main/java/io/jooby/internal/RouterMatch.java +++ b/jooby/src/main/java/io/jooby/internal/RouterMatch.java @@ -17,6 +17,8 @@ import java.util.Set; import java.util.stream.Collectors; +import org.jetbrains.annotations.NotNull; + public class RouterMatch implements Router.Match { boolean matches; @@ -80,11 +82,11 @@ public RouterMatch found(Route route) { return this; } - public void execute(Context context) { + @Override public void execute(@NotNull Context context, @NotNull Route.Handler pipeline) { context.setPathMap(vars); context.setRoute(route); try { - route.getPipeline().apply(context); + pipeline.apply(context); } catch (Throwable x) { context.sendError(x); } finally { diff --git a/jooby/src/main/java/io/jooby/internal/StaticRouterMatch.java b/jooby/src/main/java/io/jooby/internal/StaticRouterMatch.java index a4e518c1ca..15bfe9e1dd 100644 --- a/jooby/src/main/java/io/jooby/internal/StaticRouterMatch.java +++ b/jooby/src/main/java/io/jooby/internal/StaticRouterMatch.java @@ -13,6 +13,8 @@ import java.util.Collections; import java.util.Map; +import org.jetbrains.annotations.NotNull; + public class StaticRouterMatch implements Router.Match { private final Route route; @@ -28,10 +30,10 @@ public StaticRouterMatch(Route route) { return route; } - @Override public void execute(@Nonnull Context context) { + @Override public void execute(@NotNull Context context, @NotNull Route.Handler pipeline) { context.setRoute(route); try { - route.getPipeline().apply(context); + pipeline.apply(context); } catch (Throwable x) { context.sendError(x); } diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyHandler.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyHandler.java index dfff218f8c..e49e31780a 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyHandler.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyHandler.java @@ -5,8 +5,6 @@ */ package io.jooby.internal.netty; -import static io.netty.handler.codec.http.HttpResponseStatus.CONTINUE; - import java.nio.charset.StandardCharsets; import java.time.ZoneOffset; import java.time.ZonedDateTime; @@ -18,22 +16,18 @@ import org.slf4j.Logger; import io.jooby.MediaType; +import io.jooby.Route; import io.jooby.Router; import io.jooby.Server; import io.jooby.StatusCode; import io.jooby.WebSocketCloseStatus; -import io.jooby.exception.StatusCodeException; -import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.handler.codec.http.DefaultFullHttpResponse; -import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpHeaderValues; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpUtil; -import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.LastHttpContent; import io.netty.handler.codec.http.multipart.HttpDataFactory; import io.netty.handler.codec.http.multipart.HttpPostMultipartRequestDecoder; @@ -58,7 +52,6 @@ public class NettyHandler extends ChannelInboundHandlerAdapter { private final Router router; private final int bufferSize; private final boolean defaultHeaders; - private final boolean is100ContinueExpected; private NettyContext context; private final HttpDataFactory factory; @@ -69,15 +62,13 @@ public class NettyHandler extends ChannelInboundHandlerAdapter { private long chunkSize; public NettyHandler(ScheduledExecutorService scheduler, Router router, long maxRequestSize, - int bufferSize, HttpDataFactory factory, boolean defaultHeaders, - boolean is100ContinueExpected) { + int bufferSize, HttpDataFactory factory, boolean defaultHeaders) { this.scheduler = scheduler; this.router = router; this.maxRequestSize = maxRequestSize; this.factory = factory; this.bufferSize = bufferSize; this.defaultHeaders = defaultHeaders; - this.is100ContinueExpected = is100ContinueExpected; } @Override @@ -111,7 +102,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) { chunkSize += chunk.content().readableBytes(); if (chunkSize > maxRequestSize) { resetDecoderState(true); - context.sendError(new StatusCodeException(StatusCode.REQUEST_ENTITY_TOO_LARGE)); + router.match(context).execute(context, Route.REQUEST_ENTITY_TOO_LARGE); return; } @@ -124,9 +115,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) { if (chunk instanceof LastHttpContent) { context.decoder = decoder; - Router.Match result = router.match(context); - resetDecoderState(!result.matches()); - result.execute(context); + Router.Match route = router.match(context); + resetDecoderState(!route.matches()); + route.execute(context); } } else if (msg instanceof WebSocketFrame) { if (context.webSocket != null) { diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyPipeline.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyPipeline.java index bb449ac109..5d771944b4 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyPipeline.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyPipeline.java @@ -120,7 +120,6 @@ HttpServerCodec createServerCodec() { } private NettyHandler createHandler() { - return new NettyHandler(service, router, maxRequestSize, bufferSize, factory, defaultHeaders, - is100ContinueExpected); + return new NettyHandler(service, router, maxRequestSize, bufferSize, factory, defaultHeaders); } } diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowBodyHandler.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowBodyHandler.java index bf7d08fab0..625b174ed4 100644 --- a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowBodyHandler.java +++ b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowBodyHandler.java @@ -6,9 +6,8 @@ package io.jooby.internal.utow; import io.jooby.Body; -import io.jooby.exception.StatusCodeException; +import io.jooby.Route; import io.jooby.Router; -import io.jooby.StatusCode; import io.undertow.io.Receiver; import io.undertow.server.ExchangeCompletionListener; import io.undertow.server.HttpServerExchange; @@ -67,7 +66,7 @@ public UtowBodyHandler(Router.Match route, UtowContext context, int bufferSize, chunkSize += chunk.length; if (chunkSize > maxRequestSize) { try { - context.sendError(new StatusCodeException(StatusCode.REQUEST_ENTITY_TOO_LARGE)); + route.execute(context, Route.REQUEST_ENTITY_TOO_LARGE); } finally { closeChannel(); channel = null; diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowHandler.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowHandler.java index d5f54b1673..9e02f7e863 100644 --- a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowHandler.java +++ b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowHandler.java @@ -6,9 +6,9 @@ package io.jooby.internal.utow; import io.jooby.Context; +import io.jooby.Route; import io.jooby.Router; import io.jooby.StatusCode; -import io.jooby.exception.StatusCodeException; import io.undertow.io.Receiver; import io.undertow.server.HttpHandler; import io.undertow.server.HttpServerExchange; @@ -53,7 +53,13 @@ public UtowHandler(Router router, int bufferSize, long maxRequestSize, boolean d String chunked = headers.getFirst(Headers.TRANSFER_ENCODING); if (len > 0 || chunked != null) { if (len > maxRequestSize) { - context.sendError(new StatusCodeException(StatusCode.REQUEST_ENTITY_TOO_LARGE)); + Router.Match route = router.match(context); + if (route.matches()) { + route.execute(context, Route.REQUEST_ENTITY_TOO_LARGE); + } else { + // 404 + route.execute(context); + } return; } @@ -67,8 +73,8 @@ public UtowHandler(Router router, int bufferSize, long maxRequestSize, boolean d .createParser(exchange); if (parser == null) { // Read raw body - Router.Match route = router.match(context); Receiver receiver = exchange.getRequestReceiver(); + Router.Match route = router.match(context); UtowBodyHandler reader = new UtowBodyHandler(route, context, bufferSize, maxRequestSize); if (len > 0 && len <= bufferSize) { receiver.receiveFullBytes(reader); diff --git a/tests/src/test/java/io/jooby/i2806/Issue2806.java b/tests/src/test/java/io/jooby/i2806/Issue2806.java new file mode 100644 index 0000000000..1407505825 --- /dev/null +++ b/tests/src/test/java/io/jooby/i2806/Issue2806.java @@ -0,0 +1,48 @@ +package io.jooby.i2806; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Arrays; +import java.util.Map; + +import com.google.common.collect.ImmutableMap; +import io.jooby.ServerOptions; +import io.jooby.json.JacksonModule; +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; +import okhttp3.MediaType; +import okhttp3.RequestBody; + +public class Issue2806 { + + @ServerTest + public void renderShouldWorkFromErrorHandlerWhenLargeRequestAreSent(ServerTestRunner runner) { + char[] chars = new char[19 * 1024]; + Arrays.fill(chars, 'S'); + String _19kb = new String(chars); + runner.define(app -> { + app.setServerOptions(new ServerOptions() + .setBufferSize(ServerOptions._16KB / 2) + .setMaxRequestSize(ServerOptions._16KB)); + + app.install(new JacksonModule()); + + app.error((ctx, cause, code) -> { + Map map = ImmutableMap.of("router", ctx.getRouter() != null, + "route", ctx.getRoute() != null); + ctx.render(map); + }); + + app.post("/2806", ctx -> ctx.body().value("")); + + app.get("/2806", ctx -> ctx.body().value("")); + }).ready(client -> { + // Exceeds + client.post("/2806", RequestBody.create(_19kb, MediaType.get("text/plain")), rsp -> { + assertEquals(413, rsp.code()); + assertEquals("{\"router\":true,\"route\":true}", rsp.body().string()); + }); + }); + } + +} From fc8d753a65af3b014ff6148648278173642cc428 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 28 Feb 2023 14:52:37 -0300 Subject: [PATCH 81/97] Support for binary messages in WebSocket API fix #2497 --- .../jooby/internal/jetty/JettyWebSocket.java | 12 +- .../io/jooby/internal/utow/UtowWebSocket.java | 37 ++++- tests/src/test/java/io/jooby/WebClient.java | 9 +- .../java/io/jooby/test/WebSocketTest.java | 150 ++++++++++++++++++ 4 files changed, 202 insertions(+), 6 deletions(-) create mode 100644 tests/src/test/java/io/jooby/test/WebSocketTest.java diff --git a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyWebSocket.java b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyWebSocket.java index b34c064674..bcb953e4b1 100644 --- a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyWebSocket.java +++ b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyWebSocket.java @@ -5,6 +5,7 @@ */ package io.jooby.internal.jetty; +import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; @@ -55,7 +56,16 @@ public JettyWebSocket(JettyContext ctx) { this.key = ctx.getRoute().getPattern(); } - @Override public void onWebSocketBinary(byte[] payload, int offset, int len) { + @Override + public void onWebSocketBinary(byte[] payload, int offset, int len) { + if (onMessageCallback != null) { + try { + ByteBuffer buffer = ByteBuffer.wrap(payload, offset, len); + onMessageCallback.onMessage(this, WebSocketMessage.create(getContext(), buffer.array())); + } catch (Throwable x) { + onWebSocketError(x); + } + } } @Override public void onWebSocketText(String message) { diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java index 666e035790..08d682a82f 100644 --- a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java +++ b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java @@ -24,6 +24,7 @@ import javax.annotation.Nonnull; import org.xnio.IoUtils; +import org.xnio.Pooled; import com.typesafe.config.Config; import io.jooby.Context; @@ -34,6 +35,7 @@ import io.jooby.WebSocketConfigurer; import io.jooby.WebSocketMessage; import io.undertow.websockets.core.AbstractReceiveListener; +import io.undertow.websockets.core.BufferedBinaryMessage; import io.undertow.websockets.core.BufferedTextMessage; import io.undertow.websockets.core.CloseMessage; import io.undertow.websockets.core.WebSocketCallback; @@ -184,8 +186,39 @@ void fireConnect() { } } - @Override protected void onFullTextMessage(WebSocketChannel channel, - BufferedTextMessage message) throws IOException { + @Override + protected void onFullBinaryMessage(WebSocketChannel channel, BufferedBinaryMessage message) + throws IOException { + waitForConnect(); + + if (onMessageCallback != null) { + Pooled data = message.getData(); + try { + ByteBuffer buffer = WebSockets.mergeBuffers(data.getResource()); + dispatch( + webSocketTask( + () -> + onMessageCallback.onMessage( + this, WebSocketMessage.create(getContext(), toArray(buffer))), + false)); + } finally { + data.free(); + } + } + } + + private byte[] toArray(ByteBuffer buffer) { + if (buffer.hasArray()) { + return buffer.array(); + } + byte[] bytes = new byte[buffer.remaining()]; + buffer.get(bytes); + return bytes; + } + + @Override + protected void onFullTextMessage(WebSocketChannel channel, BufferedTextMessage message) + throws IOException { waitForConnect(); if (onMessageCallback != null) { diff --git a/tests/src/test/java/io/jooby/WebClient.java b/tests/src/test/java/io/jooby/WebClient.java index 5d51789bd1..0f93a106a2 100644 --- a/tests/src/test/java/io/jooby/WebClient.java +++ b/tests/src/test/java/io/jooby/WebClient.java @@ -22,9 +22,7 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; @@ -32,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; import java.util.function.Consumer; - +import okio.ByteString; public class WebClient implements AutoCloseable { private class SyncWebSocketListener extends WebSocketListener { @@ -103,6 +101,11 @@ public String send(String message) { return lastMessage(); } + public String sendBytes(byte[] message) { + ws.send(ByteString.of(message)); + return lastMessage(); + } + public String lastMessage() { return listener.lastMessage(); } diff --git a/tests/src/test/java/io/jooby/test/WebSocketTest.java b/tests/src/test/java/io/jooby/test/WebSocketTest.java new file mode 100644 index 0000000000..610419d99a --- /dev/null +++ b/tests/src/test/java/io/jooby/test/WebSocketTest.java @@ -0,0 +1,150 @@ +/* + * Jooby https://jooby.io + * Apache License Version 2.0 https://jooby.io/LICENSE.txt + * Copyright 2014 Edgar Espina + */ +package io.jooby.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.nio.charset.StandardCharsets; + +import com.fasterxml.jackson.databind.JsonNode; +import io.jooby.json.JacksonModule; +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class WebSocketTest { + @ServerTest + public void webSocket(ServerTestRunner runner) { + runner + .define( + app -> { + app.ws( + "/ws/{key}", + (ctx, initializer) -> { + StringBuilder buff = new StringBuilder(ctx.path("key").value()); + + initializer.onConnect( + ws -> { + buff.append("/connected"); + }); + + initializer.onMessage( + (ws, message) -> { + ws.send(buff + "/" + message.value()); + }); + }); + }) + .ready( + client -> { + client.syncWebSocket( + "/ws/abc", + ws -> { + assertEquals("abc/connected/ws", ws.send("ws")); + }); + }); + } + + @ServerTest + public void webSocketByteMessage(ServerTestRunner runner) { + runner + .define( + app -> { + app.ws( + "/ws/{key}", + (ctx, initializer) -> { + initializer.onMessage( + (ws, message) -> { + ws.send(">" + message.value()); + }); + }); + }) + .ready( + client -> { + client.syncWebSocket( + "/ws/abc", + ws -> { + assertEquals( + ">bytes[]", ws.sendBytes("bytes[]".getBytes(StandardCharsets.UTF_8))); + }); + }); + } + + @ServerTest + public void webSocketWithHttpSession(ServerTestRunner runner) { + runner + .define( + app -> { + app.get("/create", ctx -> ctx.session().put("foo", "session").getId()); + + app.ws( + "/session", + (ctx, initializer) -> { + StringBuilder buff = new StringBuilder(ctx.session().get("foo").value()); + + initializer.onConnect( + ws -> { + buff.append("/connected"); + }); + + initializer.onMessage( + (ws, message) -> { + ws.send( + buff.append("/") + .append(ctx.session().get("foo").value()) + .append("/") + .append(message.value()) + .toString()); + }); + }); + }) + .ready( + client -> { + client.get( + "/create", + rsp -> { + String sid = sid(rsp.header("Set-Cookie")); + client.header("Cookie", "jooby.sid=" + sid); + client.syncWebSocket( + "/session", + ws -> { + assertEquals("session/connected/session/ws", ws.send("ws")); + }); + }); + }); + } + + @ServerTest + public void webSocketJson(ServerTestRunner runner) { + runner + .define( + app -> { + app.install(new JacksonModule()); + + app.ws( + "/wsjson", + (ctx, initializer) -> { + initializer.onMessage( + (ws, message) -> { + JsonNode node = message.to(JsonNode.class); + ws.render(node); + }); + }); + }) + .ready( + client -> { + client.syncWebSocket( + "/wsjson", + ws -> { + assertEquals( + "{\"message\":\"Hello JSON!\"}", + ws.send("{\"message\" : \"Hello JSON!\"}")); + }); + }); + } + + private String sid(String setCookie) { + return setCookie.substring("jooby.sid=".length(), setCookie.indexOf(';')); + } +} From 0006cedb3cd77c8f7c4c568ab80f6a72d64d1de5 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 28 Feb 2023 15:55:21 -0300 Subject: [PATCH 82/97] Support for Websocket Heartbeat fix #2784 --- .../jooby/internal/netty/NettyWebSocket.java | 8 ++ tests/pom.xml | 6 ++ .../test/java/io/jooby/i2784/Issue2784.java | 75 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 tests/src/test/java/io/jooby/i2784/Issue2784.java diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java index d30f8cfd7d..187595f811 100644 --- a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java +++ b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java @@ -33,6 +33,8 @@ import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame; import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame; import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame; +import io.netty.handler.codec.http.websocketx.PingWebSocketFrame; +import io.netty.handler.codec.http.websocketx.PongWebSocketFrame; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketFrame; import io.netty.util.AttributeKey; @@ -149,6 +151,12 @@ void handleFrame(WebSocketFrame frame) { if (frame instanceof TextWebSocketFrame || frame instanceof BinaryWebSocketFrame || frame instanceof ContinuationWebSocketFrame) { handleMessage(frame); + } else if (frame instanceof PingWebSocketFrame) { + netty + .ctx + .channel() + .writeAndFlush(new PongWebSocketFrame(frame.content())) + .addListener(this); } else if (frame instanceof CloseWebSocketFrame) { handleClose(toWebSocketCloseStatus((CloseWebSocketFrame) frame)); } diff --git a/tests/pom.xml b/tests/pom.xml index 931b388c8d..c42eff517d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -148,6 +148,12 @@ test + + org.asynchttpclient + async-http-client + 2.12.3 + + io.rest-assured rest-assured diff --git a/tests/src/test/java/io/jooby/i2784/Issue2784.java b/tests/src/test/java/io/jooby/i2784/Issue2784.java new file mode 100644 index 0000000000..c6bdbad74e --- /dev/null +++ b/tests/src/test/java/io/jooby/i2784/Issue2784.java @@ -0,0 +1,75 @@ +/* + * Jooby https://jooby.io + * Apache License Version 2.0 https://jooby.io/LICENSE.txt + * Copyright 2014 Edgar Espina + */ +package io.jooby.i2784; + +import java.util.concurrent.CountDownLatch; + +import org.asynchttpclient.Dsl; +import org.asynchttpclient.ws.WebSocket; +import org.asynchttpclient.ws.WebSocketListener; +import org.asynchttpclient.ws.WebSocketUpgradeHandler; + +import io.jooby.junit.ServerTest; +import io.jooby.junit.ServerTestRunner; + +public class Issue2784 { + + @ServerTest + public void shouldImplementWebSocketPingPong(ServerTestRunner runner) { + runner + .define( + app -> { + app.ws( + "/2784", + (ctx, init) -> { + init.onMessage( + (ws, message) -> { + ws.send("back: " + message.value()); + }); + }); + }) + .ready( + http -> { + CountDownLatch latch = new CountDownLatch(1); + WebSocketUpgradeHandler.Builder upgradeHandlerBuilder = + new WebSocketUpgradeHandler.Builder(); + WebSocketUpgradeHandler wsHandler = + upgradeHandlerBuilder + .addWebSocketListener( + new WebSocketListener() { + @Override + public void onTextFrame( + String payload, boolean finalFragment, int rsv) {} + + @Override + public void onOpen(WebSocket websocket) {} + + @Override + public void onClose(WebSocket websocket, int code, String reason) {} + + @Override + public void onError(Throwable t) {} + + @Override + public void onPongFrame(byte[] payload) { + latch.countDown(); + } + }) + .build(); + + WebSocket webSocketClient = + Dsl.asyncHttpClient() + .prepareGet("ws://localhost:" + http.getPort() + "/2784") + .setRequestTimeout(5000) + .execute(wsHandler) + .get(); + // Send ping + webSocketClient.sendPingFrame(); + + latch.await(); + }); + } +} From 57a812716d8285871d4ebdde03f5fdc662e30531 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Tue, 28 Feb 2023 18:03:39 -0300 Subject: [PATCH 83/97] OpenApi jooby-maven-plugin incorrect generation in multi module maven project fix #2756 --- .../java/io/jooby/gradle/OpenAPITask.java | 11 ++++- .../main/java/io/jooby/maven/BaseMojo.java | 31 +++++++------ .../main/java/io/jooby/maven/OpenAPIMojo.java | 11 ++++- .../src/main/java/io/jooby/maven/RunMojo.java | 43 ------------------- 4 files changed, 38 insertions(+), 58 deletions(-) diff --git a/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java b/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java index 5b90ed2ca2..be6889f285 100644 --- a/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java +++ b/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java @@ -47,14 +47,23 @@ public void generate() throws Throwable { .orElseGet(() -> computeMainClassName(projects)); Path outputDir = classes(getProject()); + // Reduce lookup to current project: See https://github.com/jooby-project/jooby/issues/2756 + String metaInf = + outputDir + .resolve("META-INF") + .resolve("services") + .resolve("io.jooby.MvcFactory") + .toAbsolutePath() + .toString(); ClassLoader classLoader = createClassLoader(projects); getLogger().info("Generating OpenAPI: " + mainClass); getLogger().debug("Using classloader: " + classLoader); getLogger().debug("Output directory: " + outputDir); + getLogger().debug("META-INF: " + metaInf); - OpenAPIGenerator tool = new OpenAPIGenerator(); + OpenAPIGenerator tool = new OpenAPIGenerator(metaInf); tool.setClassLoader(classLoader); tool.setOutputDir(outputDir); trim(includes).ifPresent(tool::setIncludes); diff --git a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/BaseMojo.java b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/BaseMojo.java index fb4bc159ed..bd2a36de66 100644 --- a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/BaseMojo.java +++ b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/BaseMojo.java @@ -5,7 +5,21 @@ */ package io.jooby.maven; -import edu.emory.mathcs.backport.java.util.Collections; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import org.apache.maven.Maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Resource; @@ -23,18 +37,6 @@ import org.eclipse.aether.graph.Dependency; import javax.annotation.Nonnull; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; /** * Base class which provides common utility method to more specific plugins: like classpath @@ -179,13 +181,16 @@ protected Set jars(MavenProject project) throws DependencyResolutionExcept return result.getDependencies().stream() .filter(it -> !it.isOptional()) .map(Dependency::getArtifact) + .filter(Objects::nonNull) .filter(it -> it.getExtension().equals("jar")) .map(org.eclipse.aether.artifact.Artifact::getFile) + .filter(Objects::nonNull) .map(File::toPath) .collect(Collectors.toCollection(LinkedHashSet::new)); } else { return artifacts.stream() .map(org.apache.maven.artifact.Artifact::getFile) + .filter(Objects::nonNull) .filter(it -> it.toString().endsWith(".jar")) .map(File::toPath) .collect(Collectors.toCollection(LinkedHashSet::new)); diff --git a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java index 9af477dd90..def0678843 100644 --- a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java +++ b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java @@ -46,12 +46,21 @@ public class OpenAPIMojo extends BaseMojo { throws Exception { ClassLoader classLoader = createClassLoader(projects); Path outputDir = Paths.get(project.getBuild().getOutputDirectory()); + // Reduce lookup to current project: See https://github.com/jooby-project/jooby/issues/2756 + String metaInf = + outputDir + .resolve("META-INF") + .resolve("services") + .resolve("io.jooby.MvcFactory") + .toAbsolutePath() + .toString(); getLog().info("Generating OpenAPI: " + mainClass); getLog().debug("Using classloader: " + classLoader); getLog().debug("Output directory: " + outputDir); + getLog().debug("META-INF: " + metaInf); - OpenAPIGenerator tool = new OpenAPIGenerator(); + OpenAPIGenerator tool = new OpenAPIGenerator(metaInf); tool.setClassLoader(classLoader); tool.setOutputDir(outputDir); trim(includes).ifPresent(tool::setIncludes); diff --git a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java index 8753b10291..c3ab5fa78b 100644 --- a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java +++ b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java @@ -197,48 +197,5 @@ private Set sourceDirectories(final MavenProject project) { @Override protected String mojoName() { return "run"; } - - // private boolean requiredDependency(Set artifacts, - // org.eclipse.aether.artifact.Artifact artifact) { - // return artifacts.stream().anyMatch( - // it -> it.getGroupId().equals(artifact.getGroupId()) - // && it.getArtifactId().equals(artifact.getArtifactId()) - // && it.getVersion().equals(artifact.getVersion())); - // } - // - // private Collection resolveDependencies(Artifact artifact, - // Predicate predicate) { - // return resolveDependencies(new DefaultArtifact(artifact.getGroupId(), artifact.getArtifactId(), - // artifact.getClassifier(), artifact.getType(), artifact.getVersion()), predicate); - // } - // - // private Set resolveDependencies( - // org.eclipse.aether.artifact.Artifact artifact, - // Predicate predicate) { - // CollectRequest collectRequest = new CollectRequest() - // .setRoot(new Dependency(artifact, null)); - // - // DependencyRequest request = new DependencyRequest(collectRequest, null); - // - // DependencyResult result; - // - // try { - // result = repoSystem.resolveDependencies(repoSession, request); - // } catch (DependencyResolutionException dre) { - // result = dre.getResult(); - // } - // - // if (result == null) { - // return Collections.emptySet(); - // } - // - // return result.getArtifactResults().stream() - // // Assume all dependencies has been resolved by maven. We added for ignore optional deps - // .filter(it -> !it.isMissing()) - // .map(ArtifactResult::getArtifact) - // .filter(it -> it != null && it.getExtension().equals("jar")) - // .filter(predicate) - // .collect(toSet()); - // } } From 2fa18dda0244d7b58ee979bbd0c9b095a242e9f1 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 4 Mar 2023 15:14:10 -0300 Subject: [PATCH 84/97] v2.16.2 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 397 ++++++++++++++++++++++- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 437 insertions(+), 72 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 5b332e4894..1aa2521e05 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 677f236555..84a4d928ff 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 7124fe0aa6..9def1ff7e6 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 170b4c6d3f..65cf85c0ce 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index c8d1689c1b..815f40728d 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 35e48f5889..5d657f45e9 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index f2f62ae48b..d530d3a60c 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 @@ -16,12 +16,12 @@ - 2.16.2-SNAPSHOT + 2.16.2 4.0.3 3.2.0 9.3 1.0.1 - 1.12.261 + 1.12.349 6.4.1 2.8.8 8.42 @@ -45,12 +45,12 @@ 2.9.1 31.1-jre 5.1.0 - 2.1.212 + 2.1.214 4.3.1 - 5.6.3.Final - 2.13.4.2 - 2.13.4 - 2.13.4 + 5.6.15.Final + 2.14.2 + 2.14.2 + 2.14.2 0.8.8 0.8.8 1.0.2 @@ -59,17 +59,16 @@ 1 1.11.0.Final 3.32.0 - 9.4.48.v20220622 + 9.4.51.v20230217 0.0.9 - 1.12.261 - 2.16.2-SNAPSHOT - 2.16.2-SNAPSHOT + 2.16.2 + 2.16.2 0.11.5 3.0.2 5.9.1 2.7.2 - 1.6.21 - 1.6.2 + 1.8.10 + 1.6.4 6.1.8.RELEASE 4.1 2.17.2 @@ -101,7 +100,7 @@ 4.6.0 2.3.1 8.0.30 - 4.1.80.Final + 4.1.89.Final 1.6.8 v12.19.0 4.9.3 @@ -122,7 +121,7 @@ 3.0.12.RELEASE 1.1.3 1.1.6.RELEASE - 2.2.19.Final + 2.2.23.Final 2.8.1 3.1.5.Final 1.0.9 @@ -1102,6 +1101,372 @@ ${plexus-utils.version} jar + + io.netty + netty-codec + ${netty.version} + jar + + + io.netty + netty-codec-dns + ${netty.version} + jar + + + io.netty + netty-codec-haproxy + ${netty.version} + jar + + + io.netty + netty-codec-http2 + ${netty.version} + jar + + + io.netty + netty-codec-memcache + ${netty.version} + jar + + + io.netty + netty-codec-mqtt + ${netty.version} + jar + + + io.netty + netty-codec-redis + ${netty.version} + jar + + + io.netty + netty-codec-smtp + ${netty.version} + jar + + + io.netty + netty-codec-socks + ${netty.version} + jar + + + io.netty + netty-codec-stomp + ${netty.version} + jar + + + io.netty + netty-codec-xml + ${netty.version} + jar + + + io.netty + netty-dev-tools + ${netty.version} + jar + + + io.netty + netty-handler-proxy + ${netty.version} + jar + + + io.netty + netty-handler-ssl-ocsp + ${netty.version} + jar + + + io.netty + netty-resolver + ${netty.version} + jar + + + io.netty + netty-resolver-dns + ${netty.version} + jar + + + io.netty + netty-transport-rxtx + ${netty.version} + jar + + + io.netty + netty-transport-sctp + ${netty.version} + jar + + + io.netty + netty-transport-udt + ${netty.version} + jar + + + io.netty + netty-example + ${netty.version} + jar + + + io.netty + netty-all + ${netty.version} + jar + + + io.netty + netty-resolver-dns-classes-macos + ${netty.version} + jar + + + io.netty + netty-resolver-dns-native-macos + ${netty.version} + jar + + + io.netty + netty-resolver-dns-native-macos + ${netty.version} + jar + + + io.netty + netty-resolver-dns-native-macos + ${netty.version} + jar + + + io.netty + netty-transport-native-unix-common + ${netty.version} + jar + + + io.netty + netty-transport-native-unix-common + ${netty.version} + jar + + + io.netty + netty-transport-native-unix-common + ${netty.version} + jar + + + io.netty + netty-transport-native-unix-common + ${netty.version} + jar + + + io.netty + netty-transport-native-unix-common + ${netty.version} + jar + + + io.netty + netty-transport-classes-epoll + ${netty.version} + jar + + + io.netty + netty-transport-native-epoll + ${netty.version} + jar + + + io.netty + netty-transport-native-epoll + ${netty.version} + jar + + + io.netty + netty-transport-classes-kqueue + ${netty.version} + jar + + + io.netty + netty-transport-native-kqueue + ${netty.version} + jar + + + io.netty + netty-transport-native-kqueue + ${netty.version} + jar + + + io.netty + netty-transport-native-kqueue + ${netty.version} + jar + + + io.netty + netty-tcnative-classes + ${netty.version} + jar + + + io.netty + netty-tcnative + ${netty.version} + jar + + + io.netty + netty-tcnative + ${netty.version} + jar + + + io.netty + netty-tcnative + ${netty.version} + jar + + + io.netty + netty-tcnative + ${netty.version} + jar + + + io.netty + netty-tcnative-boringssl-static + ${netty.version} + jar + + + io.netty + netty-tcnative-boringssl-static + ${netty.version} + jar + + + io.netty + netty-tcnative-boringssl-static + ${netty.version} + jar + + + io.netty + netty-tcnative-boringssl-static + ${netty.version} + jar + + + io.netty + netty-tcnative-boringssl-static + ${netty.version} + jar + + + io.netty + netty-tcnative-boringssl-static + ${netty.version} + jar + + + com.amazonaws + aws-java-sdk-iotroborunner + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-chimesdkvoice + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-ssmsap + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-scheduler + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-resourceexplorer2 + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-connectcases + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-migrationhuborchestrator + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-iotfleetwise + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-controltower + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-supportapp + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-private5g + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-backupstorage + ${aws-java-sdk.version} + jar + + + com.amazonaws + aws-java-sdk-licensemanagerusersubscriptions + ${aws-java-sdk.version} + jar + com.amazonaws aws-java-sdk-iamrolesanywhere diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index a83f2e1d67..41fbd03553 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 61e2e43128..869e730e55 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 26df52a786..f47742d297 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index bedcdd7a5c..9058128a50 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 2ed9622407..8c65e92842 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 760b6007de..c264c7c517 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index c01139a9cb..6e64f4dd2a 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index e3d2074d72..3567f56fdb 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index 3066975203..edf290f779 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 7ada977560..eae491c8a4 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index d2c4407437..1b15d8ef75 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 383ebf2896..97612d3035 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 2fcab81e39..f75a3d33b2 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index c2886c57e6..b935cbbb87 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 40f9b3d01d..1c8a0247c5 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 0fa92b8230..2b44c4d5ef 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index df46d9b03c..36fe3f5c13 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index d11352cb78..4668683568 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index ba3a459f44..1bae7bae98 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index ee2385b37f..f7aa2c9a80 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index c69435e170..de7b32c828 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index e03f47fdf0..93840e0a14 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 9755b0d625..937bee0989 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 9e81c565e5..741694a695 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index bb1ba870ef..bf03615ad7 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 349f7c1494..561901270f 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 840281135a..d7da0b236a 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index e247b13db0..da2d1c123a 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index ec5e6f9f6d..c74a8595df 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 03ce128033..43c6e6e73a 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index c35f01d2e9..1c594d269e 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 47c03f7859..101b69b515 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 4a47a521b7..66bdbe5aac 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 6bcc8beef3..b6b5216bd0 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 3c891337ea..a75703ec29 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 5bb0fe6e04..14c819a2a8 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 48ed58d5b3..1e5e5c90d0 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 25b0ad5271..e1621cbe16 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index b71bf3d49f..004c916bff 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index e2258d42ce..00e1bb170c 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index a8036ae617..138842e3f1 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index f848e3d61b..a6ce9c9bd6 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 40ae8bb20b..5588d24d47 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 53020275d0..3cee1e3dd2 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 1033ded407..6133785ed2 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 0b4747f7f5..1390459215 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index f63371eb74..f330b81299 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 8a8515a567..0339909874 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2-SNAPSHOT + 2.16.2 modules diff --git a/pom.xml b/pom.xml index 83a4d4ca5d..274d8231c3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.2-SNAPSHOT + 2.16.2 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index c42eff517d..5bd432eb72 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2-SNAPSHOT + 2.16.2 4.0.0 From 5b0166922385b3b85b2a5486ac3e74642d1c46fa Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 4 Mar 2023 15:45:45 -0300 Subject: [PATCH 85/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 2 +- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 1aa2521e05..a0604d0966 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 84a4d928ff..835d002343 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 9def1ff7e6..aca9ae8514 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 65cf85c0ce..6f713f0bb6 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 815f40728d..e804728b6e 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 5d657f45e9..8e48e2bf58 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index d530d3a60c..67974c5878 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 41fbd03553..8fe5840fdd 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 869e730e55..2322661026 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index f47742d297..884417161b 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 9058128a50..aefe08e146 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 8c65e92842..fc77d8dc2e 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index c264c7c517..25892ff485 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 6e64f4dd2a..57e47d8cbf 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 3567f56fdb..a5908bbfea 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index edf290f779..b8f91255d6 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index eae491c8a4..4647f87320 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 1b15d8ef75..33d4b9eeb5 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 97612d3035..8093b6cac3 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index f75a3d33b2..ab8e227b8d 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index b935cbbb87..13ec06e035 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 1c8a0247c5..7bcb89ce76 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 2b44c4d5ef..a32daf8e97 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 36fe3f5c13..5f905ba407 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 4668683568..e0044691ec 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 1bae7bae98..23166cd6df 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index f7aa2c9a80..f7fcc8ce3d 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index de7b32c828..48bbd041d2 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 93840e0a14..b85d27d171 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 937bee0989..5085e70db0 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 741694a695..9bb5203486 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index bf03615ad7..d327727410 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 561901270f..28aac2ba57 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index d7da0b236a..cad7781d33 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index da2d1c123a..3471af5c5c 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index c74a8595df..dc4fd80e6b 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 43c6e6e73a..7d5d540703 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 1c594d269e..33a6a3418b 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 101b69b515..b0f8ade7df 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 66bdbe5aac..cb7af12e20 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index b6b5216bd0..dd88545172 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index a75703ec29..ef00fdd7b7 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 14c819a2a8..53bc24fc88 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 1e5e5c90d0..58aad3452a 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index e1621cbe16..d324d223e6 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 004c916bff..a685c25855 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 00e1bb170c..a2954633c9 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 138842e3f1..88a47a477a 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index a6ce9c9bd6..bb9a1160da 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 5588d24d47..79fddf7152 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 3cee1e3dd2..04d40c1427 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 6133785ed2..43febbcfe8 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 1390459215..59e5949a1f 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index f330b81299..c92c3f184a 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 0339909874..0f3c8b9798 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2 + 2.16.3-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index 274d8231c3..6065fbd7e6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.2 + 2.16.3-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 5bd432eb72..2af43e1c10 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.2 + 2.16.3-SNAPSHOT 4.0.0 From 3635d352e2f5f62be6f17489870aa943be77183f Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Tue, 24 Oct 2023 10:57:59 +0100 Subject: [PATCH 86/97] Bump ASM from 9.3 to 9.6 to enable support for Java 21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6065fbd7e6..a389ba8ded 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 1.11.0.Final - 9.3 + 9.6 2.2.23.Final From f7f289d8cd12c3e4c4554b6b5ea8ed35fec776d5 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 28 Oct 2023 19:45:33 -0300 Subject: [PATCH 87/97] version bump: - upgrade netty - upgrade jackson - upgrade jetty - upgrade swagger --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a389ba8ded..02d8008aa3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.3.31 4.3.1 3.1.6 - 2.14.2 + 2.15.3 ${jackson.version} ${jackson.version} 2.9.1 @@ -54,7 +54,7 @@ 5.1.0 - 1.2.11 + 1.2.12 2.17.2 1.7.36 @@ -72,17 +72,17 @@ 9.6 - 2.2.23.Final - 9.4.51.v20230217 - 4.1.89.Final + 2.2.28.Final + 9.4.53.v20231009 + 4.1.100.Final 2.2.21 3.4.18 - 2.2.0 - 2.0.33 + 2.2.17 + 2.1.18 2.0.0-rc.20 From a44644f2348024b167fad29e6fe534c0e4aad1cb Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Sat, 28 Oct 2023 19:46:57 -0300 Subject: [PATCH 88/97] v2.16.3 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 28 ++++++++++++------------ modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 70 insertions(+), 70 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a0604d0966..bc3b919ef5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 835d002343..e2e1041a63 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index aca9ae8514..b6aab204f0 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 6f713f0bb6..3839d41011 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index e804728b6e..259cc5ed27 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 8e48e2bf58..a15637d5c4 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 67974c5878..97c95bbe55 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 @@ -16,10 +16,10 @@ - 2.16.2 + 2.16.3 4.0.3 3.2.0 - 9.3 + 9.6 1.0.1 1.12.349 6.4.1 @@ -48,9 +48,9 @@ 2.1.214 4.3.1 5.6.15.Final - 2.14.2 - 2.14.2 - 2.14.2 + 2.15.3 + 2.15.3 + 2.15.3 0.8.8 0.8.8 1.0.2 @@ -59,10 +59,10 @@ 1 1.11.0.Final 3.32.0 - 9.4.51.v20230217 + 9.4.53.v20231009 0.0.9 - 2.16.2 - 2.16.2 + 2.16.3 + 2.16.3 0.11.5 3.0.2 5.9.1 @@ -73,7 +73,7 @@ 4.1 2.17.2 1.2 - 1.2.11 + 1.2.12 3.0.0 3.2.0 3.4.2 @@ -100,7 +100,7 @@ 4.6.0 2.3.1 8.0.30 - 4.1.89.Final + 4.1.100.Final 1.6.8 v12.19.0 4.9.3 @@ -116,12 +116,12 @@ 1.7.36 5.3.20 3.1.3 - 2.0.33 - 2.2.0 + 2.1.18 + 2.2.17 3.0.12.RELEASE 1.1.3 1.1.6.RELEASE - 2.2.23.Final + 2.2.28.Final 2.8.1 3.1.5.Final 1.0.9 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 8fe5840fdd..d7369c53c5 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 2322661026..3fe52263eb 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 884417161b..6c383474d4 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index aefe08e146..3e63457147 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index fc77d8dc2e..ecbebdcb3c 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 25892ff485..26fcd110ab 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 57e47d8cbf..5373fed158 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index a5908bbfea..ed4e28a513 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index b8f91255d6..f1786c8570 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 4647f87320..4434eb9ea3 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 33d4b9eeb5..503e667d15 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 8093b6cac3..ebf6e1fb36 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index ab8e227b8d..0bdfd1e26c 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 13ec06e035..d18e470752 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 7bcb89ce76..697a0113ba 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index a32daf8e97..dca22ae118 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index 5f905ba407..dbcd7c02bc 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index e0044691ec..83b9d03a20 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 23166cd6df..340db8cb37 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index f7fcc8ce3d..2f37ec406b 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 48bbd041d2..2b7102d451 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index b85d27d171..373b6fdc4a 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 5085e70db0..f1055cf69d 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 9bb5203486..868769385f 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index d327727410..abf01a5e27 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 28aac2ba57..663ceeee20 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index cad7781d33..91268b9048 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 3471af5c5c..df7f89b339 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index dc4fd80e6b..b36367d788 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 7d5d540703..9412d6d59b 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 33a6a3418b..850d0ede7e 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index b0f8ade7df..be9cbef374 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index cb7af12e20..6117c9ea58 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index dd88545172..9f303b044f 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index ef00fdd7b7..be27afde10 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 53bc24fc88..3a4ce4c9b0 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 58aad3452a..45074fbe36 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index d324d223e6..d0bd04580c 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index a685c25855..3706cc886d 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index a2954633c9..66139886e3 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 88a47a477a..5aa8202e18 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index bb9a1160da..5d712bc131 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 79fddf7152..d97b856494 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 04d40c1427..1f4dcd1385 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 43febbcfe8..180544a888 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 59e5949a1f..e2f78c0925 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index c92c3f184a..7463617bda 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 0f3c8b9798..e8ad59fd56 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3-SNAPSHOT + 2.16.3 modules diff --git a/pom.xml b/pom.xml index 02d8008aa3..d3b38c5795 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.3-SNAPSHOT + 2.16.3 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 2af43e1c10..6e0193c174 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3-SNAPSHOT + 2.16.3 4.0.0 From 69438ee9c0c448e5df990d0f2a11258d68ff5bdc Mon Sep 17 00:00:00 2001 From: Istvan Meszaros Date: Tue, 4 Jun 2024 09:57:59 +0200 Subject: [PATCH 89/97] #3441 Bump Guice to 6.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3b38c5795..cefc10c8d4 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 3.1.5.Final 5.3.20 - 5.1.0 + 6.0.0 1.2.12 From d4fa18b8e6977a2d151a5e2651d895cf4dcf4997 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 18:41:30 -0300 Subject: [PATCH 90/97] jetty: remove conscrypt dependency --- modules/jooby-http2-jetty/pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 83b9d03a20..2016700bbc 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -25,13 +25,6 @@ ${jooby.version} - - - io.jooby - jooby-conscrypt - ${jooby.version} - - org.eclipse.jetty.http2 http2-server @@ -40,7 +33,7 @@ org.eclipse.jetty - jetty-alpn-conscrypt-server + jetty-alpn-java-server ${jetty.version} From 149998ce549ce4d4b0814969fd80764f4dca4626 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 18:42:07 -0300 Subject: [PATCH 91/97] set version to 2.16.4 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 2 +- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index bc3b919ef5..e41b716044 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index e2e1041a63..3e92e197f7 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index b6aab204f0..f8d9e8791d 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 3839d41011..4474264f61 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 259cc5ed27..2df83d7c42 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index a15637d5c4..e4d54fad3d 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 97c95bbe55..ad17b013ee 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index d7369c53c5..d2f056a87b 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 3fe52263eb..af91e413a0 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 6c383474d4..a8d81a5ff7 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 3e63457147..2243c41ae6 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index ecbebdcb3c..9695ebc676 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 26fcd110ab..01f2cdd920 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 5373fed158..3e670980aa 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index ed4e28a513..78c54c959b 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index f1786c8570..f8bf2a0aed 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 4434eb9ea3..9bb1a37987 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index 503e667d15..fa11d0de21 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index ebf6e1fb36..30c26cd569 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 0bdfd1e26c..2c91b887b4 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index d18e470752..5233866527 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index 697a0113ba..f23ddca0ea 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index dca22ae118..4ede8d1717 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index dbcd7c02bc..c14c4f5f96 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 2016700bbc..a50a77ad29 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 340db8cb37..f657f8e74a 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 2f37ec406b..dd147ce5d1 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 2b7102d451..44c5e3e076 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 373b6fdc4a..077827604f 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index f1055cf69d..2de80e8414 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 868769385f..b78118df75 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index abf01a5e27..4da8680ec7 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 663ceeee20..3378d12bd5 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 91268b9048..e42aeb77ea 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index df7f89b339..5bf62fd982 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index b36367d788..ec238b6c28 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 9412d6d59b..81283162c5 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 850d0ede7e..434417f486 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index be9cbef374..261d47abfb 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 6117c9ea58..09d2c26850 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 9f303b044f..68a5e99b65 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index be27afde10..490f11f024 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 3a4ce4c9b0..7ea61e19c3 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 45074fbe36..d1a6005b6c 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index d0bd04580c..64f2a144cb 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 3706cc886d..8a4c9f68f4 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 66139886e3..451c586125 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 5aa8202e18..2b11ab12d1 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 5d712bc131..9e0f5ef595 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index d97b856494..a75c49fec0 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 1f4dcd1385..2d972afdef 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 180544a888..73aea6a071 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index e2f78c0925..55455773f4 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 7463617bda..92f8b7217b 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index e8ad59fd56..869b3930e0 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3 + 2.16.4-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index cefc10c8d4..9948ba20d6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.3 + 2.16.4-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index 6e0193c174..ea13675dec 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.3 + 2.16.4-SNAPSHOT 4.0.0 From b40428381a61fe8a90bf49f87d64a293472a9030 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 18:56:38 -0300 Subject: [PATCH 92/97] version bump: upgrade servers --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9948ba20d6..0c9d20e1c2 100644 --- a/pom.xml +++ b/pom.xml @@ -72,9 +72,9 @@ 9.6 - 2.2.28.Final - 9.4.53.v20231009 - 4.1.100.Final + 2.3.13.Final + 9.4.54.v20240208 + 4.1.110.Final 2.2.21 From 08c916986a7b1707496a68ea8bf749319d3095ee Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 18:57:06 -0300 Subject: [PATCH 93/97] v2.16.4 --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 2 +- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e41b716044..31f2745547 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 3e92e197f7..806243e74c 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index f8d9e8791d..63f86dce83 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 4474264f61..08d938d0bf 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index 2df83d7c42..aa5a266a1e 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index e4d54fad3d..52623a4902 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index ad17b013ee..847797cb4e 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index d2f056a87b..6a24f40c2c 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index af91e413a0..8f5834e13c 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index a8d81a5ff7..6cfa78d85c 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 2243c41ae6..2dcb9e5eaa 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 9695ebc676..1b2210d153 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index 01f2cdd920..c1b8c6ee82 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index 3e670980aa..cf42680d0d 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index 78c54c959b..f07a6d89d2 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index f8bf2a0aed..ab3ba918dd 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index 9bb1a37987..f2de5287b2 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index fa11d0de21..edc7cb9fe1 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index 30c26cd569..cdc90b2f48 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 2c91b887b4..2072bf66d4 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index 5233866527..a02fca0d40 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index f23ddca0ea..b93e3bec61 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index 4ede8d1717..ac2e6d1579 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index c14c4f5f96..a94b5af21b 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index a50a77ad29..0b8a594a35 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index f657f8e74a..1d55555dbe 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index dd147ce5d1..207f5990ee 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 44c5e3e076..8bc7452be8 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index 077827604f..ef280eeb5b 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 2de80e8414..90efa328a5 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index b78118df75..760764aaa9 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 4da8680ec7..18ab067de9 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index 3378d12bd5..fb0d2b4ce5 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index e42aeb77ea..3a175ca4fa 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index 5bf62fd982..ac91525181 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index ec238b6c28..e374552419 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 81283162c5..9ece9d4b13 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index 434417f486..c4678f657b 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 261d47abfb..376592ea61 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 09d2c26850..6905fd1d58 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index 68a5e99b65..c48147edce 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index 490f11f024..e333a10c05 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index 7ea61e19c3..fd63adf0ca 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index d1a6005b6c..67ad6f61a4 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index 64f2a144cb..b50e423456 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index 8a4c9f68f4..b60c73f7e1 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index 451c586125..a5add9e21c 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index 2b11ab12d1..dd4b25d6f8 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index 9e0f5ef595..f754b5003b 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index a75c49fec0..37ea42b09a 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index 2d972afdef..c67217b220 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 73aea6a071..7130fdd23c 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index 55455773f4..d5d71f3932 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index 92f8b7217b..c010383172 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 869b3930e0..0d2b183e70 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4-SNAPSHOT + 2.16.4 modules diff --git a/pom.xml b/pom.xml index 0c9d20e1c2..30dc224944 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.4-SNAPSHOT + 2.16.4 pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index ea13675dec..b1e5b4680e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4-SNAPSHOT + 2.16.4 4.0.0 From 847e892ef7c9fa77d371e6618f573b99ba96a039 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 19:43:45 -0300 Subject: [PATCH 94/97] build: fix jetty ssl + gradle setup --- modules/jooby-gradle-plugin/gradlew | 301 +++++++++++++++--------- modules/jooby-gradle-plugin/gradlew.bat | 76 +++--- modules/jooby-http2-jetty/pom.xml | 8 + pom.xml | 4 +- 4 files changed, 241 insertions(+), 148 deletions(-) diff --git a/modules/jooby-gradle-plugin/gradlew b/modules/jooby-gradle-plugin/gradlew index cccdd3d517..b740cf1339 100755 --- a/modules/jooby-gradle-plugin/gradlew +++ b/modules/jooby-gradle-plugin/gradlew @@ -1,78 +1,127 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/modules/jooby-gradle-plugin/gradlew.bat b/modules/jooby-gradle-plugin/gradlew.bat index e95643d6a2..7101f8e467 100644 --- a/modules/jooby-gradle-plugin/gradlew.bat +++ b/modules/jooby-gradle-plugin/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +25,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +55,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 0b8a594a35..15b66a9a55 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -37,6 +37,14 @@ ${jetty.version} + + + org.eclipse.jetty + jetty-alpn-openjdk8-server + ${jetty.version} + + + org.junit.jupiter diff --git a/pom.xml b/pom.xml index 30dc224944..692d1b8814 100644 --- a/pom.xml +++ b/pom.xml @@ -69,10 +69,10 @@ 1.11.0.Final - 9.6 + 9.7 - 2.3.13.Final + 2.2.32.Final 9.4.54.v20240208 4.1.110.Final From 6965c8bc8d144c83993d2a9a4fe3ce42ec74d332 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 20:13:35 -0300 Subject: [PATCH 95/97] v2.16.4 --- modules/jooby-bom/pom.xml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 847797cb4e..1cb1b74d14 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -16,10 +16,10 @@ - 2.16.3 + 2.16.4 4.0.3 3.2.0 - 9.6 + 9.7 1.0.1 1.12.349 6.4.1 @@ -44,7 +44,7 @@ 16.2 2.9.1 31.1-jre - 5.1.0 + 6.0.0 2.1.214 4.3.1 5.6.15.Final @@ -59,10 +59,10 @@ 1 1.11.0.Final 3.32.0 - 9.4.53.v20231009 + 9.4.54.v20240208 0.0.9 - 2.16.3 - 2.16.3 + 2.16.4 + 2.16.4 0.11.5 3.0.2 5.9.1 @@ -100,7 +100,7 @@ 4.6.0 2.3.1 8.0.30 - 4.1.100.Final + 4.1.110.Final 1.6.8 v12.19.0 4.9.3 @@ -121,7 +121,7 @@ 3.0.12.RELEASE 1.1.3 1.1.6.RELEASE - 2.2.28.Final + 2.2.32.Final 2.8.1 3.1.5.Final 1.0.9 @@ -1281,6 +1281,12 @@ ${netty.version} jar + + io.netty + netty-transport-native-unix-common + ${netty.version} + jar + io.netty netty-transport-classes-epoll @@ -1299,6 +1305,12 @@ ${netty.version} jar + + io.netty + netty-transport-native-epoll + ${netty.version} + jar + io.netty netty-transport-classes-kqueue From 18a2a77f4ef168ab5e26e12ea92c2574ea4d4cf9 Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 21:10:10 -0300 Subject: [PATCH 96/97] gradle-8.8 --- .../gradle/wrapper/gradle-wrapper.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 0dfb4f8c7e..a4413138c9 100644 --- a/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/modules/jooby-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip From 1ab02100ba7252abe7abef162086c6787e5e363b Mon Sep 17 00:00:00 2001 From: Edgar Espina Date: Wed, 5 Jun 2024 21:10:54 -0300 Subject: [PATCH 97/97] prepare for next development cycle --- docs/pom.xml | 2 +- jooby/pom.xml | 2 +- modules/jooby-apt/pom.xml | 2 +- modules/jooby-archetype/pom.xml | 2 +- modules/jooby-awssdk-v1/pom.xml | 2 +- modules/jooby-banner/pom.xml | 2 +- modules/jooby-bom/pom.xml | 2 +- modules/jooby-caffeine/pom.xml | 2 +- modules/jooby-cli/pom.xml | 2 +- modules/jooby-commons-email/pom.xml | 2 +- modules/jooby-conscrypt/pom.xml | 2 +- modules/jooby-distribution/pom.xml | 2 +- modules/jooby-ebean/pom.xml | 2 +- modules/jooby-flyway/pom.xml | 2 +- modules/jooby-freemarker/pom.xml | 2 +- modules/jooby-gradle-setup/pom.xml | 2 +- modules/jooby-graphiql/pom.xml | 2 +- modules/jooby-graphql-playground/pom.xml | 2 +- modules/jooby-graphql/pom.xml | 2 +- modules/jooby-gson/pom.xml | 2 +- modules/jooby-guice/pom.xml | 2 +- modules/jooby-handlebars/pom.xml | 2 +- modules/jooby-hibernate/pom.xml | 2 +- modules/jooby-hikari/pom.xml | 2 +- modules/jooby-http2-jetty/pom.xml | 2 +- modules/jooby-http2-netty/pom.xml | 2 +- modules/jooby-http2-undertow/pom.xml | 2 +- modules/jooby-jackson/pom.xml | 2 +- modules/jooby-jasypt/pom.xml | 2 +- modules/jooby-jdbi/pom.xml | 2 +- modules/jooby-jetty/pom.xml | 2 +- modules/jooby-jwt/pom.xml | 2 +- modules/jooby-kafka/pom.xml | 2 +- modules/jooby-maven-plugin/pom.xml | 2 +- modules/jooby-metrics/pom.xml | 2 +- modules/jooby-netty/pom.xml | 2 +- modules/jooby-node/pom.xml | 2 +- modules/jooby-openapi/pom.xml | 2 +- modules/jooby-pac4j/pom.xml | 2 +- modules/jooby-pebble/pom.xml | 2 +- modules/jooby-quartz/pom.xml | 2 +- modules/jooby-redis/pom.xml | 2 +- modules/jooby-redoc/pom.xml | 2 +- modules/jooby-rocker/pom.xml | 2 +- modules/jooby-run/pom.xml | 2 +- modules/jooby-spring/pom.xml | 2 +- modules/jooby-stork/pom.xml | 2 +- modules/jooby-swagger-ui/pom.xml | 2 +- modules/jooby-test/pom.xml | 2 +- modules/jooby-thymeleaf/pom.xml | 2 +- modules/jooby-utow/pom.xml | 2 +- modules/jooby-weld/pom.xml | 2 +- modules/jooby-whoops/pom.xml | 2 +- modules/jooby-yasson/pom.xml | 2 +- modules/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 31f2745547..1e7a91c771 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/jooby/pom.xml b/jooby/pom.xml index 806243e74c..42cb98da76 100644 --- a/jooby/pom.xml +++ b/jooby/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml index 63f86dce83..e416057467 100644 --- a/modules/jooby-apt/pom.xml +++ b/modules/jooby-apt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-archetype/pom.xml b/modules/jooby-archetype/pom.xml index 08d938d0bf..14e50ef0dd 100644 --- a/modules/jooby-archetype/pom.xml +++ b/modules/jooby-archetype/pom.xml @@ -7,7 +7,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT jooby-archetype diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml index aa5a266a1e..b6f23e802e 100644 --- a/modules/jooby-awssdk-v1/pom.xml +++ b/modules/jooby-awssdk-v1/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-banner/pom.xml b/modules/jooby-banner/pom.xml index 52623a4902..3f1b9c392c 100644 --- a/modules/jooby-banner/pom.xml +++ b/modules/jooby-banner/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml index 1cb1b74d14..fcfd567548 100644 --- a/modules/jooby-bom/pom.xml +++ b/modules/jooby-bom/pom.xml @@ -4,7 +4,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml index 6a24f40c2c..1673ca535b 100644 --- a/modules/jooby-caffeine/pom.xml +++ b/modules/jooby-caffeine/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml index 8f5834e13c..9a4ac7a022 100644 --- a/modules/jooby-cli/pom.xml +++ b/modules/jooby-cli/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml index 6cfa78d85c..a1c090cc0a 100644 --- a/modules/jooby-commons-email/pom.xml +++ b/modules/jooby-commons-email/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml index 2dcb9e5eaa..5feea74859 100644 --- a/modules/jooby-conscrypt/pom.xml +++ b/modules/jooby-conscrypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml index 1b2210d153..3914bafd1d 100644 --- a/modules/jooby-distribution/pom.xml +++ b/modules/jooby-distribution/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml index c1b8c6ee82..980900f190 100644 --- a/modules/jooby-ebean/pom.xml +++ b/modules/jooby-ebean/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml index cf42680d0d..c00971422d 100644 --- a/modules/jooby-flyway/pom.xml +++ b/modules/jooby-flyway/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml index f07a6d89d2..2c5cec6357 100644 --- a/modules/jooby-freemarker/pom.xml +++ b/modules/jooby-freemarker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml index ab3ba918dd..abef2ddb8a 100644 --- a/modules/jooby-gradle-setup/pom.xml +++ b/modules/jooby-gradle-setup/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml index f2de5287b2..23ea61ae0c 100644 --- a/modules/jooby-graphiql/pom.xml +++ b/modules/jooby-graphiql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql-playground/pom.xml b/modules/jooby-graphql-playground/pom.xml index edc7cb9fe1..639872fc08 100644 --- a/modules/jooby-graphql-playground/pom.xml +++ b/modules/jooby-graphql-playground/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml index cdc90b2f48..3230a8d0b0 100644 --- a/modules/jooby-graphql/pom.xml +++ b/modules/jooby-graphql/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml index 2072bf66d4..7acaa606e8 100644 --- a/modules/jooby-gson/pom.xml +++ b/modules/jooby-gson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml index a02fca0d40..17710a3961 100644 --- a/modules/jooby-guice/pom.xml +++ b/modules/jooby-guice/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml index b93e3bec61..0bf72f8336 100644 --- a/modules/jooby-handlebars/pom.xml +++ b/modules/jooby-handlebars/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml index ac2e6d1579..dc83634869 100644 --- a/modules/jooby-hibernate/pom.xml +++ b/modules/jooby-hibernate/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml index a94b5af21b..8022adaee7 100644 --- a/modules/jooby-hikari/pom.xml +++ b/modules/jooby-hikari/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-jetty/pom.xml b/modules/jooby-http2-jetty/pom.xml index 15b66a9a55..ce52b5f0f2 100644 --- a/modules/jooby-http2-jetty/pom.xml +++ b/modules/jooby-http2-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-netty/pom.xml b/modules/jooby-http2-netty/pom.xml index 1d55555dbe..ee54baa9a2 100644 --- a/modules/jooby-http2-netty/pom.xml +++ b/modules/jooby-http2-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-http2-undertow/pom.xml b/modules/jooby-http2-undertow/pom.xml index 207f5990ee..547b46cd3b 100644 --- a/modules/jooby-http2-undertow/pom.xml +++ b/modules/jooby-http2-undertow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml index 8bc7452be8..64d7775542 100644 --- a/modules/jooby-jackson/pom.xml +++ b/modules/jooby-jackson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml index ef280eeb5b..f634e39565 100644 --- a/modules/jooby-jasypt/pom.xml +++ b/modules/jooby-jasypt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml index 90efa328a5..6609e137ab 100644 --- a/modules/jooby-jdbi/pom.xml +++ b/modules/jooby-jdbi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml index 760764aaa9..cf08ed747d 100644 --- a/modules/jooby-jetty/pom.xml +++ b/modules/jooby-jetty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml index 18ab067de9..0767528209 100644 --- a/modules/jooby-jwt/pom.xml +++ b/modules/jooby-jwt/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml index fb0d2b4ce5..7aeb8e2852 100644 --- a/modules/jooby-kafka/pom.xml +++ b/modules/jooby-kafka/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml index 3a175ca4fa..e696593531 100644 --- a/modules/jooby-maven-plugin/pom.xml +++ b/modules/jooby-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml index ac91525181..4e220eb58b 100644 --- a/modules/jooby-metrics/pom.xml +++ b/modules/jooby-metrics/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml index e374552419..8fb581fa06 100644 --- a/modules/jooby-netty/pom.xml +++ b/modules/jooby-netty/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-node/pom.xml b/modules/jooby-node/pom.xml index 9ece9d4b13..562a5e4396 100644 --- a/modules/jooby-node/pom.xml +++ b/modules/jooby-node/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml index c4678f657b..731b78eda4 100644 --- a/modules/jooby-openapi/pom.xml +++ b/modules/jooby-openapi/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml index 376592ea61..a08a594d2f 100644 --- a/modules/jooby-pac4j/pom.xml +++ b/modules/jooby-pac4j/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml index 6905fd1d58..f3d0a6a503 100644 --- a/modules/jooby-pebble/pom.xml +++ b/modules/jooby-pebble/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml index c48147edce..33d2eaf0a5 100644 --- a/modules/jooby-quartz/pom.xml +++ b/modules/jooby-quartz/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml index e333a10c05..0dd9fa5de5 100644 --- a/modules/jooby-redis/pom.xml +++ b/modules/jooby-redis/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml index fd63adf0ca..cdcfac4bed 100644 --- a/modules/jooby-redoc/pom.xml +++ b/modules/jooby-redoc/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml index 67ad6f61a4..6fccd87f39 100644 --- a/modules/jooby-rocker/pom.xml +++ b/modules/jooby-rocker/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml index b50e423456..904e684402 100644 --- a/modules/jooby-run/pom.xml +++ b/modules/jooby-run/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml index b60c73f7e1..9ec24fc519 100644 --- a/modules/jooby-spring/pom.xml +++ b/modules/jooby-spring/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml index a5add9e21c..c473535185 100644 --- a/modules/jooby-stork/pom.xml +++ b/modules/jooby-stork/pom.xml @@ -5,7 +5,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT jooby-stork diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml index dd4b25d6f8..706d0d67f4 100644 --- a/modules/jooby-swagger-ui/pom.xml +++ b/modules/jooby-swagger-ui/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml index f754b5003b..4e0d83c5ec 100644 --- a/modules/jooby-test/pom.xml +++ b/modules/jooby-test/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml index 37ea42b09a..26578209eb 100644 --- a/modules/jooby-thymeleaf/pom.xml +++ b/modules/jooby-thymeleaf/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-utow/pom.xml b/modules/jooby-utow/pom.xml index c67217b220..d0f4703a20 100644 --- a/modules/jooby-utow/pom.xml +++ b/modules/jooby-utow/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml index 7130fdd23c..35c4338cf0 100644 --- a/modules/jooby-weld/pom.xml +++ b/modules/jooby-weld/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml index d5d71f3932..67de1d872e 100644 --- a/modules/jooby-whoops/pom.xml +++ b/modules/jooby-whoops/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml index c010383172..9a0e63fd8c 100644 --- a/modules/jooby-yasson/pom.xml +++ b/modules/jooby-yasson/pom.xml @@ -6,7 +6,7 @@ io.jooby modules - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0 diff --git a/modules/pom.xml b/modules/pom.xml index 0d2b183e70..276d009776 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4 + 2.16.5-SNAPSHOT modules diff --git a/pom.xml b/pom.xml index 692d1b8814..c59f8e27f9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.jooby jooby-project - 2.16.4 + 2.16.5-SNAPSHOT pom jooby-project diff --git a/tests/pom.xml b/tests/pom.xml index b1e5b4680e..78ecf9b227 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ io.jooby jooby-project - 2.16.4 + 2.16.5-SNAPSHOT 4.0.0