Merge pull request #6 from arenadata/feature/first-bundle-release-fixes

Upgrading component versions
arenadata · Feb 5, 2024 · 00bf8a1 · 00bf8a1
2 parents b471704 + d650852
commit 00bf8a1
Show file tree

Hide file tree

Showing 16 changed files with 210 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,27 +39,28 @@
   </modules>
 
   <properties>
-    <log4j.version>2.19.0</log4j.version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <log4j.version>2.22.1</log4j.version>
+    <slf4j.version>1.7.25</slf4j.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <hadoop.version>2.7.3</hadoop.version>
     <alluxio.version>1.6.1</alluxio.version>
     <junit.version>4.13</junit.version>
-    <scala.version>2.11.8</scala.version>
+    <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <mockito.version>1.8.5</mockito.version>
     <testcontainers.version>1.19.1</testcontainers.version>
     <bouncycastle.version>1.46</bouncycastle.version>
     <protobuf.version>2.5.0</protobuf.version>
     <dbunitVersion>2.5.3</dbunitVersion>
-    <akka.version>2.3.12</akka.version>
+    <akka.version>2.5.32</akka.version>
     <akka.config.version>1.2.1</akka.config.version>
     <druid.version>1.1.3</druid.version>
     <spring.version>4.3.9.RELEASE</spring.version>
     <antlr4.version>4.6</antlr4.version>
-    <hazelcast.version>3.7.8</hazelcast.version>
+    <hazelcast.version>3.12.13</hazelcast.version>
     <guava.version>15.0</guava.version>
-    <gson.version>2.2</gson.version>
+    <gson.version>2.10.1</gson.version>
     <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <kerby.version>1.0.1</kerby.version>
@@ -123,6 +124,7 @@
       <properties>
         <hadoop.version>3.2.4</hadoop.version>
         <guava.version>27.0-jre</guava.version>
+        <jetty.version>9.4.43.v20210629</jetty.version>
       </properties>
       <dependencies>
         <dependency>
@@ -355,6 +357,14 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -410,6 +420,14 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -445,6 +463,14 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -458,6 +484,14 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

diff --git a/smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java b/smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java
@@ -66,6 +66,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import scala.concurrent.Await;
 import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
 
@@ -172,14 +173,18 @@ public void run() {
     executorService.scheduleAtFixedRate(
             statusReportTask, 1000, reportPeriod, TimeUnit.MILLISECONDS);
 
-    system.awaitTermination();
+    try {
+      Await.result(system.whenTerminated(), Duration.Inf());
+    } catch (Exception e) {
+        LOG.error("Failure during actor system runtime.", e);
+      }
   }
 
   public void shutdown() {
     Services.stop();
-    if (system != null && !system.isTerminated()) {
+    if (system != null && !system.whenTerminated().isCompleted()) {
       LOG.info("Shutting down system {}", AgentUtils.getSystemAddres(system));
-      system.shutdown();
+      system.terminate();
     }
   }
 

diff --git a/smart-common/pom.xml b/smart-common/pom.xml
@@ -60,6 +60,14 @@
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/smart-engine/pom.xml b/smart-engine/pom.xml
@@ -51,6 +51,14 @@
                     <groupId>commons-configuration</groupId>
                     <artifactId>commons-configuration</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -218,11 +226,31 @@
                     <groupId>org.smartdata</groupId>
                     <artifactId>smart-hadoop-3.2</artifactId>
                     <version>1.6.0-SNAPSHOT</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>ch.qos.reload4j</groupId>
+                            <artifactId>reload4j</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-reload4j</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
                 <dependency>
                     <groupId>org.smartdata</groupId>
                     <artifactId>smart-hadoop-client-3.2</artifactId>
                     <version>1.6.0-SNAPSHOT</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>ch.qos.reload4j</groupId>
+                            <artifactId>reload4j</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.slf4j</groupId>
+                            <artifactId>slf4j-reload4j</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java b/smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java
@@ -125,7 +125,7 @@ public void stopCmdlet(long cmdletId) {
   }
 
   public void shutdown() {
-    if (system != null && !system.isTerminated()) {
+    if (system != null && !system.whenTerminated().isCompleted()) {
       if (master != null && !master.isTerminated()) {
         LOG.info("Shutting down master {}...",
             AgentUtils.getFullPath(system, master.path()));
@@ -134,7 +134,7 @@ public void shutdown() {
 
       LOG.info("Shutting down system {}...",
           AgentUtils.getSystemAddres(system));
-      system.shutdown();
+      system.terminate();
     }
   }
 
@@ -193,7 +193,11 @@ public void run() {
           }
         }
       });
-      system.awaitTermination();
+        try {
+            Await.result(system.whenTerminated(), Duration.Inf());
+        } catch (Exception e) {
+          LOG.error("Failure during actor system runtime.", e);
+        }
     }
   }
 

diff --git a/smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java b/smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java
@@ -33,7 +33,7 @@ public void startActorSystem() {
 
   @After
   public void stopActorSystem() {
-    system.shutdown();
+     system.terminate();
   }
 
   public ActorSystem getActorSystem() {

diff --git a/smart-hadoop-support/smart-hadoop-3.2/pom.xml b/smart-hadoop-support/smart-hadoop-3.2/pom.xml
@@ -57,6 +57,14 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-util-ajax</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -79,6 +87,16 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-aws</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>

diff --git a/smart-hadoop-support/smart-hadoop-3/pom.xml b/smart-hadoop-support/smart-hadoop-3/pom.xml
@@ -53,6 +53,14 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-util-ajax</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -70,6 +78,16 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-aws</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/smart-hadoop-support/smart-hadoop-common/pom.xml b/smart-hadoop-support/smart-hadoop-common/pom.xml
@@ -58,12 +58,30 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-util-ajax</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>

diff --git a/smart-hadoop-support/smart-hadoop/pom.xml b/smart-hadoop-support/smart-hadoop/pom.xml
@@ -157,12 +157,30 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-util-ajax</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-distcp</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
@@ -177,12 +195,30 @@
                     <groupId>org.codehaus.jackson</groupId>
                     <artifactId>jackson-mapper-asl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.reload4j</groupId>
+                    <artifactId>reload4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.squareup</groupId>