[incubator-nemo] branch master updated: [MINOR] Upgrade travis build VM from trusty (v14) to bionic (v18) (#332)

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wonook pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git


The following commit(s) were added to refs/heads/master by this push:
     new 335a9b0f5 [MINOR] Upgrade travis build VM from trusty (v14) to bionic (v18) (#332)
335a9b0f5 is described below

commit 335a9b0f54a7a8965810ac31920fe1026b75dd26
Author: Won Wook SONG <ws...@gmail.com>
AuthorDate: Mon Aug 29 13:08:20 2022 +0900

    [MINOR] Upgrade travis build VM from trusty (v14) to bionic (v18) (#332)
    
    **Major changes:**
    - None
    
    **Minor changes to note:**
    - This upgrades the travis build environment from trusty (v14) to bionic (v18) (ubuntu)
    
    **Tests for the changes:**
    - Existing tests comply
    
    **Other comments:**
    - None
    
    Closes #332
---
 .travis.yml                                                       | 5 ++---
 pom.xml                                                           | 8 ++++----
 .../org/apache/nemo/runtime/executor/transfer/FrameDecoder.java   | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b32683c3..4c2e57d7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,12 @@
 # under the License.
 
 # .travis.yml
-dist: trusty
+dist: bionic
 
 # For maven builds
 language: java
 jdk:
-  - oraclejdk8
-  - oraclejdk11
+  - openjdk8
   - openjdk11
 env:
   global:
diff --git a/pom.xml b/pom.xml
index 6dab63260..2335ee200 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@ under the License.
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.version>3.10.1</maven.compiler.version>
-    <maven.shade.version>3.3.0</maven.shade.version>
+    <maven.shade.version>3.2.4</maven.shade.version> <!-- 3.3.0 doesn't work on mac -->
     <maven.deploy.version>3.0.0</maven.deploy.version>
     <maven.javadoc.version>3.4.0</maven.javadoc.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +59,7 @@ under the License.
     <log4j.configuration>file://log4j.properties</log4j.configuration>
     <netty.version>4.1.79.Final</netty.version>
     <guava.version>31.1-jre</guava.version>
-    <grpc.version>1.48.0</grpc.version>
+    <grpc.version>1.46.0</grpc.version> <!-- > 1.47.0 needs migration -->
     <jackson.version>2.10.5</jackson.version> <!-- > 2.11 needs migration -->
     <netlib.version>1.1.2</netlib.version>
     <jetty-server.version>9.4.48.v20220622</jetty-server.version>
@@ -74,7 +74,7 @@ under the License.
     <!-- Tests -->
     <mockito.version>3.12.4</mockito.version>
     <powermock.version>2.0.9</powermock.version>
-    <surefire.version>3.0.0-M7</surefire.version> <!-- > M5 errors with Java11 -->
+    <surefire.version>3.0.0-M7</surefire.version>
     <junit.version>4.13.2</junit.version>
     <checkstyle.version>8.23</checkstyle.version>
   </properties>
@@ -303,7 +303,7 @@ under the License.
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.14</version>
+        <version>0.13</version>
         <executions>
           <execution>
             <phase>verify</phase>
diff --git a/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/transfer/FrameDecoder.java b/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/transfer/FrameDecoder.java
index 85abac75c..830d9cc54 100644
--- a/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/transfer/FrameDecoder.java
+++ b/runtime/executor/src/main/java/org/apache/nemo/runtime/executor/transfer/FrameDecoder.java
@@ -187,10 +187,10 @@ final class FrameDecoder extends ByteToMessageDecoder {
         // cannot read body now
         LOG.warn("ControlMessage cannot be read ({})", i);
         ContextManager.getEncoderDecoderLock().unlock();
-        Thread.sleep(1000);
+        Thread.sleep(200);
         ContextManager.getEncoderDecoderLock().lock();
         i++;
-        if (i > 20) {
+        if (i > 10) {
           in.resetReaderIndex();
           return false;
         }