This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new bc4c6a8b5 feat: add jdk11 profile, and remove use of
sun.net.IPAdressUtils (#3794)
bc4c6a8b5 is described below
commit bc4c6a8b524071ddd13f97d8c8469fd6b1196635
Author: Jack Xu <[email protected]>
AuthorDate: Thu Nov 10 16:28:22 2022 +0800
feat: add jdk11 profile, and remove use of sun.net.IPAdressUtils (#3794)
* feat: add jdk11 profile, and remove use of sun.net.IPAdressUtils
---
.../linkis/entrance/utils/JobHistoryHelper.scala | 5 ++---
.../apache/linkis/manager/am/utils/AMUtils.scala | 16 ++++++++--------
pom.xml | 22 ++++++++++++++++++++++
3 files changed, 32 insertions(+), 11 deletions(-)
diff --git
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
index d912e7110..8b3cbb574 100644
---
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
+++
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
@@ -40,7 +40,7 @@ import java.util.Date
import scala.collection.JavaConverters._
-import sun.net.util.IPAddressUtil
+import com.google.common.net.InetAddresses
object JobHistoryHelper extends Logging {
@@ -79,8 +79,7 @@ object JobHistoryHelper extends Logging {
)
val afterProxyIp = addrList
.find(ip => {
- StringUtils.isNotEmpty(ip) &&
- (IPAddressUtil.isIPv4LiteralAddress(ip) ||
IPAddressUtil.isIPv6LiteralAddress(ip))
+ StringUtils.isNotEmpty(ip) && InetAddresses.isInetAddress(ip)
})
.getOrElse("")
if (StringUtils.isNotEmpty(afterProxyIp)) {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/utils/AMUtils.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/utils/AMUtils.scala
index 1d7c2a7e2..aa4aa5ce0 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/utils/AMUtils.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/utils/AMUtils.scala
@@ -111,16 +111,16 @@ object AMUtils {
}
EMNodeVo.setOwner(node.getOwner)
if (node.getNodeTaskInfo != null) {
- if (node.getNodeTaskInfo.getRunningTasks != null) {
+ if (node.getNodeTaskInfo.getRunningTasks >= 0) {
EMNodeVo.setRunningTasks(node.getNodeTaskInfo.getRunningTasks)
}
- if (node.getNodeTaskInfo.getPendingTasks != null) {
+ if (node.getNodeTaskInfo.getPendingTasks >= 0) {
EMNodeVo.setPendingTasks(node.getNodeTaskInfo.getPendingTasks)
}
- if (node.getNodeTaskInfo.getSucceedTasks != null) {
+ if (node.getNodeTaskInfo.getSucceedTasks >= 0) {
EMNodeVo.setSucceedTasks(node.getNodeTaskInfo.getSucceedTasks)
}
- if (node.getNodeTaskInfo.getFailedTasks != null) {
+ if (node.getNodeTaskInfo.getFailedTasks >= 0) {
EMNodeVo.setFailedTasks(node.getNodeTaskInfo.getFailedTasks)
}
}
@@ -234,16 +234,16 @@ object AMUtils {
}
AMEngineNodeVo.setOwner(node.getOwner)
if (node.getNodeTaskInfo != null) {
- if (node.getNodeTaskInfo.getRunningTasks != null) {
+ if (node.getNodeTaskInfo.getRunningTasks >= 0) {
AMEngineNodeVo.setRunningTasks(node.getNodeTaskInfo.getRunningTasks)
}
- if (node.getNodeTaskInfo.getPendingTasks != null) {
+ if (node.getNodeTaskInfo.getPendingTasks >= 0) {
AMEngineNodeVo.setPendingTasks(node.getNodeTaskInfo.getPendingTasks)
}
- if (node.getNodeTaskInfo.getSucceedTasks != null) {
+ if (node.getNodeTaskInfo.getSucceedTasks >= 0) {
AMEngineNodeVo.setSucceedTasks(node.getNodeTaskInfo.getSucceedTasks)
}
- if (node.getNodeTaskInfo.getFailedTasks != null) {
+ if (node.getNodeTaskInfo.getFailedTasks >= 0) {
AMEngineNodeVo.setFailedTasks(node.getNodeTaskInfo.getFailedTasks)
}
}
diff --git a/pom.xml b/pom.xml
index 6a67f2787..674f386bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1323,6 +1323,28 @@
<rat.skip>false</rat.skip>
</properties>
</profile>
+ <profile>
+ <id>jdk11-on</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>--add-opens java.base/java.util=ALL-UNNAMED
+ --add-opens java.base/java.nio=ALL-UNNAMED
+ --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>release</id>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
