Browse Source

Temp fix the regression by downgrading the postgres driver one bugfix release (#5734)

Signed-off-by: Paulo Lopes <[email protected]>
Paulo Lopes 5 years ago
parent
commit
28726bfb9b

+ 1 - 0
frameworks/JavaScript/es4x/es4x.dockerfile

@@ -24,6 +24,7 @@ CMD java \
     -Dvertx.threadChecks=false                          \
     -Dvertx.threadChecks=false                          \
     -Dvertx.disableContextTimings=true                  \
     -Dvertx.disableContextTimings=true                  \
     -Dvertx.disableTCCL=true                            \
     -Dvertx.disableTCCL=true                            \
+    -Dvertx.disableHttpHeadersValidation=true           \
     -jar node_modules/.bin/es4x-launcher.jar            \
     -jar node_modules/.bin/es4x-launcher.jar            \
     --instances `grep --count ^processor /proc/cpuinfo` \
     --instances `grep --count ^processor /proc/cpuinfo` \
     --options vertx.json
     --options vertx.json

+ 2 - 3
frameworks/JavaScript/es4x/package.json

@@ -10,7 +10,7 @@
     "@vertx/core": "3.9.1",
     "@vertx/core": "3.9.1",
     "@vertx/web": "3.9.1",
     "@vertx/web": "3.9.1",
     "@vertx/web-templ-rocker": "3.9.1",
     "@vertx/web-templ-rocker": "3.9.1",
-    "@vertx/pg-client": "3.9.1"
+    "@vertx/pg-client": "3.9.0"
   },
   },
   "mvnDependencies": [
   "mvnDependencies": [
     "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.49.Final",
     "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.49.Final",
@@ -26,7 +26,6 @@
     "postinstall": "es4x install -v node_modules/.lib/vendor-templates.jar",
     "postinstall": "es4x install -v node_modules/.lib/vendor-templates.jar",
     "pretemplate": "es4x rocker -d node_modules/.rocker templates",
     "pretemplate": "es4x rocker -d node_modules/.rocker templates",
     "template": "javac -cp node_modules/.bin/es4x-launcher.jar @node_modules/.rocker/templates.lst -d node_modules/.rocker/classes",
     "template": "javac -cp node_modules/.bin/es4x-launcher.jar @node_modules/.rocker/templates.lst -d node_modules/.rocker/classes",
-    "posttemplate": "jar cvf node_modules/.lib/vendor-templates.jar -C node_modules/.rocker/classes .",
-    "start:dev": "java -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -Dvertx.disableMetrics=true -Dvertx.disableH2c=true -Dvertx.disableWebsockets=true -Dvertx.flashPolicyHandler=false -Dvertx.threadChecks=false -Dvertx.disableContextTimings=true -Dvertx.disableTCCL=true -jar node_modules/.bin/es4x-launcher.jar --instances 8 --options vertx.json"
+    "posttemplate": "jar cvf node_modules/.lib/vendor-templates.jar -C node_modules/.rocker/classes ."
   }
   }
 }
 }

+ 1 - 1
frameworks/JavaScript/es4x/templates/Fortunes.rocker.html

@@ -11,7 +11,7 @@
   </tr>
   </tr>
   @for ((ForIterator i, Map fortune) : fortunes) {
   @for ((ForIterator i, Map fortune) : fortunes) {
     <tr>
     <tr>
-      <td>@raw(fortune.get("id"))</td>
+      <td>@fortune.get("id")</td>
       <td>@fortune.get("message")</td>
       <td>@fortune.get("message")</td>
     </tr>
     </tr>
   }
   }