From f0064d97d5d42839c83ce7499ec7c28f51335437 Mon Sep 17 00:00:00 2001 From: Paulo Lopes Date: Wed, 30 Sep 2020 09:22:49 +0200 Subject: [PATCH 1/6] Update versions for hotfix --- codegen/pom.xml | 4 ++-- es4x/pom.xml | 4 ++-- generator/io.reactiverse/elasticsearch-client/pom.xml | 4 ++-- generator/io.vertx/pom.xml | 4 ++-- generator/io.vertx/vertx-amqp-bridge/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-common/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-htdigest/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-htpasswd/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-jdbc/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-jwt/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-mongo/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-oauth2/pom.xml | 4 ++-- generator/io.vertx/vertx-auth-shiro/pom.xml | 4 ++-- generator/io.vertx/vertx-bridge-common/pom.xml | 4 ++-- generator/io.vertx/vertx-cassandra-client/pom.xml | 4 ++-- generator/io.vertx/vertx-circuit-breaker/pom.xml | 4 ++-- generator/io.vertx/vertx-config-consul/pom.xml | 4 ++-- generator/io.vertx/vertx-config-git/pom.xml | 4 ++-- generator/io.vertx/vertx-config-hocon/pom.xml | 4 ++-- generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml | 4 ++-- generator/io.vertx/vertx-config-redis/pom.xml | 4 ++-- generator/io.vertx/vertx-config-spring-config-server/pom.xml | 4 ++-- generator/io.vertx/vertx-config-vault/pom.xml | 4 ++-- generator/io.vertx/vertx-config-yaml/pom.xml | 4 ++-- generator/io.vertx/vertx-config-zookeeper/pom.xml | 4 ++-- generator/io.vertx/vertx-config/pom.xml | 4 ++-- generator/io.vertx/vertx-consul-client/pom.xml | 4 ++-- generator/io.vertx/vertx-core/pom.xml | 4 ++-- generator/io.vertx/vertx-dropwizard-metrics/pom.xml | 4 ++-- generator/io.vertx/vertx-health-check/pom.xml | 4 ++-- generator/io.vertx/vertx-jdbc-client/pom.xml | 4 ++-- generator/io.vertx/vertx-jwt/pom.xml | 4 ++-- generator/io.vertx/vertx-kafka-client/pom.xml | 4 ++-- generator/io.vertx/vertx-mail-client/pom.xml | 4 ++-- generator/io.vertx/vertx-micrometer-metrics/pom.xml | 4 ++-- generator/io.vertx/vertx-mongo-client/pom.xml | 4 ++-- generator/io.vertx/vertx-mqtt/pom.xml | 4 ++-- generator/io.vertx/vertx-mysql-client/pom.xml | 4 ++-- generator/io.vertx/vertx-mysql-postgresql-client/pom.xml | 4 ++-- generator/io.vertx/vertx-pg-client/pom.xml | 4 ++-- generator/io.vertx/vertx-rabbitmq-client/pom.xml | 4 ++-- generator/io.vertx/vertx-redis-client/pom.xml | 4 ++-- .../io.vertx/vertx-service-discovery-backend-consul/pom.xml | 4 ++-- .../io.vertx/vertx-service-discovery-backend-redis/pom.xml | 4 ++-- .../vertx-service-discovery-backend-zookeeper/pom.xml | 4 ++-- .../io.vertx/vertx-service-discovery-bridge-consul/pom.xml | 4 ++-- .../vertx-service-discovery-bridge-docker-links/pom.xml | 4 ++-- .../io.vertx/vertx-service-discovery-bridge-docker/pom.xml | 4 ++-- .../vertx-service-discovery-bridge-kubernetes/pom.xml | 4 ++-- .../io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml | 4 ++-- generator/io.vertx/vertx-service-discovery/pom.xml | 4 ++-- generator/io.vertx/vertx-service-proxy/pom.xml | 4 ++-- generator/io.vertx/vertx-shell/pom.xml | 4 ++-- generator/io.vertx/vertx-sql-client/pom.xml | 4 ++-- generator/io.vertx/vertx-sql-common/pom.xml | 4 ++-- generator/io.vertx/vertx-stomp/pom.xml | 4 ++-- generator/io.vertx/vertx-tcp-eventbus-bridge/pom.xml | 4 ++-- generator/io.vertx/vertx-unit/pom.xml | 4 ++-- generator/io.vertx/vertx-web-api-contract/pom.xml | 4 ++-- generator/io.vertx/vertx-web-client/pom.xml | 4 ++-- generator/io.vertx/vertx-web-common/pom.xml | 4 ++-- generator/io.vertx/vertx-web-graphql/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-freemarker/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-handlebars/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-jade/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-mvel/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-pebble/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-rocker/pom.xml | 4 ++-- generator/io.vertx/vertx-web-templ-thymeleaf/pom.xml | 4 ++-- generator/io.vertx/vertx-web/pom.xml | 4 ++-- generator/pom.xml | 4 ++-- generator/xyz.jetdrone/hot-reload/pom.xml | 4 ++-- pm/pom.xml | 4 ++-- pom.xml | 2 +- 74 files changed, 147 insertions(+), 147 deletions(-) diff --git a/codegen/pom.xml b/codegen/pom.xml index 655426eff..8bcbf50f5 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -6,14 +6,14 @@ io.reactiverse es4x-parent - 0.13.1 + 0.13.2 .. 4.0.0 es4x-codegen - 0.13.1 + 0.13.2 ${java.home}/../lib/tools.jar diff --git a/es4x/pom.xml b/es4x/pom.xml index 33b5178e6..fc3a87eec 100644 --- a/es4x/pom.xml +++ b/es4x/pom.xml @@ -6,14 +6,14 @@ io.reactiverse es4x-parent - 0.13.1 + 0.13.2 .. 4.0.0 es4x - 0.13.1 + 0.13.2 UTF-8 diff --git a/generator/io.reactiverse/elasticsearch-client/pom.xml b/generator/io.reactiverse/elasticsearch-client/pom.xml index a927e0040..1bd8f9983 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.13.1 + 0.13.2 ../.. elasticsearch-client - 0.13.1 + 0.13.2 jar diff --git a/generator/io.vertx/pom.xml b/generator/io.vertx/pom.xml index 370b0699f..0c7553a83 100644 --- a/generator/io.vertx/pom.xml +++ b/generator/io.vertx/pom.xml @@ -8,12 +8,12 @@ io.reactiverse es4x-parent - 0.13.1 + 0.13.2 ../.. es4x-vertx-stack - 0.13.1 + 0.13.2 diff --git a/generator/io.vertx/vertx-amqp-bridge/pom.xml b/generator/io.vertx/vertx-amqp-bridge/pom.xml index 577eef7b2..5477a56bc 100644 --- a/generator/io.vertx/vertx-amqp-bridge/pom.xml +++ b/generator/io.vertx/vertx-amqp-bridge/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-amqp-bridge - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-common/pom.xml b/generator/io.vertx/vertx-auth-common/pom.xml index 577b80622..3227d6ae0 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-common - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-htdigest/pom.xml b/generator/io.vertx/vertx-auth-htdigest/pom.xml index 9d98035e6..e12e0244d 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-htdigest - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-htpasswd/pom.xml b/generator/io.vertx/vertx-auth-htpasswd/pom.xml index 033665f2c..41da92453 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-htpasswd - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-jdbc/pom.xml b/generator/io.vertx/vertx-auth-jdbc/pom.xml index 3557cb864..9df690d59 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-jdbc - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-jwt/pom.xml b/generator/io.vertx/vertx-auth-jwt/pom.xml index 7a33df280..1abf6f2a3 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-jwt - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-mongo/pom.xml b/generator/io.vertx/vertx-auth-mongo/pom.xml index 9f5f3bd5f..4b3a31d35 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-mongo - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-oauth2/pom.xml b/generator/io.vertx/vertx-auth-oauth2/pom.xml index e5f6a6ae2..7069d40ae 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-oauth2 - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-auth-shiro/pom.xml b/generator/io.vertx/vertx-auth-shiro/pom.xml index 0d513c1e7..a0eb4582b 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-auth-shiro - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-bridge-common/pom.xml b/generator/io.vertx/vertx-bridge-common/pom.xml index 6c45b00e2..0a48b43c9 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-bridge-common - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-cassandra-client/pom.xml b/generator/io.vertx/vertx-cassandra-client/pom.xml index 3682c372c..a3d16dae9 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-cassandra-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-circuit-breaker/pom.xml b/generator/io.vertx/vertx-circuit-breaker/pom.xml index 5498cfc15..3ce67a402 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-circuit-breaker - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-consul/pom.xml b/generator/io.vertx/vertx-config-consul/pom.xml index 664290d91..e0dbe107e 100644 --- a/generator/io.vertx/vertx-config-consul/pom.xml +++ b/generator/io.vertx/vertx-config-consul/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-consul - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-git/pom.xml b/generator/io.vertx/vertx-config-git/pom.xml index f516e7342..0d84969ca 100644 --- a/generator/io.vertx/vertx-config-git/pom.xml +++ b/generator/io.vertx/vertx-config-git/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-git - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-hocon/pom.xml b/generator/io.vertx/vertx-config-hocon/pom.xml index a1499e201..1df776391 100644 --- a/generator/io.vertx/vertx-config-hocon/pom.xml +++ b/generator/io.vertx/vertx-config-hocon/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-hocon - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml b/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml index 5c88b1f70..b4503c69b 100644 --- a/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml +++ b/generator/io.vertx/vertx-config-kubernetes-configmap/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-kubernetes-configmap - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-redis/pom.xml b/generator/io.vertx/vertx-config-redis/pom.xml index bdb98ab8c..ba3f8d48b 100644 --- a/generator/io.vertx/vertx-config-redis/pom.xml +++ b/generator/io.vertx/vertx-config-redis/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-redis - 0.13.1 + 0.13.2 io.vertx 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 510e34be7..2083cfcda 100644 --- a/generator/io.vertx/vertx-config-spring-config-server/pom.xml +++ b/generator/io.vertx/vertx-config-spring-config-server/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-spring-config-server - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-vault/pom.xml b/generator/io.vertx/vertx-config-vault/pom.xml index 7c23549d4..b56638932 100644 --- a/generator/io.vertx/vertx-config-vault/pom.xml +++ b/generator/io.vertx/vertx-config-vault/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-vault - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-yaml/pom.xml b/generator/io.vertx/vertx-config-yaml/pom.xml index 37eb15592..f65230f20 100644 --- a/generator/io.vertx/vertx-config-yaml/pom.xml +++ b/generator/io.vertx/vertx-config-yaml/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-yaml - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config-zookeeper/pom.xml b/generator/io.vertx/vertx-config-zookeeper/pom.xml index 097c15486..1fedae6cc 100644 --- a/generator/io.vertx/vertx-config-zookeeper/pom.xml +++ b/generator/io.vertx/vertx-config-zookeeper/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-config-zookeeper - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-config/pom.xml b/generator/io.vertx/vertx-config/pom.xml index fd77e81a8..5b08d9b52 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-config - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-consul-client/pom.xml b/generator/io.vertx/vertx-consul-client/pom.xml index 9cefa21cb..dc9f02610 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-consul-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-core/pom.xml b/generator/io.vertx/vertx-core/pom.xml index 4125028b8..c7e731dc0 100644 --- a/generator/io.vertx/vertx-core/pom.xml +++ b/generator/io.vertx/vertx-core/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-core - 0.13.1 + 0.13.2 1.2.17 diff --git a/generator/io.vertx/vertx-dropwizard-metrics/pom.xml b/generator/io.vertx/vertx-dropwizard-metrics/pom.xml index bf7cda504..8453c1469 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-dropwizard-metrics - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-health-check/pom.xml b/generator/io.vertx/vertx-health-check/pom.xml index b62d94ce4..37a11dbc0 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-health-check - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-jdbc-client/pom.xml b/generator/io.vertx/vertx-jdbc-client/pom.xml index 650071ceb..bbfd63c50 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-jdbc-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-jwt/pom.xml b/generator/io.vertx/vertx-jwt/pom.xml index 4ae1a6b30..49fa18271 100644 --- a/generator/io.vertx/vertx-jwt/pom.xml +++ b/generator/io.vertx/vertx-jwt/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-jwt - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-kafka-client/pom.xml b/generator/io.vertx/vertx-kafka-client/pom.xml index a9ec58e99..5b578d4b0 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-kafka-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-mail-client/pom.xml b/generator/io.vertx/vertx-mail-client/pom.xml index f5754b2e4..189fed590 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-mail-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-micrometer-metrics/pom.xml b/generator/io.vertx/vertx-micrometer-metrics/pom.xml index b07e82476..6b1f7fd80 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-micrometer-metrics - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-mongo-client/pom.xml b/generator/io.vertx/vertx-mongo-client/pom.xml index b186e4c7a..813dec415 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-mongo-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-mqtt/pom.xml b/generator/io.vertx/vertx-mqtt/pom.xml index 7bf23cc3f..8c87df5ff 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-mqtt - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-mysql-client/pom.xml b/generator/io.vertx/vertx-mysql-client/pom.xml index 199760680..478f6b719 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-mysql-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-mysql-postgresql-client/pom.xml b/generator/io.vertx/vertx-mysql-postgresql-client/pom.xml index 5bf1f3b90..5f849d968 100644 --- a/generator/io.vertx/vertx-mysql-postgresql-client/pom.xml +++ b/generator/io.vertx/vertx-mysql-postgresql-client/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-mysql-postgresql-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-pg-client/pom.xml b/generator/io.vertx/vertx-pg-client/pom.xml index caf09f020..adbe17129 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-pg-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-rabbitmq-client/pom.xml b/generator/io.vertx/vertx-rabbitmq-client/pom.xml index 0c84a30fc..78d37c418 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-rabbitmq-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-redis-client/pom.xml b/generator/io.vertx/vertx-redis-client/pom.xml index c71144df1..e549403f0 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-redis-client - 0.13.1 + 0.13.2 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 5e10d0d59..6a5fa83e9 100644 --- a/generator/io.vertx/vertx-service-discovery-backend-consul/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-backend-consul/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-backend-consul - 0.13.1 + 0.13.2 io.vertx 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 2d619e7c6..bedcdcc8e 100644 --- a/generator/io.vertx/vertx-service-discovery-backend-redis/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-backend-redis/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-backend-redis - 0.13.1 + 0.13.2 io.vertx 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 4e75b57f8..7d27eeaec 100644 --- a/generator/io.vertx/vertx-service-discovery-backend-zookeeper/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-backend-zookeeper/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-backend-zookeeper - 0.13.1 + 0.13.2 io.vertx 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 e09338a63..ae9e3a12f 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-consul/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-consul/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-bridge-consul - 0.13.1 + 0.13.2 io.vertx 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 d729fdaed..052ef0fe6 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 @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-bridge-docker-links - 0.13.1 + 0.13.2 io.vertx 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 fc22ae007..9d92afe15 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-docker/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-docker/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-bridge-docker - 0.13.1 + 0.13.2 io.vertx 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 9fb19042d..14c4118e7 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-kubernetes/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-kubernetes/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-bridge-kubernetes - 0.13.1 + 0.13.2 io.vertx 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 efa4c8945..0bda0a89d 100644 --- a/generator/io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml +++ b/generator/io.vertx/vertx-service-discovery-bridge-zookeeper/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery-bridge-zookeeper - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-service-discovery/pom.xml b/generator/io.vertx/vertx-service-discovery/pom.xml index 8d563e5d5..3f7a6b6e1 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-discovery - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-service-proxy/pom.xml b/generator/io.vertx/vertx-service-proxy/pom.xml index 0e650e925..54b6d59e1 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-service-proxy - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-shell/pom.xml b/generator/io.vertx/vertx-shell/pom.xml index 4a500747d..33fb6a3f7 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-shell - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-sql-client/pom.xml b/generator/io.vertx/vertx-sql-client/pom.xml index 0ecbee6b7..66949d36a 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-sql-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-sql-common/pom.xml b/generator/io.vertx/vertx-sql-common/pom.xml index 9039f799e..d61d1e074 100644 --- a/generator/io.vertx/vertx-sql-common/pom.xml +++ b/generator/io.vertx/vertx-sql-common/pom.xml @@ -6,14 +6,14 @@ io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 ../.. 4.0.0 vertx-sql-common - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-stomp/pom.xml b/generator/io.vertx/vertx-stomp/pom.xml index ad6ea9250..881010d22 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-stomp - 0.13.1 + 0.13.2 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 4be99f72e..788f3b2f6 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-tcp-eventbus-bridge - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-unit/pom.xml b/generator/io.vertx/vertx-unit/pom.xml index fb6df9a4f..9f7e73a5e 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-unit - 0.13.1 + 0.13.2 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 b27e9a8f5..941513f71 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-api-contract - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-web-client/pom.xml b/generator/io.vertx/vertx-web-client/pom.xml index 4b13e2cb1..1d11f4b66 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-client - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-web-common/pom.xml b/generator/io.vertx/vertx-web-common/pom.xml index 560ea748f..5a68e85f5 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-common - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-web-graphql/pom.xml b/generator/io.vertx/vertx-web-graphql/pom.xml index b5edd4706..4f11465ad 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-graphql - 0.13.1 + 0.13.2 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 e1145056e..e35bd125e 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-freemarker - 0.13.1 + 0.13.2 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 cbab9e8c2..c3c2997c2 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-handlebars - 0.13.1 + 0.13.2 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 aafee2417..f2f559733 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-jade - 0.13.1 + 0.13.2 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 43f159e9f..8204d6966 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-mvel - 0.13.1 + 0.13.2 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 b078a6fb1..0635dcd28 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-pebble - 0.13.1 + 0.13.2 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 257add1cf..329e66fb1 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-rocker - 0.13.1 + 0.13.2 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 af6dc7fac..009f4822d 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web-templ-thymeleaf - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/io.vertx/vertx-web/pom.xml b/generator/io.vertx/vertx-web/pom.xml index d28a2637c..4d611b1ce 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.13.1 + 0.13.2 ../.. 4.0.0 vertx-web - 0.13.1 + 0.13.2 io.vertx diff --git a/generator/pom.xml b/generator/pom.xml index 5eeca1f61..a7fdccff4 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -6,13 +6,13 @@ io.reactiverse es4x-parent - 0.13.1 + 0.13.2 .. io.reactiverse.es4x es4x-generator - 0.13.1 + 0.13.2 pom diff --git a/generator/xyz.jetdrone/hot-reload/pom.xml b/generator/xyz.jetdrone/hot-reload/pom.xml index 62f64bec7..0bf11eafb 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.13.1 + 0.13.2 ../.. hot-reload - 0.13.1 + 0.13.2 jar diff --git a/pm/pom.xml b/pm/pom.xml index 19645534c..b3c5d7810 100644 --- a/pm/pom.xml +++ b/pm/pom.xml @@ -6,14 +6,14 @@ io.reactiverse es4x-parent - 0.13.1 + 0.13.2 .. 4.0.0 es4x-pm - 0.13.1 + 0.13.2 UTF-8 diff --git a/pom.xml b/pom.xml index 9771d711a..25e2cd545 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.reactiverse es4x-parent - 0.13.1 + 0.13.2 pom From d0ed4441bd2f200de7290caef26587be95646b87 Mon Sep 17 00:00:00 2001 From: Paulo Lopes Date: Mon, 28 Sep 2020 17:21:00 +0200 Subject: [PATCH 2/6] Fix #408 --- pm/src/assembly/bin/es4x | 2 +- .../reactiverse/es4x/cli/GraalVMVersion.java | 55 ++++++++++--------- .../main/java/io/reactiverse/es4x/cli/PM.java | 14 +++-- .../commands/ConsoleTransferListener.java | 4 +- .../io/reactiverse/es4x/commands/Install.java | 12 +--- 5 files changed, 45 insertions(+), 42 deletions(-) diff --git a/pm/src/assembly/bin/es4x b/pm/src/assembly/bin/es4x index 6cdc33e6e..126fe8f27 100644 --- a/pm/src/assembly/bin/es4x +++ b/pm/src/assembly/bin/es4x @@ -37,8 +37,8 @@ if [[ -f "node_modules/.bin/es4x-launcher.jar" ]] && [[ -d "node_modules/.lib" ] APP_RUNTIME="node_modules/.bin/es4x-launcher.jar:$basedir/../es4x-pm-${project.version}.jar" APP_MAIN="io.reactiverse.es4x.ES4X" else - APP_MAIN="io.reactiverse.es4x.cli.PM" APP_RUNTIME="$basedir/../es4x-pm-${project.version}.jar" + APP_MAIN="io.reactiverse.es4x.cli.PM" fi # If exists security.policy start the VM in secure mode diff --git a/pm/src/main/java/io/reactiverse/es4x/cli/GraalVMVersion.java b/pm/src/main/java/io/reactiverse/es4x/cli/GraalVMVersion.java index c6b11459a..3536e9de4 100644 --- a/pm/src/main/java/io/reactiverse/es4x/cli/GraalVMVersion.java +++ b/pm/src/main/java/io/reactiverse/es4x/cli/GraalVMVersion.java @@ -6,17 +6,17 @@ public class GraalVMVersion { /* graalvm version format: year.release.bugfix */ - private final boolean graalvm; - private final int year; - private final int release; - private final int bugfix; + private static final boolean GRAALVM; + private static final int YEAR; + private static final int RELEASE; + private static final int BUGFIX; - public GraalVMVersion() { + static { final String VM_NAME = System.getProperty("java.vm.name", "").toLowerCase(); final String VENDOR_VERSION = System.getProperty("java.vendor.version", "").toLowerCase(); - graalvm = + GRAALVM = // from graal 20.0.0 the vm name doesn't contain graalvm in the name // but it is now part of the vendor version VENDOR_VERSION.contains("graalvm") || VM_NAME.contains("graalvm"); @@ -24,30 +24,31 @@ public GraalVMVersion() { Pattern p; Matcher m; - if (graalvm) { + if (GRAALVM) { p = Pattern.compile("graalvm .+? (\\d+)\\.(\\d+)\\.(\\d+)"); - m = p.matcher(VENDOR_VERSION); - if (m.matches()) { - year = Integer.parseInt(m.group(1)); - release = Integer.parseInt(m.group(2)); - bugfix = Integer.parseInt(m.group(3)); + // fallback for jdk8 graal, which seems to have a empty vendor + m = p.matcher("".equals(VENDOR_VERSION) ? VM_NAME : VENDOR_VERSION); + if (m.find()) { + YEAR = Integer.parseInt(m.group(1)); + RELEASE = Integer.parseInt(m.group(2)); + BUGFIX = Integer.parseInt(m.group(3)); } else { - year = 0; - release = 0; - bugfix = 0; + YEAR = 0; + RELEASE = 0; + BUGFIX = 0; } } else { - year = 0; - release = 0; - bugfix = 0; + YEAR = 0; + RELEASE = 0; + BUGFIX = 0; } } - public boolean isGraalVM() { - return graalvm; + public static boolean isGraalVM() { + return GRAALVM; } - public boolean isGreaterOrEqual(String version) { + public static boolean isGreaterOrEqual(String version) { if (version == null) { return false; } @@ -58,9 +59,9 @@ public boolean isGreaterOrEqual(String version) { int release = parseInt(parts, 1); int bugfix = parseInt(parts, 2); - if (this.year != year) return this.year - year >= 0; - if (this.release != release) return this.release - release >= 0; - return this.bugfix - bugfix >= 0; + if (YEAR != year) return YEAR - year >= 0; + if (RELEASE != release) return RELEASE - release >= 0; + return BUGFIX - bugfix >= 0; } private static int parseInt(String[] parts, int idx) { @@ -75,8 +76,12 @@ private static int parseInt(String[] parts, int idx) { } } + public static String version() { + return String.format("%d.%d.%d", YEAR, RELEASE, BUGFIX); + } + @Override public String toString() { - return String.format("%d.%d.%d", year, release, bugfix); + return version(); } } diff --git a/pm/src/main/java/io/reactiverse/es4x/cli/PM.java b/pm/src/main/java/io/reactiverse/es4x/cli/PM.java index 7fabfc661..f50edd2a2 100644 --- a/pm/src/main/java/io/reactiverse/es4x/cli/PM.java +++ b/pm/src/main/java/io/reactiverse/es4x/cli/PM.java @@ -30,8 +30,7 @@ private static void printUsage() { } private static void verifyRuntime(boolean fatal) { - final GraalVMVersion vmVersion = new GraalVMVersion(); - if (vmVersion.isGraalVM()) { + if (GraalVMVersion.isGraalVM()) { // graalvm version should be aligned with the dependencies // used on the application, otherwise it introduces some // unwanted side effects @@ -40,11 +39,11 @@ private static void verifyRuntime(boolean fatal) { final Properties versions = new Properties(); versions.load(is); String wanted = versions.getProperty("graalvm"); - if (!vmVersion.isGreaterOrEqual(wanted)) { + if (!GraalVMVersion.isGreaterOrEqual(wanted)) { if (fatal) { - fatal(String.format("Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/", wanted, vmVersion.toString(), System.lineSeparator())); + fatal(String.format("Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/", wanted, GraalVMVersion.version(), System.lineSeparator())); } else { - warn(String.format("Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/", wanted, vmVersion.toString(), System.lineSeparator())); + warn(String.format("Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/", wanted, GraalVMVersion.version(), System.lineSeparator())); } } } @@ -87,6 +86,11 @@ public static void main(String[] args) { new Versions(cmdArgs).run(); System.exit(0); return; + case Vmargs.NAME: + verifyRuntime(true); + new Vmargs(cmdArgs).run(); + System.exit(0); + return; case "-h": case "--help": verifyRuntime(false); diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/ConsoleTransferListener.java b/pm/src/main/java/io/reactiverse/es4x/commands/ConsoleTransferListener.java index 9c77b138e..2a58e9343 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/ConsoleTransferListener.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/ConsoleTransferListener.java @@ -37,9 +37,9 @@ final class ConsoleTransferListener extends AbstractTransferListener { - private PrintStream out; + private final PrintStream out; - private Map downloads = new ConcurrentHashMap(); + private final Map downloads = new ConcurrentHashMap(); private int lastLength; diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/Install.java b/pm/src/main/java/io/reactiverse/es4x/commands/Install.java index e9a6fed91..be15ba4af 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/Install.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/Install.java @@ -3,6 +3,7 @@ import io.reactiverse.es4x.cli.CmdLineParser; import io.reactiverse.es4x.commands.proxies.JsonArrayProxy; import io.reactiverse.es4x.commands.proxies.JsonObjectProxy; +import io.reactiverse.es4x.cli.GraalVMVersion; import org.eclipse.aether.artifact.Artifact; import java.io.*; @@ -177,20 +178,13 @@ public void run() { final File libs = new File(base, ".lib"); if (force || libs.exists()) { - final double version = Double.parseDouble(System.getProperty("java.specification.version")); - final boolean isGraalVM = - System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm") || - // from graal 20.0.0 the vm name doesn't contain graalvm in the name - // but it is now part of the vendor version - System.getProperty("java.vendor.version", "").toLowerCase().contains("graalvm"); - - if (!isGraalVM) { - + if (!GraalVMVersion.isGraalVM()) { // not on graal, install graaljs and dependencies warn("Installing GraalJS..."); // graaljs + dependencies installGraalJS(artifacts); + final double version = Double.parseDouble(System.getProperty("java.specification.version")); if (version >= 11) { // verify if the current JDK contains the jdk.internal.vm.ci module try { From 7c4ef24280e9dfe4f34495f5d769cec0a0de7719 Mon Sep 17 00:00:00 2001 From: Paulo Lopes Date: Mon, 28 Sep 2020 19:12:50 +0200 Subject: [PATCH 3/6] Add missing files --- generator/io.reactiverse/elasticsearch-client/pom.xml | 6 ++++++ pm/src/main/java/io/reactiverse/es4x/cli/PM.java | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/generator/io.reactiverse/elasticsearch-client/pom.xml b/generator/io.reactiverse/elasticsearch-client/pom.xml index 1bd8f9983..21c9a579b 100644 --- a/generator/io.reactiverse/elasticsearch-client/pom.xml +++ b/generator/io.reactiverse/elasticsearch-client/pom.xml @@ -22,6 +22,12 @@ @reactiverse/elasticsearch-client 0.8.1ec7.5.1 false + + + { + "@vertx/core": "${stack.version}" + } + diff --git a/pm/src/main/java/io/reactiverse/es4x/cli/PM.java b/pm/src/main/java/io/reactiverse/es4x/cli/PM.java index f50edd2a2..09a1ee0c9 100644 --- a/pm/src/main/java/io/reactiverse/es4x/cli/PM.java +++ b/pm/src/main/java/io/reactiverse/es4x/cli/PM.java @@ -86,11 +86,11 @@ public static void main(String[] args) { new Versions(cmdArgs).run(); System.exit(0); return; - case Vmargs.NAME: - verifyRuntime(true); - new Vmargs(cmdArgs).run(); - System.exit(0); - return; +// case Vmargs.NAME: +// verifyRuntime(true); +// new Vmargs(cmdArgs).run(); +// System.exit(0); +// return; case "-h": case "--help": verifyRuntime(false); From e32bf5c3e8156ffcd7af846fc7153c2cc854979d Mon Sep 17 00:00:00 2001 From: Paulo Lopes Date: Tue, 29 Sep 2020 15:49:02 +0200 Subject: [PATCH 4/6] Avoid "install" step if needed --- pm/src/assembly/bin/es4x | 25 ++-- pm/src/assembly/bin/es4x-cli.js | 123 ++++++----------- pm/src/assembly/bin/es4x.cmd | 37 +++-- .../main/java/io/reactiverse/es4x/cli/PM.java | 14 +- .../io/reactiverse/es4x/commands/Install.java | 127 +++++++++--------- .../es4x/commands/InstallCommand.java | 8 +- .../reactiverse/es4x/commands/Resolver.java | 5 +- 7 files changed, 143 insertions(+), 196 deletions(-) diff --git a/pm/src/assembly/bin/es4x b/pm/src/assembly/bin/es4x index 126fe8f27..bb61b2866 100644 --- a/pm/src/assembly/bin/es4x +++ b/pm/src/assembly/bin/es4x @@ -26,21 +26,19 @@ else fi fi +if [ ! -f "node_modules/.bin/es4x-launcher.jar" ]; then + "$JAVA_EXE" $JAVA_OPTS -cp "$basedir/../es4x-pm-${project.version}.jar" io.reactiverse.es4x.cli.PM "$@" + EXIT_STATUS=$? + if [[ "$EXIT_STATUS" -ne "65" ]]; then + exit $EXIT_STATUS + fi +fi + # Use JVMCI if installed if [[ -d "node_modules/.jvmci" ]]; then JVMCI="--module-path=node_modules/.jvmci -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --upgrade-module-path=node_modules/.jvmci/compiler.jar" fi -# If exists node_modules/.bin/es4x-launcher.jar && node_modules/.lib -# use it's class path (else rely on PM runtime) -if [[ -f "node_modules/.bin/es4x-launcher.jar" ]] && [[ -d "node_modules/.lib" ]]; then - APP_RUNTIME="node_modules/.bin/es4x-launcher.jar:$basedir/../es4x-pm-${project.version}.jar" - APP_MAIN="io.reactiverse.es4x.ES4X" -else - APP_RUNTIME="$basedir/../es4x-pm-${project.version}.jar" - APP_MAIN="io.reactiverse.es4x.cli.PM" -fi - # If exists security.policy start the VM in secure mode if [[ -f "security.policy" ]]; then SECURITY_MANAGER="-Djava.security.manager -Djava.security.policy=security.policy" @@ -51,4 +49,9 @@ if [[ -f "logging.properties" ]]; then LOGGING_PROPERTIES="-Djava.util.logging.config.file=logging.properties" fi -exec "$JAVA_EXE" -XX:+IgnoreUnrecognizedVMOptions $JVMCI $SECURITY_MANAGER $LOGGING_PROPERTIES $JAVA_OPTS -cp "$APP_RUNTIME" $APP_MAIN "$@" +if [[ -f "node_modules/.bin/es4x-launcher.jar" ]]; then + exec "$JAVA_EXE" -XX:+IgnoreUnrecognizedVMOptions $JVMCI $SECURITY_MANAGER $LOGGING_PROPERTIES $JAVA_OPTS -cp "node_modules/.bin/es4x-launcher.jar:$basedir/../es4x-pm-${project.version}.jar" io.reactiverse.es4x.ES4X "$@" +else + echo "Missing node_modules/.bin/es4x-launcher.jar" + exit 2 +fi diff --git a/pm/src/assembly/bin/es4x-cli.js b/pm/src/assembly/bin/es4x-cli.js index 59d5338e6..9bc2ffc34 100644 --- a/pm/src/assembly/bin/es4x-cli.js +++ b/pm/src/assembly/bin/es4x-cli.js @@ -1,57 +1,31 @@ #!/usr/bin/env node -const { existsSync } = require('fs'); +const {existsSync} = require('fs'); const path = require('path'); -const { spawn } = require('child_process'); - -/** - * Parse a String value to a argv format - * @param {String} value - * @param {String[]} argv - */ -function parseArgsToArgv(value, argv) { - // ([^\s'"]([^\s'"]*(['"])([^\3]*?)\3)+[^\s'"]*) Matches nested quotes until the first space outside of quotes - // [^\s'"]+ or Match if not a space ' or " - // (['"])([^\5]*?)\5 or Match "quoted text" without quotes - // `\3` and `\5` are a backreference to the quote style (' or ") captured - const myRegexp = /([^\s'"]([^\s'"]*(['"])([^\3]*?)\3)+[^\s'"]*)|[^\s'"]+|(['"])([^\5]*?)\5/gi; - - let match = null; - - do { - // Each call to exec returns the next regex match as an array - match = myRegexp.exec(value); - if (match !== null) { - // Index 1 in the array is the captured group if it exists - // Index 0 is the matched text, which we use if no captured group exists - let str = firstString(match[1], match[6], match[0]); - if (str) { - argv.push(str); - } - } - } while (match !== null); -} - -// Accepts any number of arguments, and returns the first one that is a string -// (even an empty string) -function firstString(...args) { - for (let i = 0; i < args.length; i++) { - const arg = args[i]; - if (typeof arg === "string") { - return arg; - } - } -} +const {spawn, spawnSync} = require('child_process'); let java = 'java'; -let skipJvmci = false; +let pm = 'es4x-pm-${project.version}.jar'; if (process.env['JAVA_HOME']) { // Attempt to use JAVA_HOME let xjava = path.join(process.env['JAVA_HOME'], 'bin', 'java'); if (existsSync(xjava)) { java = xjava; - skipJvmci = existsSync(path.join(process.env['JAVA_HOME'], 'bin', 'gu')) + } +} + +let launcher = path.join('node_modules', '.bin', 'es4x-launcher.jar'); +if (!existsSync(path.join(process.cwd(), launcher))) { + // classpath is incomplete we need to run the PM package + let statusCode = + spawnSync( + java, + ['-cp', `${path.join(__dirname, '..', pm)}`, 'io.reactiverse.es4x.cli.PM'].concat(process.argv.slice(2)), + {cwd: process.cwd(), env: process.env, stdio: 'inherit'}).status; + + if (statusCode !== 65) { + process.exit(statusCode); } } @@ -59,63 +33,44 @@ let argv = [ '-XX:+IgnoreUnrecognizedVMOptions' ]; -// Use JVMCI if installed and not skipping -if (!skipJvmci) { - let jvmci = path.join('node_modules', '.jvmci'); - - if (existsSync(path.join(process.cwd(), jvmci))) { - argv.push(`--module-path=${jvmci}`); - argv.push('-XX:+UnlockExperimentalVMOptions'); - argv.push('-XX:+EnableJVMCI'); - argv.push(`--upgrade-module-path=${path.join(jvmci, 'compiler.jar')}`); - } +let jvmci = path.join('node_modules', '.jvmci'); +if (existsSync(path.join(process.cwd(), jvmci))) { + argv.push(`--module-path=${jvmci}`); + argv.push('-XX:+UnlockExperimentalVMOptions'); + argv.push('-XX:+EnableJVMCI'); + argv.push(`--upgrade-module-path=${path.join(jvmci, 'compiler.jar')}`); } // If exists security.policy -// use it (else rely on default runtime) if (existsSync(path.join(process.cwd(), 'security.policy'))) { argv.push('-Djava.security.manager'); argv.push('-Djava.security.policy=security.policy'); } // If exists logging.properties -// use it (else rely on default runtime) if (existsSync(path.join(process.cwd(), 'logging.properties'))) { argv.push('-Djava.util.logging.config.file=logging.properties'); } -if (process.env['JAVA_OPTS']) { - // Attempt to use JAVA_OPTS - parseArgsToArgv(process.env['JAVA_OPTS'], argv); -} - argv.push('-cp'); -// If exists node_modules/.bin/es4x-launcher.jar -// use it's class path (else rely on default runtime) -let launcher = path.join('node_modules', '.bin', 'es4x-launcher.jar'); -let pm = 'es4x-pm-${project.version}.jar'; if (existsSync(path.join(process.cwd(), launcher))) { - // in the case that there is a launcher we also require a .lib - let lib = path.join('node_modules', '.lib'); - if (existsSync(path.join(process.cwd(), lib))) { - argv.push(`${launcher}${path.delimiter}${path.join(__dirname, '..', pm)}`); - argv.push('io.reactiverse.es4x.ES4X'); - } else { - // there's no .lib fallback to PM - argv.push(`${path.join(__dirname, '..', pm)}`); - argv.push('io.reactiverse.es4x.cli.PM'); - } -} else { - argv.push(`${path.join(__dirname, '..', pm)}`); - argv.push('io.reactiverse.es4x.cli.PM'); -} + argv.push(`${launcher}${path.delimiter}${path.join(__dirname, '..', pm)}`); + argv.push('io.reactiverse.es4x.ES4X'); -const subProcess = spawn(java, argv.concat(process.argv.slice(2)), { cwd: process.cwd(), env: process.env, stdio: 'inherit' }); + const subProcess = spawn(java, argv.concat(process.argv.slice(2)), { + cwd: process.cwd(), + env: process.env, + stdio: 'inherit' + }); -subProcess.on('error', (err) => { - console.error(`es4x-pm ERROR: ${err}`); - process.exit(1); -}); + subProcess.on('error', (err) => { + console.error(`es4x ERROR: ${err}`); + process.exit(3); + }); -subProcess.on('close', process.exit); + subProcess.on('close', process.exit); +} else { + console.error(`Missing ${launcher}`); + process.exit(2); +} diff --git a/pm/src/assembly/bin/es4x.cmd b/pm/src/assembly/bin/es4x.cmd index 6909eab49..a618bda7f 100644 --- a/pm/src/assembly/bin/es4x.cmd +++ b/pm/src/assembly/bin/es4x.cmd @@ -10,36 +10,31 @@ IF NOT EXIST "%JAVA_EXE%" ( SET "JAVA_EXE=java" ) -:: Use JVMCI if installed -IF EXIST "node_modules/.jvmci" ( - SET "JVMCI=--module-path=node_modules\.jvmci -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --upgrade-module-path=node_modules\.jvmci\compiler.jar" +IF NOT EXIST "node_modules\.bin\es4x-launcher.jar" ( + %JAVA_EXE% %JAVA_OPTS% -cp %~dp0\..\es4x-pm-${project.version}.jar io.reactiverse.es4x.cli.PM %* + IF %ERRORLEVEL% NEQ 65 ( + EXIT /B %ERRORLEVEL% + ) ) -:: If exists node_modules/.bin/es4x-launcher.jar -:: use it's class path (else rely on default runtime) -IF EXIST "node_modules\.bin\es4x-launcher.jar" ( - IF EXIST "node_modules\.lib" ( - SET "APP_RUNTIME=node_modules\.bin\es4x-launcher.jar;%~dp0\..\es4x-pm-${project.version}.jar" - SET "APP_MAIN=io.reactiverse.es4x.ES4X" - ) ELSE ( - SET "APP_RUNTIME=%~dp0\..\es4x-pm-${project.version}.jar" - SET "APP_MAIN=io.reactiverse.es4x.cli.PM" - ) -) ELSE ( - SET "APP_RUNTIME=%~dp0\..\es4x-pm-${project.version}.jar" - SET "APP_MAIN=io.reactiverse.es4x.cli.PM" +:: Use JVMCI if installed +IF EXIST "node_modules\.jvmci" ( + SET "JVMCI=--module-path=node_modules\.jvmci -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --upgrade-module-path=node_modules\.jvmci\compiler.jar" ) -:: If exists security.policy -:: start the VM in secure mode +:: If exists security.policy start the VM in secure mode IF EXIST "security.policy" ( SET "SECURITY_MANAGER=-Djava.security.manager -Djava.security.policy=security.policy" ) -:: If exists logging.properties -:: start JUL using it +:: If exists logging.properties start JUL using it IF EXIST "logging.properties" ( SET "LOGGING_PROPERTIES=-Djava.util.logging.config.file=logging.properties" ) -"$JAVA_EXE" -XX:+IgnoreUnrecognizedVMOptions %JVMCI% %SECURITY_MANAGER% %LOGGING_PROPERTIES% %JAVA_OPTS% -cp "%APP_RUNTIME%" %APP_MAIN% %* +IF EXIST "node_modules\.bin\es4x-launcher.jar" ( + %JAVA_EXE% -XX:+IgnoreUnrecognizedVMOptions %JVMCI% %SECURITY_MANAGER% %LOGGING_PROPERTIES% %JAVA_OPTS% -cp "node_modules\.bin\es4x-launcher.jar;%~dp0\..\es4x-pm-${project.version}.jar" io.reactiverse.es4x.ES4X %* +) ELSE ( + ECHO "Missing node_modules\.bin\es4x-launcher.jar" + EXIT /B 2 +) diff --git a/pm/src/main/java/io/reactiverse/es4x/cli/PM.java b/pm/src/main/java/io/reactiverse/es4x/cli/PM.java index 09a1ee0c9..06f831359 100644 --- a/pm/src/main/java/io/reactiverse/es4x/cli/PM.java +++ b/pm/src/main/java/io/reactiverse/es4x/cli/PM.java @@ -40,10 +40,11 @@ private static void verifyRuntime(boolean fatal) { versions.load(is); String wanted = versions.getProperty("graalvm"); if (!GraalVMVersion.isGreaterOrEqual(wanted)) { + String msg = "Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/"; if (fatal) { - fatal(String.format("Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/", wanted, GraalVMVersion.version(), System.lineSeparator())); + fatal(String.format(msg, wanted, GraalVMVersion.version(), System.lineSeparator())); } else { - warn(String.format("Runtime GraalVM version mismatch { wanted: [%s], provided: [%s] }%sFor installation help see: https://www.graalvm.org/docs/getting-started-with-graalvm/", wanted, GraalVMVersion.version(), System.lineSeparator())); + warn(String.format(msg, wanted, GraalVMVersion.version(), System.lineSeparator())); } } } @@ -55,8 +56,8 @@ private static void verifyRuntime(boolean fatal) { public static void main(String[] args) { if (args == null || args.length == 0) { - // default action is help - args = new String[] { "--help" }; + // default action is "install -s" + args = new String[] { Install.NAME, "-s" }; } String command = args[0]; @@ -86,11 +87,6 @@ public static void main(String[] args) { new Versions(cmdArgs).run(); System.exit(0); return; -// case Vmargs.NAME: -// verifyRuntime(true); -// new Vmargs(cmdArgs).run(); -// System.exit(0); -// return; case "-h": case "--help": verifyRuntime(false); diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/Install.java b/pm/src/main/java/io/reactiverse/es4x/commands/Install.java index be15ba4af..f79a8d917 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/Install.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/Install.java @@ -16,6 +16,8 @@ public class Install implements Runnable { + private static final int ENOPKG = 65; + public static final String NAME = "install"; public static final String SUMMARY = "Installs required jars from maven to 'node_modules'."; @@ -33,7 +35,7 @@ public class Install implements Runnable { } } - private boolean force; + private boolean silent; private boolean link; private List vendor; private File coreJar; @@ -46,7 +48,7 @@ public Install() { public Install(String[] args) { CmdLineParser parser = new CmdLineParser(); CmdLineParser.Option helpOption = parser.addBooleanOption('h', "help"); - CmdLineParser.Option forceOption = parser.addBooleanOption('f', "force"); + CmdLineParser.Option silentOption = parser.addBooleanOption('s', "silent"); CmdLineParser.Option vendorOption = parser.addStringOption('v', "vendor"); CmdLineParser.Option linkOption = parser.addBooleanOption('l', "link"); @@ -66,9 +68,9 @@ public Install(String[] args) { return; } - Boolean force = parser.getOptionValue(forceOption, Boolean.FALSE); - if (force != null && force) { - setForce(true); + Boolean silent = parser.getOptionValue(silentOption, Boolean.FALSE); + if (silent != null && silent) { + setSilent(true); } Boolean link = parser.getOptionValue(linkOption, Boolean.FALSE); @@ -89,6 +91,7 @@ private void printUsage() { System.err.println(" -f,--force\t\t\t\tWill always install a basic runtime in the current working dir."); System.err.println(" -v,--vendor \tComma separated list of vendor jars."); System.err.println(" -l,--link\t\t\t\tSymlink jars instead of copy."); + System.err.println(" -s,--silent\t\t\t\tReturn statuscode 65 on success."); System.err.println(); } @@ -97,8 +100,8 @@ public Install setCwd(File cwd) { return this; } - public void setForce(boolean force) { - this.force = force; + public void setSilent(boolean silent) { + this.silent = silent; } public void setLink(boolean link) { @@ -174,32 +177,27 @@ public void run() { final Set artifacts = new HashSet<>(); installNodeModules(artifacts); - final File base = new File(cwd, "node_modules"); - final File libs = new File(base, ".lib"); - - if (force || libs.exists()) { - if (!GraalVMVersion.isGraalVM()) { - // not on graal, install graaljs and dependencies - warn("Installing GraalJS..."); - // graaljs + dependencies - installGraalJS(artifacts); - - final double version = Double.parseDouble(System.getProperty("java.specification.version")); - if (version >= 11) { - // verify if the current JDK contains the jdk.internal.vm.ci module - try { - String modules = exec(javaHomePrefix() + "java", "--list-modules"); - if (modules.contains("jdk.internal.vm.ci")) { - warn("Installing JVMCI Compiler..."); - // jvmci compiler + dependencies - installGraalJMVCICompiler(); - } - } catch (IOException | InterruptedException e) { - err(e.getMessage()); + if (!GraalVMVersion.isGraalVM()) { + // not on graal, install graaljs and dependencies + warn("Installing GraalJS..."); + // graaljs + dependencies + installGraalJS(artifacts); + + final double version = Double.parseDouble(System.getProperty("java.specification.version")); + if (version >= 11) { + // verify if the current JDK contains the jdk.internal.vm.ci module + try { + String modules = exec(javaHomePrefix() + "java", "--list-modules"); + if (modules.contains("jdk.internal.vm.ci")) { + warn("Installing JVMCI Compiler..."); + // jvmci compiler + dependencies + installGraalJMVCICompiler(); } - } else { - warn("Current JDK only supports GraalJS in Interpreted mode!"); + } catch (IOException | InterruptedException e) { + err(e.getMessage()); } + } else { + warn("Current JDK only supports GraalJS in Interpreted mode!"); } } @@ -207,6 +205,10 @@ public void run() { createLauncher(artifacts); // always install the es4x type definitions installTypeDefinitions(); + + if (silent) { + System.exit(ENOPKG); + } } private void installGraalJS(Set artifacts) { @@ -286,49 +288,46 @@ private void installNodeModules(Set artifacts) { } } - if (force || dependencies.size() > 0) { - File libs = new File(base, ".lib"); + File libs = new File(base, ".lib"); - try { - Resolver resolver = new Resolver(); + try { + Resolver resolver = new Resolver(); - // lookup root - String root = "io.reactiverse:es4x:" + VERSIONS.getProperty("es4x"); + // lookup root + String root = "io.reactiverse:es4x:" + VERSIONS.getProperty("es4x"); - for (String el : dependencies) { - // ensure we respect the wish of the user - if (el.startsWith("io.reactiverse:es4x:")) { - root = el; - break; - } + for (String el : dependencies) { + // ensure we respect the wish of the user + if (el.startsWith("io.reactiverse:es4x:")) { + root = el; + break; } + } - for (Artifact a : resolver.resolve(root, dependencies)) { - - if (!libs.exists()) { - if (!libs.mkdirs()) { - fatal("Failed to mkdirs 'node_modules/.lib'."); - } + for (Artifact a : resolver.resolve(root, dependencies)) { + if (!libs.exists()) { + if (!libs.mkdirs()) { + fatal("Failed to mkdirs 'node_modules/.lib'."); } - artifacts.add(".." + File.separator + ".lib" + File.separator + a.getFile().getName()); - File destination = new File(libs, a.getFile().getName()); + } + artifacts.add(".." + File.separator + ".lib" + File.separator + a.getFile().getName()); + File destination = new File(libs, a.getFile().getName()); - // locate core jar - if ("io.vertx".equals(a.getGroupId()) && "vertx-core".equals(a.getArtifactId())) { - coreJar = a.getFile(); - } + // locate core jar + if ("io.vertx".equals(a.getGroupId()) && "vertx-core".equals(a.getArtifactId())) { + coreJar = a.getFile(); + } - if (!destination.exists()) { - if (link) { - Files.createSymbolicLink(destination.toPath(), a.getFile().toPath()); - } else { - Files.copy(a.getFile().toPath(), destination.toPath()); - } + if (!destination.exists()) { + if (link) { + Files.createSymbolicLink(destination.toPath(), a.getFile().toPath()); + } else { + Files.copy(a.getFile().toPath(), destination.toPath()); } } - } catch (IOException e) { - fatal(e.getMessage()); } + } catch (IOException e) { + fatal(e.getMessage()); } } @@ -518,7 +517,7 @@ private void installTypeDefinitions() { final File file = new File(atTypes, "es4x.d.ts"); - if (force || !file.exists()) { + if (!file.exists()) { // Load the file from the class path try (InputStream in = Install.class.getClassLoader().getResourceAsStream("META-INF/es4x-commands/es4x.d.ts")) { if (in == null) { diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java b/pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java index c390eed75..41304ba33 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/InstallCommand.java @@ -25,10 +25,10 @@ public class InstallCommand extends DefaultCommand { private final Install command = new Install(); - @Option(longName = "force", shortName = "f", flag = true) - @Description("Will always install a basic runtime in the current working dir.") - public void setForce(boolean force) { - command.setForce(force); + @Option(longName = "silent", shortName = "s", flag = true) + @Description("Will will silently install and return a status code 65.") + public void setForce(boolean silent) { + command.setSilent(silent); } @Option(longName = "vendor", shortName = "v") diff --git a/pm/src/main/java/io/reactiverse/es4x/commands/Resolver.java b/pm/src/main/java/io/reactiverse/es4x/commands/Resolver.java index b5d9b762a..3de4c4a82 100644 --- a/pm/src/main/java/io/reactiverse/es4x/commands/Resolver.java +++ b/pm/src/main/java/io/reactiverse/es4x/commands/Resolver.java @@ -102,12 +102,11 @@ private static DefaultServiceLocator getDefaultServiceLocator() { } private static boolean isOffline() { - boolean result = false; try { - result = Boolean.parseBoolean(System.getenv("npm_config_offline")); + return Boolean.parseBoolean(System.getenv("npm_config_offline")); } catch (IllegalArgumentException | NullPointerException e) { + return false; } - return result; } /** From 9466391a1db894b88e7a28df5c124cf1720a2f1e Mon Sep 17 00:00:00 2001 From: Paulo Lopes Date: Wed, 30 Sep 2020 09:44:36 +0200 Subject: [PATCH 5/6] Update changelog Signed-off-by: Paulo Lopes --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d2147962..ed8d8a416 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ 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.13.2] - 2020-09-22 +- Fix detecting GraalVM version on GraalVM JDK8 +- Lax the requirement of running `es4x install`, + if missing will be called before run + ## [0.13.1] - 2020-09-22 - Upgraded vert.x to 3.9.3 - PM will warn about misalign Graal version From 2005c2ef7ff6c171edd08317f349795b696f252f Mon Sep 17 00:00:00 2001 From: Paulo Lopes Date: Wed, 30 Sep 2020 09:48:54 +0200 Subject: [PATCH 6/6] Update readme Signed-off-by: Paulo Lopes --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index c5996c34a..a1d6323c3 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,6 @@ JavaScript is fast, and this is the way to make it even faster 🚀🚀🚀 ## Usage -```bash -# add es4x-pm globally -npm install -g es4x-pm -``` - Create a project: ``` @@ -26,7 +21,7 @@ Create a project: mkdir my-app cd my-app # init the project -es4x init +npm init @es4x project # add other dependencies... npm install @vertx/unit --save-dev npm install @vertx/core --save-prod