Browse Source

Bump vertx to 3.9.2 + removed 1 dependency (trying to figure out why it breaks only on citrine) (#5905)

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

+ 3 - 22
frameworks/Java/vertx-web/pom.xml

@@ -7,12 +7,12 @@
 
 
   <groupId>io.vertx</groupId>
   <groupId>io.vertx</groupId>
   <artifactId>vertx-web-benchmark</artifactId>
   <artifactId>vertx-web-benchmark</artifactId>
-  <version>3.9.0</version>
+  <version>3.9.2</version>
 
 
   <properties>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
     <!-- the main class -->
     <!-- the main class -->
     <main.verticle>io.vertx.benchmark.App</main.verticle>
     <main.verticle>io.vertx.benchmark.App</main.verticle>
   </properties>
   </properties>
@@ -73,12 +73,6 @@
       <version>42.2.5</version>
       <version>42.2.5</version>
     </dependency>
     </dependency>
 
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-afterburner</artifactId>
-      <version>2.10.2</version>
-    </dependency>
-
     <dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
       <artifactId>jaxb-api</artifactId>
@@ -89,19 +83,6 @@
 
 
   <build>
   <build>
 
 
-    <pluginManagement>
-      <plugins>
-        <!-- We specify the Maven compiler plugin as we need to set it to Java 1.8 -->
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
-          <configuration>
-            <debug>false</debug>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
     <plugins>
     <plugins>
       <plugin>
       <plugin>
         <groupId>com.fizzed</groupId>
         <groupId>com.fizzed</groupId>

+ 0 - 6
frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java

@@ -1,6 +1,5 @@
 package io.vertx.benchmark;
 package io.vertx.benchmark;
 
 
-import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import com.github.susom.database.Config;
 import com.github.susom.database.Config;
 import com.github.susom.database.ConfigFrom;
 import com.github.susom.database.ConfigFrom;
 import com.github.susom.database.DatabaseProviderVertx;
 import com.github.susom.database.DatabaseProviderVertx;
@@ -29,11 +28,6 @@ import static io.vertx.benchmark.Helper.randomWorld;
 
 
 public class App extends AbstractVerticle {
 public class App extends AbstractVerticle {
 
 
-  static {
-    Json.mapper.registerModule(new AfterburnerModule());
-    Json.prettyMapper.registerModule(new AfterburnerModule());
-  }
-
   /**
   /**
    * MongoDB implementation
    * MongoDB implementation
    */
    */

+ 1 - 1
frameworks/Java/vertx-web/vertx-web-mongodb.dockerfile

@@ -18,7 +18,7 @@ CMD java \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableHttpHeadersValidation=true         \
     -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
     -jar                                              \
-    target/vertx-web-benchmark-3.9.0-fat.jar          \
+    target/vertx-web-benchmark-3.9.2-fat.jar          \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \

+ 1 - 1
frameworks/Java/vertx-web/vertx-web-postgres.dockerfile

@@ -18,7 +18,7 @@ CMD java \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableHttpHeadersValidation=true         \
     -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
     -jar                                              \
-    target/vertx-web-benchmark-3.9.0-fat.jar          \
+    target/vertx-web-benchmark-3.9.2-fat.jar          \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \

+ 1 - 1
frameworks/Java/vertx-web/vertx-web-susom-postgres.dockerfile

@@ -18,7 +18,7 @@ CMD java \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableHttpHeadersValidation=true         \
     -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
     -jar                                              \
-    target/vertx-web-benchmark-3.9.0-fat.jar          \
+    target/vertx-web-benchmark-3.9.2-fat.jar          \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \

+ 1 - 1
frameworks/Java/vertx-web/vertx-web.dockerfile

@@ -18,7 +18,7 @@ CMD java \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableTCCL=true                          \
     -Dvertx.disableHttpHeadersValidation=true         \
     -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
     -jar                                              \
-    target/vertx-web-benchmark-3.9.0-fat.jar          \
+    target/vertx-web-benchmark-3.9.2-fat.jar          \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \