diff --git a/CHANGELOG.md b/CHANGELOG.md index 405e80a54..494359ee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [0.17.0] - 2022-01-20 +* Bump vert.x to 4.2.4 +* Bump graaljs to 22.0.0 +* bare specifiers are now resolved using es4x rules, not relative to working dir +* verticle start run on event loop to avoid threading issues +* Debug manual updated to reflect current state of debugging on vscode +* Manual now includes section on hot-reload + ## [0.16.3] - 2022-01-05 * Bump vert.x to 4.2.3 * CI runs and passes on Windows, MacOS and Linux diff --git a/codegen/pom.xml b/codegen/pom.xml index e885bc056..3e8cc4387 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -4,14 +4,14 @@ io.reactiverse es4x-parent - 0.16.3 - .. + 0.17.0 + ../pom.xml 4.0.0 es4x-codegen - 0.16.3 + 0.17.0 ${java.home}/../lib/tools.jar diff --git a/codegen/src/main/java/io/reactiverse/es4x/codegen/generator/OptionsDTS.java b/codegen/src/main/java/io/reactiverse/es4x/codegen/generator/OptionsDTS.java index d5c31afe7..0cc89c79d 100644 --- a/codegen/src/main/java/io/reactiverse/es4x/codegen/generator/OptionsDTS.java +++ b/codegen/src/main/java/io/reactiverse/es4x/codegen/generator/OptionsDTS.java @@ -18,6 +18,7 @@ import io.vertx.codegen.*; import io.vertx.codegen.type.ClassKind; import io.vertx.codegen.type.ClassTypeInfo; +import io.vertx.codegen.type.TypeInfo; import io.vertx.core.json.JsonObject; import java.io.PrintWriter; @@ -25,6 +26,7 @@ import java.util.*; import static io.reactiverse.es4x.codegen.generator.Util.*; +import static io.reactiverse.es4x.codegen.generator.Util.getNPMScope; public class OptionsDTS extends Generator { @@ -113,6 +115,17 @@ public String render(DataObjectModel model, int index, int size, Mapio.reactiverse.es4x es4x-generator 0.16.0 - ../.. + ../../pom.xml hot-reload diff --git a/docs/advanced/hot-reload.md b/docs/advanced/hot-reload.md new file mode 100644 index 000000000..2182dbd13 --- /dev/null +++ b/docs/advanced/hot-reload.md @@ -0,0 +1,126 @@ +# Hot Reload + +To speed the development cycles, `es4x` supports simple `hot-reload`. The functionality is very basic. +On a file change, the application will be stopped abruptly and restarted. This feature is not `es4x` +specific, in fact it just relies on `vertx` core functionality. + +## Walk-through + +Imagine the following application composed from 4 source `js` files: + +1. index.js +2. m/a.js +3. m/b.js +4. m/c.js + +The content of these files is as follows: + +### index.js + +```js +const a = require('./m/a'); +a(); +``` + +Call a function defined on a relative module `a`. + +### m/a.js + +```js +const b = require('./b'); + +function a() { + print('Hello from A'); + b(); +} + +module.exports = a; +``` + +Prints a message and calls another module `b`. + +### m/b.js + +```js +const c = require('./c'); + +// changed B +function b() { +print('Hello from B'); +c(); +} + +module.exports = b; +``` + +Prints a message and calls another module `c`. + +### m/c.js + +```js +function c() { + print('Hello from C'); +} + +module.exports = c; +``` + +Prints the final message. + +## Running + +In order to run an application with `hot-reload` all you need is to use the `vert.x` **redeploy** command. + +In this example one would execute: + +```bash +es4x run --redeploy "m/*" index.js +``` + +It is important to know that the redeploy watch list works with files, so in order to watch a directory, one needs to +watch a **wildcard**. + +``` +$ ./node_modules/.bin/es4x --redeploy "m/*" +Watched paths: [/home/hello/./m] +Starting the vert.x application in redeploy mode +Starting vert.x application... +ec467de2-ca71-43c6-98d8-9da0cc0d24f8-redeploy +Hello from A +Hello from B +Hello from C +Succeeded in deploying verticle +``` + +When any of the files under `m` are touched you will see a similar message in the console: + +``` +Redeploying! +Stopping vert.x application 'ec467de2-ca71-43c6-98d8-9da0cc0d24f8-redeploy' +Application 'ec467de2-ca71-43c6-98d8-9da0cc0d24f8-redeploy' terminated with status 0 +Starting vert.x application... +ec467de2-ca71-43c6-98d8-9da0cc0d24f8-redeploy +Redeployment done in 66 ms. +Hello from A +Hello from B +Hello from C +Succeeded in deploying verticle +``` + +This will happen for **each** file you touch. + +## Running a task before redeploy + +While re-deploy is already a time saver, there are usually steps required to be executed before the re-deploy happens. +For example a build step, like compile typescript to javascript, by running `tsc`. For this we can run the application +as: + +```bash +es4x run --redeploy "m/*" --on-redeploy "tsc" index.js +``` + +For more information read the all the options on the `run` command: + +```bash +es4x run --help +``` diff --git a/docs/get-started/debug.md b/docs/get-started/debug.md index 7437eabb2..424057856 100644 --- a/docs/get-started/debug.md +++ b/docs/get-started/debug.md @@ -27,8 +27,12 @@ You will be able to set breakpoints, debug etc... ## Debug from VSCode The usage of Chrome devtools is not a hard requirement. You can also debug the application using -[Visual Studio Code](https://code.visualstudio.com). Create a runner configuration as: +[Visual Studio Code](https://code.visualstudio.com). +::: warning +Before you can debug from the IDE, you need to install the extension: [GraalVM Tools for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm) and create a runner configuration. + +To create the attach configuration either use the helper command, or use the template bellow: ``` es4x vscode @@ -41,18 +45,9 @@ This will create a `launcher.json` similar to this: "version" : "0.2.0", "configurations" : [ { "name" : "Launch empty-project", - "type" : "node", - "request" : "launch", - "cwd" : "${workspaceFolder}", - "runtimeExecutable" : "${workspaceFolder}/node_modules/.bin/es4x-launcher", - "runtimeArgs" : [ "-Dinspect=5858" ], - "port" : 5858, - "outputCapture" : "std", - "serverReadyAction" : { - "pattern" : "started on port ([0-9]+)", - "uriFormat" : "http://localhost:%s", - "action" : "openExternally" - } + "type" : "graalvm", + "request" : "attach", + "port" : 9229 } ] } ``` @@ -60,6 +55,3 @@ This will create a `launcher.json` similar to this: And attach your debugger. ![vscode-chrome-inspector](./res/vscode-debug.png) - -If you print the message `Server started on port 8000` it will be captured by visual studio and a browser window will -open the url in question. diff --git a/es4x/pom.xml b/es4x/pom.xml index 6d730b3ba..d22bdb8de 100644 --- a/es4x/pom.xml +++ b/es4x/pom.xml @@ -4,14 +4,14 @@ io.reactiverse es4x-parent - 0.16.3 - .. + 0.17.0 + ../pom.xml 4.0.0 es4x - 0.16.3 + 0.17.0 UTF-8 diff --git a/es4x/src/main/java/io/reactiverse/es4x/ES4X.java b/es4x/src/main/java/io/reactiverse/es4x/ES4X.java index 76a1ac42d..8f74ac029 100644 --- a/es4x/src/main/java/io/reactiverse/es4x/ES4X.java +++ b/es4x/src/main/java/io/reactiverse/es4x/ES4X.java @@ -26,13 +26,13 @@ public final class ES4X extends Launcher { @Override public void beforeStartingVertx(VertxOptions options) { processProperty("inspect", inspect -> { - System.setProperty("polyglot.inspect", inspect.toString()); + System.setProperty("polyglot.inspect", inspect); System.setProperty("polyglot.inspect.Suspend", "false"); options.setBlockedThreadCheckInterval(1000000); }); processProperty("inspect-brk", inspect -> { - System.setProperty("polyglot.inspect", inspect.toString()); + System.setProperty("polyglot.inspect", inspect); System.setProperty("polyglot.inspect.Suspend", "true"); options.setBlockedThreadCheckInterval(1000000); }); @@ -94,12 +94,17 @@ public static void main(String... args) { } } - private static void processProperty(String name, Consumer consumer) { + private static void processProperty(String name, Consumer consumer) { if (System.getProperties().containsKey(name)) { try { - consumer.accept(Integer.getInteger(name)); + String addr = System.getProperty(name); + if ("".equals(addr)) { + addr = "9229"; + } + consumer.accept(addr); } catch (RuntimeException e) { + System.err.println(e.getMessage()); System.exit(1); } } diff --git a/es4x/src/main/java/io/reactiverse/es4x/impl/JSVerticleFactory.java b/es4x/src/main/java/io/reactiverse/es4x/impl/JSVerticleFactory.java index 1d3213adb..e1ba43eaa 100644 --- a/es4x/src/main/java/io/reactiverse/es4x/impl/JSVerticleFactory.java +++ b/es4x/src/main/java/io/reactiverse/es4x/impl/JSVerticleFactory.java @@ -78,19 +78,13 @@ public void start(Promise startFuture) { runtime.put("global", runtime.eval(Source.create("js", "this"))); } - // wrap the deployment in a execute blocking as blocking io can happen during deploy - vertx - .executeBlocking(deploy -> { - try { - module.invokeMember("runMain", fsVerticleName); - deploy.complete(); - } catch (RuntimeException e) { - deploy.fail(e); - } - }) - .onFailure(startFuture::fail) - .onSuccess(v -> - waitFor(runtime, "deploy").onComplete(startFuture)); + try { + module.invokeMember("runMain", fsVerticleName); + waitFor(runtime, "deploy") + .onComplete(startFuture); + } catch (RuntimeException e) { + startFuture.fail(e); + } } catch (RuntimeException e) { startFuture.fail(e); } diff --git a/es4x/src/main/java/io/reactiverse/es4x/impl/MJSVerticleFactory.java b/es4x/src/main/java/io/reactiverse/es4x/impl/MJSVerticleFactory.java index eb898e088..9f8a004cb 100644 --- a/es4x/src/main/java/io/reactiverse/es4x/impl/MJSVerticleFactory.java +++ b/es4x/src/main/java/io/reactiverse/es4x/impl/MJSVerticleFactory.java @@ -73,33 +73,27 @@ public void start(Promise startFuture) { } else { runtime.put("global", runtime.eval(Source.create("js", "this"))); } - // wrap the deployment in a execute blocking as blocking net/io can happen during deploy - vertx - .executeBlocking(deploy -> { - try { - // the main script buffer - final Buffer buffer = vertx.fileSystem().readFileBlocking(fsVerticleName); - final Source source = Source - .newBuilder("js", new File(fsVerticleName)) - // strip the shebang if present - .content(ESModuleIO.stripShebang(buffer.toString())) - .cached(true) - .interactive(false) - .mimeType("application/javascript+module") - .buildLiteral(); - runtime.eval(source); - deploy.complete(); - } catch (InvalidPathException e) { - deploy.fail("File Not Found: " + fsVerticleName); - } catch (RuntimeException e) { - deploy.fail(e); - } - }, true) - .onFailure(startFuture::fail) - .onSuccess(v -> - waitFor(runtime, "deploy").onComplete(startFuture)); + try { + // the main script buffer + final Buffer buffer = vertx.fileSystem().readFileBlocking(fsVerticleName); + final Source source = Source + .newBuilder("js", new File(fsVerticleName)) + // strip the shebang if present + .content(ESModuleIO.stripShebang(buffer.toString())) + .cached(true) + .interactive(false) + .mimeType("application/javascript+module") + .buildLiteral(); + runtime.eval(source); + waitFor(runtime, "deploy") + .onComplete(startFuture); + } catch (InvalidPathException e) { + startFuture.fail("File Not Found: " + fsVerticleName); + } catch (RuntimeException e) { + startFuture.fail(e); + } } catch (RuntimeException e) { startFuture.fail(e); } diff --git a/es4x/src/test/java/io/reactiverse/es4x/test/FactoryMJSTest.java b/es4x/src/test/java/io/reactiverse/es4x/test/FactoryMJSTest.java index b616668a9..72e8b31fa 100644 --- a/es4x/src/test/java/io/reactiverse/es4x/test/FactoryMJSTest.java +++ b/es4x/src/test/java/io/reactiverse/es4x/test/FactoryMJSTest.java @@ -67,4 +67,20 @@ public void deployUnderSubdirectoryAndPathsStillBeCorrect(TestContext ctx) { })); }); } + + @Test(timeout = 30000) + public void mjsBareResolutionCorrect(TestContext ctx) { + final Async async = ctx.async(); + rule.vertx().deployVerticle("mjs:./lib/main.js", deploy -> { + if (deploy.failed()) { + deploy.cause().printStackTrace(); + } + + ctx.assertTrue(deploy.succeeded()); + rule.vertx().setTimer(1000L, t -> rule.vertx().undeploy(deploy.result(), undeploy -> { + ctx.assertTrue(undeploy.succeeded()); + async.complete(); + })); + }); + } } diff --git a/es4x/src/test/java/regression/Regression21_3.java b/es4x/src/test/java/regression/Regression21_3.java new file mode 100644 index 000000000..96f00d34d --- /dev/null +++ b/es4x/src/test/java/regression/Regression21_3.java @@ -0,0 +1,80 @@ +package regression; + +import io.reactiverse.es4x.ECMAEngine; +import io.reactiverse.es4x.impl.ESModuleIO; +import io.reactiverse.es4x.impl.VertxFileSystem; +import io.vertx.core.Vertx; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.HostAccess; +import org.graalvm.polyglot.PolyglotAccess; +import org.graalvm.polyglot.Source; +import org.junit.Ignore; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; +import java.util.Map; + +public class Regression21_3 { + + static { + System.setProperty("polyglot.inspect", "9229"); + System.setProperty("polyglot.inspect.Suspend", "true"); + System.setProperty("polyglot.inspect.Internal", "true"); + } + + @Test + @Ignore + public void regression() throws InterruptedException, IOException { + + Context context = Context.newBuilder("js") + .allowIO(true) + .allowCreateThread(false) + .allowHostAccess(HostAccess.newBuilder(HostAccess.ALL).allowBufferAccess(true).build()) + .allowPolyglotAccess(PolyglotAccess.NONE) + .allowHostClassLookup(x -> true) + .allowExperimentalOptions(true) + .build(); + + Source source = Source + .newBuilder("js", new File("/home/paulo/index.js").getAbsoluteFile()) + // strip the shebang if present + .content("const System = Java.type('java.lang.System');\n" + + "let env = System.getenv();\n" + +// "let env = new Proxy({}, {\n" + +// " get: function (obj, prop) {\n" + +// " return System.getenv(prop);\n" + +// " }\n" + +// " });\n" + + "print(env.PATH);\n" + + "env;") + .cached(true) + .interactive(false) + .mimeType("application/javascript+module") + .buildLiteral(); + + +// Source source = Source +// .newBuilder("js", +// "const System = Java.type('java.lang.System');\n" + +// "let env = System.getenv();\n" + +//// "let env = new Proxy({}, {\n" + +//// " get: function (obj, prop) {\n" + +//// " return System.getenv(prop);\n" + +//// " }\n" + +//// " });\n" + +// "print(env.PATH);\n" + +// "env;", +// "index.js") +// .cached(true) +// .interactive(false) +// .mimeType("application/javascript+module") +// .build(); + + System.out.println( + context.eval(source).as(Map.class).get("PATH")); + + + Thread.sleep(90_000); + } +} diff --git a/es4x/src/test/resources/META-INF/MANIFEST.MF b/es4x/src/test/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..5b110bf9e --- /dev/null +++ b/es4x/src/test/resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +Import-Map: import-map.json diff --git a/es4x/src/test/resources/import-map.json b/es4x/src/test/resources/import-map.json index 8f74234aa..797e82249 100644 --- a/es4x/src/test/resources/import-map.json +++ b/es4x/src/test/resources/import-map.json @@ -3,7 +3,8 @@ "a": "/a-1.mjs", "b": "/b-1.mjs", "c": "/c-1.mjs", - "verticle4": "./prefix/verticle4.mjs" + "verticle4": "./prefix/verticle4.mjs", + "uppercase.js": "./utils/uppercase.js/index.js" }, "scopes": { "/scope2/": { diff --git a/es4x/src/test/resources/lib/main.js b/es4x/src/test/resources/lib/main.js new file mode 100644 index 000000000..06df6ce7e --- /dev/null +++ b/es4x/src/test/resources/lib/main.js @@ -0,0 +1,3 @@ +// lib/main.js +import { toUpperCase } from 'uppercase.js' +print(toUpperCase('hello graaljs')); diff --git a/es4x/src/test/resources/utils/uppercase.js/index.js b/es4x/src/test/resources/utils/uppercase.js/index.js new file mode 100644 index 000000000..61e359160 --- /dev/null +++ b/es4x/src/test/resources/utils/uppercase.js/index.js @@ -0,0 +1,4 @@ +// utils/uppercase.js/index.js +export function toUpperCase (str) { + return str.toUpperCase(); +} diff --git a/generator/io.reactiverse/elasticsearch-client/pom.xml b/generator/io.reactiverse/elasticsearch-client/pom.xml index bbcc432e3..25488a3a4 100644 --- a/generator/io.reactiverse/elasticsearch-client/pom.xml +++ b/generator/io.reactiverse/elasticsearch-client/pom.xml @@ -8,12 +8,12 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml elasticsearch-client - 0.16.3 + 0.17.0 jar diff --git a/generator/io.reactiverse/reactiverse-contextual-logging/pom.xml b/generator/io.reactiverse/reactiverse-contextual-logging/pom.xml index 4db1780fb..247c94eeb 100644 --- a/generator/io.reactiverse/reactiverse-contextual-logging/pom.xml +++ b/generator/io.reactiverse/reactiverse-contextual-logging/pom.xml @@ -8,12 +8,12 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml reactiverse-contextual-logging - 0.16.3 + 0.17.0 jar @@ -29,7 +29,7 @@ } 1.2.3 - 2.17.0 + 2.17.1 diff --git a/generator/io.vertx/pom.xml b/generator/io.vertx/pom.xml index 233ec43f8..447e5469e 100644 --- a/generator/io.vertx/pom.xml +++ b/generator/io.vertx/pom.xml @@ -8,12 +8,12 @@ io.reactiverse es4x-parent - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml es4x-vertx-stack - 0.16.3 + 0.17.0 diff --git a/generator/io.vertx/vertx-amqp-client/pom.xml b/generator/io.vertx/vertx-amqp-client/pom.xml index 077146168..6b50ee873 100644 --- a/generator/io.vertx/vertx-amqp-client/pom.xml +++ b/generator/io.vertx/vertx-amqp-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-amqp-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-common/pom.xml b/generator/io.vertx/vertx-auth-common/pom.xml index 83adc1a04..5f5bcff56 100644 --- a/generator/io.vertx/vertx-auth-common/pom.xml +++ b/generator/io.vertx/vertx-auth-common/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-common - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-htdigest/pom.xml b/generator/io.vertx/vertx-auth-htdigest/pom.xml index e1d02a935..0755a3d03 100644 --- a/generator/io.vertx/vertx-auth-htdigest/pom.xml +++ b/generator/io.vertx/vertx-auth-htdigest/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-htdigest - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-htpasswd/pom.xml b/generator/io.vertx/vertx-auth-htpasswd/pom.xml index e5ba9b362..dc735a66e 100644 --- a/generator/io.vertx/vertx-auth-htpasswd/pom.xml +++ b/generator/io.vertx/vertx-auth-htpasswd/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-htpasswd - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-jdbc/pom.xml b/generator/io.vertx/vertx-auth-jdbc/pom.xml index d548ea7c8..55e892d74 100644 --- a/generator/io.vertx/vertx-auth-jdbc/pom.xml +++ b/generator/io.vertx/vertx-auth-jdbc/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-jdbc - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-jwt/pom.xml b/generator/io.vertx/vertx-auth-jwt/pom.xml index 19ddeef1c..cac85a94a 100644 --- a/generator/io.vertx/vertx-auth-jwt/pom.xml +++ b/generator/io.vertx/vertx-auth-jwt/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-jwt - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-ldap/pom.xml b/generator/io.vertx/vertx-auth-ldap/pom.xml index 6be5cabb8..8806e8893 100644 --- a/generator/io.vertx/vertx-auth-ldap/pom.xml +++ b/generator/io.vertx/vertx-auth-ldap/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-ldap - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-mongo/pom.xml b/generator/io.vertx/vertx-auth-mongo/pom.xml index 96b5887ae..908cd3986 100644 --- a/generator/io.vertx/vertx-auth-mongo/pom.xml +++ b/generator/io.vertx/vertx-auth-mongo/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-mongo - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-oauth2/pom.xml b/generator/io.vertx/vertx-auth-oauth2/pom.xml index ef747df59..7462d5690 100644 --- a/generator/io.vertx/vertx-auth-oauth2/pom.xml +++ b/generator/io.vertx/vertx-auth-oauth2/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-oauth2 - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-otp/pom.xml b/generator/io.vertx/vertx-auth-otp/pom.xml index 91c82049e..15a1fad3c 100644 --- a/generator/io.vertx/vertx-auth-otp/pom.xml +++ b/generator/io.vertx/vertx-auth-otp/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-otp - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-properties/pom.xml b/generator/io.vertx/vertx-auth-properties/pom.xml index 45c56517a..422b2b83d 100644 --- a/generator/io.vertx/vertx-auth-properties/pom.xml +++ b/generator/io.vertx/vertx-auth-properties/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-properties - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-shiro/pom.xml b/generator/io.vertx/vertx-auth-shiro/pom.xml index 6d291267e..5e9cb712c 100644 --- a/generator/io.vertx/vertx-auth-shiro/pom.xml +++ b/generator/io.vertx/vertx-auth-shiro/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-shiro - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-sql-client/pom.xml b/generator/io.vertx/vertx-auth-sql-client/pom.xml index 04049a2c7..006e7149a 100644 --- a/generator/io.vertx/vertx-auth-sql-client/pom.xml +++ b/generator/io.vertx/vertx-auth-sql-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-sql-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-auth-webauthn/pom.xml b/generator/io.vertx/vertx-auth-webauthn/pom.xml index 3e2ac2d57..732ff4f55 100644 --- a/generator/io.vertx/vertx-auth-webauthn/pom.xml +++ b/generator/io.vertx/vertx-auth-webauthn/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-auth-webauthn - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-bridge-common/pom.xml b/generator/io.vertx/vertx-bridge-common/pom.xml index b31e16711..363a8dae4 100644 --- a/generator/io.vertx/vertx-bridge-common/pom.xml +++ b/generator/io.vertx/vertx-bridge-common/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-bridge-common - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-camel-bridge/pom.xml b/generator/io.vertx/vertx-camel-bridge/pom.xml index 343c9c216..b5d8173a8 100644 --- a/generator/io.vertx/vertx-camel-bridge/pom.xml +++ b/generator/io.vertx/vertx-camel-bridge/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-camel-bridge - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-cassandra-client/pom.xml b/generator/io.vertx/vertx-cassandra-client/pom.xml index bb325ca4c..18e36a8c1 100644 --- a/generator/io.vertx/vertx-cassandra-client/pom.xml +++ b/generator/io.vertx/vertx-cassandra-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-cassandra-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-circuit-breaker/pom.xml b/generator/io.vertx/vertx-circuit-breaker/pom.xml index ab6baf2e1..0a439f046 100644 --- a/generator/io.vertx/vertx-circuit-breaker/pom.xml +++ b/generator/io.vertx/vertx-circuit-breaker/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-circuit-breaker - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-config-consul/pom.xml b/generator/io.vertx/vertx-config-consul/pom.xml index ba7858054..ebe39eb82 100644 --- a/generator/io.vertx/vertx-config-consul/pom.xml +++ b/generator/io.vertx/vertx-config-consul/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-git/pom.xml b/generator/io.vertx/vertx-config-git/pom.xml index 2c3a7e367..ac959afd0 100644 --- a/generator/io.vertx/vertx-config-git/pom.xml +++ b/generator/io.vertx/vertx-config-git/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-hocon/pom.xml b/generator/io.vertx/vertx-config-hocon/pom.xml index 0aad28a64..0be5ef79f 100644 --- a/generator/io.vertx/vertx-config-hocon/pom.xml +++ b/generator/io.vertx/vertx-config-hocon/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml b/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml index 2f1047efc..76474f4bc 100644 --- a/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml +++ b/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-redis/pom.xml b/generator/io.vertx/vertx-config-redis/pom.xml index 1a152a67b..24c098e76 100644 --- a/generator/io.vertx/vertx-config-redis/pom.xml +++ b/generator/io.vertx/vertx-config-redis/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-spring-config-server/pom.xml b/generator/io.vertx/vertx-config-spring-config-server/pom.xml index 5f1d58746..0c738b2c0 100644 --- a/generator/io.vertx/vertx-config-spring-config-server/pom.xml +++ b/generator/io.vertx/vertx-config-spring-config-server/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-vault/pom.xml b/generator/io.vertx/vertx-config-vault/pom.xml index 4c37072be..5ad24cd5b 100644 --- a/generator/io.vertx/vertx-config-vault/pom.xml +++ b/generator/io.vertx/vertx-config-vault/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.1-SNAPSHOT - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-yaml/pom.xml b/generator/io.vertx/vertx-config-yaml/pom.xml index e3d1d8daa..1b68d03f8 100644 --- a/generator/io.vertx/vertx-config-yaml/pom.xml +++ b/generator/io.vertx/vertx-config-yaml/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config-zookeeper/pom.xml b/generator/io.vertx/vertx-config-zookeeper/pom.xml index 340edf892..14cb46dae 100644 --- a/generator/io.vertx/vertx-config-zookeeper/pom.xml +++ b/generator/io.vertx/vertx-config-zookeeper/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-config/pom.xml b/generator/io.vertx/vertx-config/pom.xml index 8e43ecb75..64b1d9c11 100644 --- a/generator/io.vertx/vertx-config/pom.xml +++ b/generator/io.vertx/vertx-config/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-config - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-consul-client/pom.xml b/generator/io.vertx/vertx-consul-client/pom.xml index ecfbf0fe1..2bd4346ec 100644 --- a/generator/io.vertx/vertx-consul-client/pom.xml +++ b/generator/io.vertx/vertx-consul-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-consul-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-core/pom.xml b/generator/io.vertx/vertx-core/pom.xml index 9c0b14ac2..03e22aa62 100644 --- a/generator/io.vertx/vertx-core/pom.xml +++ b/generator/io.vertx/vertx-core/pom.xml @@ -6,18 +6,18 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-core - 0.16.3 + 0.17.0 1.7.31 - 2.17.0 + 2.17.1 4.1.72.Final 2.11.4 diff --git a/generator/io.vertx/vertx-db2-client/pom.xml b/generator/io.vertx/vertx-db2-client/pom.xml index 4cb0f5b68..49026543d 100644 --- a/generator/io.vertx/vertx-db2-client/pom.xml +++ b/generator/io.vertx/vertx-db2-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-db2-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-dropwizard-metrics/pom.xml b/generator/io.vertx/vertx-dropwizard-metrics/pom.xml index 2bf90fb4c..8de2ce1bf 100644 --- a/generator/io.vertx/vertx-dropwizard-metrics/pom.xml +++ b/generator/io.vertx/vertx-dropwizard-metrics/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-dropwizard-metrics - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-grpc/pom.xml b/generator/io.vertx/vertx-grpc/pom.xml index 78069cdc1..70c550d3b 100644 --- a/generator/io.vertx/vertx-grpc/pom.xml +++ b/generator/io.vertx/vertx-grpc/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-grpc - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-hazelcast/pom.xml b/generator/io.vertx/vertx-hazelcast/pom.xml index 7288e9e50..6bc94ccb1 100644 --- a/generator/io.vertx/vertx-hazelcast/pom.xml +++ b/generator/io.vertx/vertx-hazelcast/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.1-SNAPSHOT - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-health-check/pom.xml b/generator/io.vertx/vertx-health-check/pom.xml index ef1403f9e..df5eea395 100644 --- a/generator/io.vertx/vertx-health-check/pom.xml +++ b/generator/io.vertx/vertx-health-check/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-health-check - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-http-proxy/pom.xml b/generator/io.vertx/vertx-http-proxy/pom.xml index 3fcc1f838..ecfe87228 100644 --- a/generator/io.vertx/vertx-http-proxy/pom.xml +++ b/generator/io.vertx/vertx-http-proxy/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-http-proxy - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-http-service-factory/pom.xml b/generator/io.vertx/vertx-http-service-factory/pom.xml index 9352c92f1..189a34ed6 100644 --- a/generator/io.vertx/vertx-http-service-factory/pom.xml +++ b/generator/io.vertx/vertx-http-service-factory/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-ignite/pom.xml b/generator/io.vertx/vertx-ignite/pom.xml index 82c264b1c..63e26f3cf 100644 --- a/generator/io.vertx/vertx-ignite/pom.xml +++ b/generator/io.vertx/vertx-ignite/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.1-SNAPSHOT - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-infinispan/pom.xml b/generator/io.vertx/vertx-infinispan/pom.xml index 974969891..9d28262d5 100644 --- a/generator/io.vertx/vertx-infinispan/pom.xml +++ b/generator/io.vertx/vertx-infinispan/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.1-SNAPSHOT - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-jdbc-client/pom.xml b/generator/io.vertx/vertx-jdbc-client/pom.xml index f0efd7d78..ee1596483 100644 --- a/generator/io.vertx/vertx-jdbc-client/pom.xml +++ b/generator/io.vertx/vertx-jdbc-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-jdbc-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-json-schema/pom.xml b/generator/io.vertx/vertx-json-schema/pom.xml index cd86f971d..21b02fd12 100644 --- a/generator/io.vertx/vertx-json-schema/pom.xml +++ b/generator/io.vertx/vertx-json-schema/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-json-schema - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-kafka-client/pom.xml b/generator/io.vertx/vertx-kafka-client/pom.xml index de7a3a2a8..16986df63 100644 --- a/generator/io.vertx/vertx-kafka-client/pom.xml +++ b/generator/io.vertx/vertx-kafka-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-kafka-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-mail-client/pom.xml b/generator/io.vertx/vertx-mail-client/pom.xml index 172405568..bcb747b61 100644 --- a/generator/io.vertx/vertx-mail-client/pom.xml +++ b/generator/io.vertx/vertx-mail-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-mail-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-maven-service-factory/pom.xml b/generator/io.vertx/vertx-maven-service-factory/pom.xml index 46c385b16..f7767002d 100644 --- a/generator/io.vertx/vertx-maven-service-factory/pom.xml +++ b/generator/io.vertx/vertx-maven-service-factory/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-micrometer-metrics/pom.xml b/generator/io.vertx/vertx-micrometer-metrics/pom.xml index 03c0d0fa3..8b60dc7f1 100644 --- a/generator/io.vertx/vertx-micrometer-metrics/pom.xml +++ b/generator/io.vertx/vertx-micrometer-metrics/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-micrometer-metrics - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-mongo-client/pom.xml b/generator/io.vertx/vertx-mongo-client/pom.xml index 52b45878b..4cf5e45c3 100644 --- a/generator/io.vertx/vertx-mongo-client/pom.xml +++ b/generator/io.vertx/vertx-mongo-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-mongo-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-mongo-service/pom.xml b/generator/io.vertx/vertx-mongo-service/pom.xml index 9e5b475db..4ced739bc 100644 --- a/generator/io.vertx/vertx-mongo-service/pom.xml +++ b/generator/io.vertx/vertx-mongo-service/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.9.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-mqtt/pom.xml b/generator/io.vertx/vertx-mqtt/pom.xml index ac97a697d..fe856ed98 100644 --- a/generator/io.vertx/vertx-mqtt/pom.xml +++ b/generator/io.vertx/vertx-mqtt/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-mqtt - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-mssql-client/pom.xml b/generator/io.vertx/vertx-mssql-client/pom.xml index 29ebf5c42..dc7beacc2 100644 --- a/generator/io.vertx/vertx-mssql-client/pom.xml +++ b/generator/io.vertx/vertx-mssql-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-mssql-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-mysql-client/pom.xml b/generator/io.vertx/vertx-mysql-client/pom.xml index b618e7b3c..e34910a56 100644 --- a/generator/io.vertx/vertx-mysql-client/pom.xml +++ b/generator/io.vertx/vertx-mysql-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-mysql-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-opentracing/pom.xml b/generator/io.vertx/vertx-opentracing/pom.xml index 4af4f2974..634eb866f 100644 --- a/generator/io.vertx/vertx-opentracing/pom.xml +++ b/generator/io.vertx/vertx-opentracing/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-opentracing - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-oracle-client/pom.xml b/generator/io.vertx/vertx-oracle-client/pom.xml index cdd443cac..0129d5a6d 100644 --- a/generator/io.vertx/vertx-oracle-client/pom.xml +++ b/generator/io.vertx/vertx-oracle-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-oracle-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-pg-client/pom.xml b/generator/io.vertx/vertx-pg-client/pom.xml index 09266dee5..1434c8d0f 100644 --- a/generator/io.vertx/vertx-pg-client/pom.xml +++ b/generator/io.vertx/vertx-pg-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-pg-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-proton/pom.xml b/generator/io.vertx/vertx-proton/pom.xml index 4e52c08a4..dd3d7d8ca 100644 --- a/generator/io.vertx/vertx-proton/pom.xml +++ b/generator/io.vertx/vertx-proton/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-proton - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-rabbitmq-client/pom.xml b/generator/io.vertx/vertx-rabbitmq-client/pom.xml index dc6aa33d6..3368ae7e7 100644 --- a/generator/io.vertx/vertx-rabbitmq-client/pom.xml +++ b/generator/io.vertx/vertx-rabbitmq-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-rabbitmq-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-redis-client/pom.xml b/generator/io.vertx/vertx-redis-client/pom.xml index 2e751cfb8..c2363d3fd 100644 --- a/generator/io.vertx/vertx-redis-client/pom.xml +++ b/generator/io.vertx/vertx-redis-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-redis-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-service-discovery-backend-consul/pom.xml b/generator/io.vertx/vertx-service-discovery-backend-consul/pom.xml index 1637abcf6..9be6629c8 100644 --- a/generator/io.vertx/vertx-service-discovery-backend-consul/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-backend-consul/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-backend-redis/pom.xml b/generator/io.vertx/vertx-service-discovery-backend-redis/pom.xml index bd4459e73..181f2714c 100644 --- a/generator/io.vertx/vertx-service-discovery-backend-redis/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-backend-redis/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-backend-zookeeper/pom.xml b/generator/io.vertx/vertx-service-discovery-backend-zookeeper/pom.xml index 762df69df..56795ebd4 100644 --- a/generator/io.vertx/vertx-service-discovery-backend-zookeeper/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-backend-zookeeper/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-bridge-consul/pom.xml b/generator/io.vertx/vertx-service-discovery-bridge-consul/pom.xml index c8ffb348b..e9154c7e5 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-consul/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-consul/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-bridge-docker-links/pom.xml b/generator/io.vertx/vertx-service-discovery-bridge-docker-links/pom.xml index 5509dda0e..1fafb6f53 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-docker-links/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-docker-links/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-bridge-docker/pom.xml b/generator/io.vertx/vertx-service-discovery-bridge-docker/pom.xml index b4a1de249..894f86592 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-docker/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-docker/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-bridge-kubernetes/pom.xml b/generator/io.vertx/vertx-service-discovery-bridge-kubernetes/pom.xml index b0fbe5510..5da05457e 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-kubernetes/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-kubernetes/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml b/generator/io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml index 03ab9d68e..45761de8c 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-discovery/pom.xml b/generator/io.vertx/vertx-service-discovery/pom.xml index dbae7cffd..f883dd644 100644 --- a/generator/io.vertx/vertx-service-discovery/pom.xml +++ b/generator/io.vertx/vertx-service-discovery/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-service-discovery - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-service-factory/pom.xml b/generator/io.vertx/vertx-service-factory/pom.xml index 056d824dd..29985e84f 100644 --- a/generator/io.vertx/vertx-service-factory/pom.xml +++ b/generator/io.vertx/vertx-service-factory/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-service-proxy/pom.xml b/generator/io.vertx/vertx-service-proxy/pom.xml index 6b185a12a..c7f857e7b 100644 --- a/generator/io.vertx/vertx-service-proxy/pom.xml +++ b/generator/io.vertx/vertx-service-proxy/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-service-proxy - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-shell/pom.xml b/generator/io.vertx/vertx-shell/pom.xml index 8e29dc6cc..59e76a788 100644 --- a/generator/io.vertx/vertx-shell/pom.xml +++ b/generator/io.vertx/vertx-shell/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-shell - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-sockjs-service-proxy/pom.xml b/generator/io.vertx/vertx-sockjs-service-proxy/pom.xml index 994ce5434..5dde370d0 100644 --- a/generator/io.vertx/vertx-sockjs-service-proxy/pom.xml +++ b/generator/io.vertx/vertx-sockjs-service-proxy/pom.xml @@ -7,7 +7,7 @@ io.reactiverse.es4x es4x-generator 0.14.0 - ../.. + ../../pom.xml 4.0.0 diff --git a/generator/io.vertx/vertx-sql-client-templates/pom.xml b/generator/io.vertx/vertx-sql-client-templates/pom.xml index 3b990272d..8accaa9b7 100644 --- a/generator/io.vertx/vertx-sql-client-templates/pom.xml +++ b/generator/io.vertx/vertx-sql-client-templates/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-sql-client-templates - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-sql-client/pom.xml b/generator/io.vertx/vertx-sql-client/pom.xml index 90a4bc13d..121a7f58f 100644 --- a/generator/io.vertx/vertx-sql-client/pom.xml +++ b/generator/io.vertx/vertx-sql-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-sql-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-stomp/pom.xml b/generator/io.vertx/vertx-stomp/pom.xml index 530bb3dd7..c9ef2880a 100644 --- a/generator/io.vertx/vertx-stomp/pom.xml +++ b/generator/io.vertx/vertx-stomp/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-stomp - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-tcp-eventbus-bridge/pom.xml b/generator/io.vertx/vertx-tcp-eventbus-bridge/pom.xml index 39319dbef..16b0120d9 100644 --- a/generator/io.vertx/vertx-tcp-eventbus-bridge/pom.xml +++ b/generator/io.vertx/vertx-tcp-eventbus-bridge/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-tcp-eventbus-bridge - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-unit/pom.xml b/generator/io.vertx/vertx-unit/pom.xml index cc43b1466..e5ca52043 100644 --- a/generator/io.vertx/vertx-unit/pom.xml +++ b/generator/io.vertx/vertx-unit/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-unit - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-api-contract/pom.xml b/generator/io.vertx/vertx-web-api-contract/pom.xml index 21b944c1e..66b621164 100644 --- a/generator/io.vertx/vertx-web-api-contract/pom.xml +++ b/generator/io.vertx/vertx-web-api-contract/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-api-contract - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-api-service/pom.xml b/generator/io.vertx/vertx-web-api-service/pom.xml index 7219adecb..547676995 100644 --- a/generator/io.vertx/vertx-web-api-service/pom.xml +++ b/generator/io.vertx/vertx-web-api-service/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-api-service - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-client/pom.xml b/generator/io.vertx/vertx-web-client/pom.xml index 38b9d164d..1c55e460c 100644 --- a/generator/io.vertx/vertx-web-client/pom.xml +++ b/generator/io.vertx/vertx-web-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-client - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-common/pom.xml b/generator/io.vertx/vertx-web-common/pom.xml index 90b44e72c..27d38aa72 100644 --- a/generator/io.vertx/vertx-web-common/pom.xml +++ b/generator/io.vertx/vertx-web-common/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-common - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-graphql/pom.xml b/generator/io.vertx/vertx-web-graphql/pom.xml index 8b6723ffb..3b0eb933f 100644 --- a/generator/io.vertx/vertx-web-graphql/pom.xml +++ b/generator/io.vertx/vertx-web-graphql/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-graphql - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-openapi/pom.xml b/generator/io.vertx/vertx-web-openapi/pom.xml index 412e80fdc..83b2a55cf 100644 --- a/generator/io.vertx/vertx-web-openapi/pom.xml +++ b/generator/io.vertx/vertx-web-openapi/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-openapi - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-sstore-cookie/pom.xml b/generator/io.vertx/vertx-web-sstore-cookie/pom.xml index 9a4babbb3..ed1d820ee 100644 --- a/generator/io.vertx/vertx-web-sstore-cookie/pom.xml +++ b/generator/io.vertx/vertx-web-sstore-cookie/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-sstore-cookie - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-sstore-redis/pom.xml b/generator/io.vertx/vertx-web-sstore-redis/pom.xml index 852ce5fe1..9c371a8fe 100644 --- a/generator/io.vertx/vertx-web-sstore-redis/pom.xml +++ b/generator/io.vertx/vertx-web-sstore-redis/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-sstore-redis - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-freemarker/pom.xml b/generator/io.vertx/vertx-web-templ-freemarker/pom.xml index c8cf592cc..dab0a85ec 100644 --- a/generator/io.vertx/vertx-web-templ-freemarker/pom.xml +++ b/generator/io.vertx/vertx-web-templ-freemarker/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-freemarker - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-handlebars/pom.xml b/generator/io.vertx/vertx-web-templ-handlebars/pom.xml index 5e19e8b43..fd506aaa3 100644 --- a/generator/io.vertx/vertx-web-templ-handlebars/pom.xml +++ b/generator/io.vertx/vertx-web-templ-handlebars/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-handlebars - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-httl/pom.xml b/generator/io.vertx/vertx-web-templ-httl/pom.xml index 6f109528b..f5b4641dc 100644 --- a/generator/io.vertx/vertx-web-templ-httl/pom.xml +++ b/generator/io.vertx/vertx-web-templ-httl/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-httl - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-jade/pom.xml b/generator/io.vertx/vertx-web-templ-jade/pom.xml index edf8cd383..20d00ebdd 100644 --- a/generator/io.vertx/vertx-web-templ-jade/pom.xml +++ b/generator/io.vertx/vertx-web-templ-jade/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-jade - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-jte/pom.xml b/generator/io.vertx/vertx-web-templ-jte/pom.xml index d4df51dff..84afe5ab4 100644 --- a/generator/io.vertx/vertx-web-templ-jte/pom.xml +++ b/generator/io.vertx/vertx-web-templ-jte/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-jte - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-mvel/pom.xml b/generator/io.vertx/vertx-web-templ-mvel/pom.xml index b64efef3f..c748093b1 100644 --- a/generator/io.vertx/vertx-web-templ-mvel/pom.xml +++ b/generator/io.vertx/vertx-web-templ-mvel/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-mvel - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-pebble/pom.xml b/generator/io.vertx/vertx-web-templ-pebble/pom.xml index 16b652efb..d3ed6c87f 100644 --- a/generator/io.vertx/vertx-web-templ-pebble/pom.xml +++ b/generator/io.vertx/vertx-web-templ-pebble/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-pebble - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-rocker/pom.xml b/generator/io.vertx/vertx-web-templ-rocker/pom.xml index b9344b6dd..f8ab669ef 100644 --- a/generator/io.vertx/vertx-web-templ-rocker/pom.xml +++ b/generator/io.vertx/vertx-web-templ-rocker/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-rocker - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-rythm/pom.xml b/generator/io.vertx/vertx-web-templ-rythm/pom.xml index 95bc4129a..4dec0988f 100644 --- a/generator/io.vertx/vertx-web-templ-rythm/pom.xml +++ b/generator/io.vertx/vertx-web-templ-rythm/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-rythm - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-templ-thymeleaf/pom.xml b/generator/io.vertx/vertx-web-templ-thymeleaf/pom.xml index bd0d5ea33..8c11ecaaf 100644 --- a/generator/io.vertx/vertx-web-templ-thymeleaf/pom.xml +++ b/generator/io.vertx/vertx-web-templ-thymeleaf/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-templ-thymeleaf - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web-validation/pom.xml b/generator/io.vertx/vertx-web-validation/pom.xml index f325da04a..e1dfd38e1 100644 --- a/generator/io.vertx/vertx-web-validation/pom.xml +++ b/generator/io.vertx/vertx-web-validation/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web-validation - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-web/pom.xml b/generator/io.vertx/vertx-web/pom.xml index d4586293f..b79cfd6fb 100644 --- a/generator/io.vertx/vertx-web/pom.xml +++ b/generator/io.vertx/vertx-web/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-web - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/io.vertx/vertx-zipkin/pom.xml b/generator/io.vertx/vertx-zipkin/pom.xml index 0ead87aba..b8c025a54 100644 --- a/generator/io.vertx/vertx-zipkin/pom.xml +++ b/generator/io.vertx/vertx-zipkin/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml 4.0.0 vertx-zipkin - 0.16.3 + 0.17.0 io.vertx diff --git a/generator/pom.xml b/generator/pom.xml index e7e752e72..e7b11863e 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -6,13 +6,13 @@ io.reactiverse es4x-parent - 0.16.3 - .. + 0.17.0 + ../pom.xml io.reactiverse.es4x es4x-generator - 0.16.3 + 0.17.0 pom diff --git a/generator/xyz.jetdrone/hot-reload/pom.xml b/generator/xyz.jetdrone/hot-reload/pom.xml index a64e3e488..35eb2d59d 100644 --- a/generator/xyz.jetdrone/hot-reload/pom.xml +++ b/generator/xyz.jetdrone/hot-reload/pom.xml @@ -8,12 +8,12 @@ io.reactiverse.es4x es4x-generator - 0.16.3 - ../.. + 0.17.0 + ../../pom.xml hot-reload - 0.16.3 + 0.17.0 jar diff --git a/pm/pom.xml b/pm/pom.xml index 670438dde..5de6d4b0f 100644 --- a/pm/pom.xml +++ b/pm/pom.xml @@ -4,14 +4,14 @@ io.reactiverse es4x-parent - 0.16.3 - .. + 0.17.0 + ../pom.xml 4.0.0 es4x-pm - 0.16.3 + 0.17.0 UTF-8 diff --git a/pm/src/assembly/bin/es4x b/pm/src/assembly/bin/es4x index 325e4e02b..e084bc7fc 100644 --- a/pm/src/assembly/bin/es4x +++ b/pm/src/assembly/bin/es4x @@ -66,6 +66,6 @@ fi if [[ -f "$BINDIR/es4x-launcher.jar" ]]; then exec "$JAVA_EXE" -XX:+IgnoreUnrecognizedVMOptions $JVMCI $SECURITY_MANAGER $LOGGING_PROPERTIES $JAVA_OPTS $TTY_OPTS -cp "$BINDIR/es4x-launcher.jar:$basedir/../es4x-pm-${project.version}.jar" io.reactiverse.es4x.ES4X "$@" else - echo "Missing $BINDIR/es4x-launcher.jar" >&2 - exit 3 + echo "Please run: \"es4x install\"" >&2 + exit 0 fi diff --git a/pm/src/assembly/bin/es4x-cli.js b/pm/src/assembly/bin/es4x-cli.js index 5401f86d3..0b062fd42 100644 --- a/pm/src/assembly/bin/es4x-cli.js +++ b/pm/src/assembly/bin/es4x-cli.js @@ -86,6 +86,6 @@ if (existsSync(path.join(process.cwd(), launcher))) { subProcess.on('close', process.exit); } else { - console.error(`Missing ${launcher}`); - process.exit(3); + console.error(`Please run "es4x install"`); + process.exit(0); } diff --git a/pm/src/assembly/bin/es4x.cmd b/pm/src/assembly/bin/es4x.cmd index 9375bd299..953049792 100644 --- a/pm/src/assembly/bin/es4x.cmd +++ b/pm/src/assembly/bin/es4x.cmd @@ -43,6 +43,6 @@ IF EXIST "logging.properties" ( IF EXIST "%BINDIR%\es4x-launcher.jar" ( %JAVA_EXE% -XX:+IgnoreUnrecognizedVMOptions %JVMCI% %SECURITY_MANAGER% %LOGGING_PROPERTIES% %JAVA_OPTS% -cp "%BINDIR%\es4x-launcher.jar;%~dp0\..\es4x-pm-${project.version}.jar" io.reactiverse.es4x.ES4X %* ) ELSE ( - ECHO "Missing %BINDIR%\es4x-launcher.jar" - EXIT /B 3 + ECHO "Please run: es4x install" + EXIT /B 0 ) diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/Versions.java b/pm/src/main/java/io/reactiverse/es4x/commands/Versions.java index beae45644..2ddc77cbc 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/Versions.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/Versions.java @@ -62,7 +62,7 @@ private void printUsage() { @Override public void run() { System.out.println("VM: " + System.getProperty("java.vm.name") + " - " + System.getProperty("java.version")); - System.out.println("VM Vendor: " + System.getProperty("java.vendor.version")); + System.out.println("VM Vendor: " + System.getProperty("java.vendor")); // load the versions from vertx if possible try (InputStream is = Versions.class.getClassLoader().getResourceAsStream("META-INF/vertx/vertx-version.txt")) { diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/VscodeCommand.java b/pm/src/main/java/io/reactiverse/es4x/commands/VscodeCommand.java index 40a311e97..cf3350972 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/VscodeCommand.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/VscodeCommand.java @@ -30,33 +30,24 @@ @Summary("Launcher for vscode project.") public class VscodeCommand extends DefaultCommand { - private String launcher; - - @Option(longName = "launcher", shortName = "l") - @Description("The launcher name") - @DefaultValue("npm") - public void setLauncher(String launcher) { - this.launcher = launcher; - } - private void processLauncher(File json) throws IOException { final File pkg = new File(getCwd(), "package.json"); - String app = "Launch"; + String app = "Attach"; if (pkg.exists()) { JSONObject pkgJson = JSON.parseObject(pkg); - app = "Launch " + pkgJson.get("name"); + app = "Attach " + pkgJson.get("name"); } - JSONObject launch = JSON.parseObject(json); + JSONObject attach = JSON.parseObject(json); - if (!launch.has("configurations")) { - launch.put("configurations", new JSONArray()); + if (!attach.has("configurations")) { + attach.put("configurations", new JSONArray()); } - final JSONArray configurations = launch.getJSONArray("configurations"); + final JSONArray configurations = attach.getJSONArray("configurations"); // replace the launcher if already present int toRemove = -1; @@ -75,33 +66,13 @@ private void processLauncher(File json) throws IOException { JSONObject config = new JSONObject(); config.put("name", app); - config.put("type", "node"); + config.put("type", "graalvm"); config.put("request", "launch"); config.put("cwd", "${workspaceFolder}"); - config.put("runtimeExecutable", launcher); - JSONArray args = new JSONArray(); - if ("npm".equals(launcher)) { - // delegate to npm - args.put("start"); - args.put("--"); - } - if ("yarn".equals(launcher)) { - // delegate to npm - args.put("start"); - } - args.put("-Dinspect=9229"); - config.put("runtimeArgs", args); config.put("port", 9229); - config.put("outputCapture", "std"); - // server ready - JSONObject serverReady = new JSONObject(); - serverReady.put("pattern", "started on port ([0-9]+)"); - serverReady.put("uriFormat", "http://localhost:%s"); - serverReady.put("action", "openExternally"); - config.put("serverReadyAction", serverReady); configurations.put(config); - JSON.encodeObject(json, launch); + JSON.encodeObject(json, attach); } @Override diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/WebstormCommand.java b/pm/src/main/java/io/reactiverse/es4x/commands/WebstormCommand.java deleted file mode 100644 index e1984c95a..000000000 --- a/pm/src/main/java/io/reactiverse/es4x/commands/WebstormCommand.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2019 Red Hat, Inc. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * - * The Eclipse Public License is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * The Apache License v2.0 is available at - * http://www.opensource.org/licenses/apache2.0.php - * - * You may elect to redistribute this code under either of these licenses. - */ -package io.reactiverse.es4x.commands; - -import io.vertx.core.cli.CLIException; -import io.vertx.core.cli.annotations.*; -import io.vertx.core.spi.launcher.DefaultCommand; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; - -import static io.reactiverse.es4x.cli.Helper.fatal; - -@Name("webstorm") -@Summary("Launcher for vscode project.") -public class WebstormCommand extends DefaultCommand { - - @Override - public void run() throws CLIException { - File dotRun = new File(getCwd(), ".run"); - final File debug = new File(dotRun, "Debug.run.xml"); - - if (!debug.exists()) { - if (!dotRun.exists() && !dotRun.mkdirs()) { - fatal("Failed to mkdir .run"); - } - try (InputStream in = WebstormCommand.class.getClassLoader() - .getResourceAsStream("META-INF/es4x-commands/Debug.run.xml")) { - if (in == null) { - fatal("Cannot load webstorm launcher template."); - } else { - Files.copy(in, debug.toPath()); - } - } catch (IOException e) { - fatal(e.getMessage()); - } - } - } -} diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/WebstormCommandFactory.java b/pm/src/main/java/io/reactiverse/es4x/commands/WebstormCommandFactory.java deleted file mode 100644 index 166d96c1d..000000000 --- a/pm/src/main/java/io/reactiverse/es4x/commands/WebstormCommandFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2019 Red Hat, Inc. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * - * The Eclipse Public License is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * The Apache License v2.0 is available at - * http://www.opensource.org/licenses/apache2.0.php - * - * You may elect to redistribute this code under either of these licenses. - */ -package io.reactiverse.es4x.commands; - -import io.vertx.core.spi.launcher.DefaultCommandFactory; - -public class WebstormCommandFactory extends DefaultCommandFactory { - - public WebstormCommandFactory() { - super(WebstormCommand.class, WebstormCommand::new); - } -} diff --git a/pm/src/main/resources/META-INF/services/io.vertx.core.spi.launcher.CommandFactory b/pm/src/main/resources/META-INF/services/io.vertx.core.spi.launcher.CommandFactory index 4b229b3fb..8b467fbbe 100644 --- a/pm/src/main/resources/META-INF/services/io.vertx.core.spi.launcher.CommandFactory +++ b/pm/src/main/resources/META-INF/services/io.vertx.core.spi.launcher.CommandFactory @@ -4,5 +4,4 @@ io.reactiverse.es4x.commands.ProjectCommandFactory io.reactiverse.es4x.commands.VersionsCommandFactory io.reactiverse.es4x.commands.JLinkCommandFactory io.reactiverse.es4x.commands.VscodeCommandFactory -io.reactiverse.es4x.commands.WebstormCommandFactory io.reactiverse.es4x.commands.SecurityPolicyCommandFactory diff --git a/pom.xml b/pom.xml index 0e7fef176..c89c086fb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.reactiverse es4x-parent - 0.16.3 + 0.17.0 pom @@ -14,8 +14,8 @@ 1.8 UTF-8 - 4.2.3 - 21.3.0 + 4.2.4 + 22.0.0 https://oss.sonatype.org/content/repositories/snapshots/