Skip to content

Commit

Permalink
Fixed missing jetty-http dependency.
Browse files Browse the repository at this point in the history 
Fixed jetty version for hadoop 3.2.4.
Added reload4j exclusion.
Bumped dependency versions.
  • Loading branch information
@Asmoday
Asmoday committed Jan 18, 2024
1 parent edc27e9 commit f810bd5
Show file tree
Hide file tree
Showing 14 changed files with 208 additions and 16 deletions.
48 changes: 41 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-api.version>1.7.35</slf4j-api.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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
11 changes: 8 additions & 3 deletions smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
}
}

Expand Down
8 changes: 8 additions & 0 deletions smart-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
28 changes: 28 additions & 0 deletions smart-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 7 additions & 3 deletions smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand All @@ -134,7 +134,7 @@ public void shutdown() {

LOG.info("Shutting down system {}...",
AgentUtils.getSystemAddres(system));
system.shutdown();
system.terminate();
}
}

Expand Down Expand Up @@ -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);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void startActorSystem() {

@After
public void stopActorSystem() {
system.shutdown();
system.terminate();
}

public ActorSystem getActorSystem() {
Expand Down
18 changes: 18 additions & 0 deletions smart-hadoop-support/smart-hadoop-3.2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
18 changes: 18 additions & 0 deletions smart-hadoop-support/smart-hadoop-3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
18 changes: 18 additions & 0 deletions smart-hadoop-support/smart-hadoop-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
36 changes: 36 additions & 0 deletions smart-hadoop-support/smart-hadoop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading

0 comments on commit f810bd5

Please sign in to comment.