This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 189cf2310 fix(pom): corrent the scala-maven-plugin's config (#3884)
189cf2310 is described below
commit 189cf2310eb8111b3c6300ed34890a9bac4f1a2f
Author: Jack Xu <[email protected]>
AuthorDate: Thu Nov 24 20:15:27 2022 +0800
fix(pom): corrent the scala-maven-plugin's config (#3884)
---
.../scala/org/apache/linkis/common/utils/VariableUtils.scala | 5 ++---
linkis-commons/linkis-mybatis/pom.xml | 5 -----
linkis-engineconn-plugins/seatunnel/pom.xml | 1 -
linkis-public-enhancements/linkis-basedata-manager/pom.xml | 1 -
.../linkis-context-service/linkis-cs-server/pom.xml | 11 +----------
.../linkis-udf/linkis-udf-client/pom.xml | 4 ----
.../linkis-udf/linkis-udf-common/pom.xml | 4 ----
.../linkis-udf/linkis-udf-service/pom.xml | 4 ----
.../linkis-service-discovery/linkis-eureka/pom.xml | 4 ----
pom.xml | 9 +++++++--
10 files changed, 10 insertions(+), 38 deletions(-)
diff --git
a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
index fa644690f..7ac7f4ffd 100644
---
a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
+++
b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala
@@ -33,8 +33,7 @@ import org.apache.commons.lang3.StringUtils
import java.time.ZonedDateTime
import java.util
-import scala.collection.JavaConverters.mapAsScalaMapConverter
-import scala.collection.convert.WrapAsScala._
+import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.util.control.Exception.allCatch
@@ -57,7 +56,7 @@ object VariableUtils extends Logging {
def replace(replaceStr: String, variables: util.Map[String, Any]): String = {
val nameAndType = mutable.Map[String, variable.VariableType]()
var run_date: CustomDateType = null
- variables foreach {
+ variables.asScala.foreach {
case (RUN_DATE, value) if nameAndType.get(RUN_DATE).isEmpty =>
val run_date_str = value.asInstanceOf[String]
if (StringUtils.isNotEmpty(run_date_str)) {
diff --git a/linkis-commons/linkis-mybatis/pom.xml
b/linkis-commons/linkis-mybatis/pom.xml
index dc2647e42..f9e23f81e 100644
--- a/linkis-commons/linkis-mybatis/pom.xml
+++ b/linkis-commons/linkis-mybatis/pom.xml
@@ -89,11 +89,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/linkis-engineconn-plugins/seatunnel/pom.xml
b/linkis-engineconn-plugins/seatunnel/pom.xml
index 5c5eed4a6..fdf69c9dd 100644
--- a/linkis-engineconn-plugins/seatunnel/pom.xml
+++ b/linkis-engineconn-plugins/seatunnel/pom.xml
@@ -150,7 +150,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
<inherited>false</inherited>
<configuration>
<skipAssembly>false</skipAssembly>
diff --git a/linkis-public-enhancements/linkis-basedata-manager/pom.xml
b/linkis-public-enhancements/linkis-basedata-manager/pom.xml
index 2ae23f552..6702ca2b2 100644
--- a/linkis-public-enhancements/linkis-basedata-manager/pom.xml
+++ b/linkis-public-enhancements/linkis-basedata-manager/pom.xml
@@ -79,7 +79,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.2.0</version>
<inherited>false</inherited>
<configuration>
<skipAssembly>false</skipAssembly>
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
index 9cea978de..cf3a5d394 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
@@ -107,17 +107,8 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>scala-compile-first</id>
- <goals>
- <goal>add-source</goal>
- <goal>compile</goal>
- </goals>
- <phase>process-resources</phase>
- </execution>
- </executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
index 770c2926c..d314bd785 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml
@@ -82,10 +82,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
index df6c218b2..c0273bedd 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml
@@ -82,10 +82,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
index de63f586c..d1038b25c 100644
--- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
+++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml
@@ -99,10 +99,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
</plugin>
</plugins>
</build>
diff --git
a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
index a6947dc64..92ac883a7 100644
---
a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
+++
b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
@@ -101,10 +101,6 @@
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 9a07dbc30..70d7b2c0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1067,9 +1067,14 @@
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-maven-plugin.version}</version>
<configuration>
- <scalaVersion>${scala.version}</scalaVersion>
<recompileMode>incremental</recompileMode>
- <addScalacArgs>-target:jvm-${java.version}</addScalacArgs>
+ <args>
+ <arg>-unchecked</arg>
+ <arg>-deprecation</arg>
+ <arg>-feature</arg>
+ <arg>-explaintypes</arg>
+ <arg>-target:jvm-${java.version}</arg>
+ </args>
</configuration>
<executions>
<execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
