Skip to content

Commit ab9716c

Browse files
committed
Adopt to Linkis 1.4.0.
1 parent a587a49 commit ab9716c

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

dss-apps/dss-apiservice-server/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,12 @@
286286
<scope>provided</scope>
287287
</dependency>
288288

289+
<dependency>
290+
<groupId>com.sun.jersey</groupId>
291+
<artifactId>jersey-core</artifactId>
292+
<version>1.19.1</version>
293+
</dependency>
294+
289295
</dependencies>
290296

291297
<build>

dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ private Map<String, String> uploadBml(String userName, String scriptPath, Map<St
491491
List<Variable> variableList=null;
492492
if(metadata.entrySet().size() >0) {
493493
Variable[] v = VariableParser.getVariables(metadata);
494-
variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.value())).collect(Collectors.toList());
494+
variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.getValue())).collect(Collectors.toList());
495495

496496
}
497497
if(variableList!=null) {
@@ -520,7 +520,7 @@ private Map<String, String> updateBml(String userName, String resourceId, String
520520
try {
521521
ScriptFsWriter writer = StorageScriptFsWriter.getScriptFsWriter(new FsPath(scriptPath), Consts.UTF_8.toString(), null);
522522
Variable[] v = VariableParser.getVariables(metadata);
523-
List<Variable> variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.value())).collect(Collectors.toList());
523+
List<Variable> variableList = Arrays.stream(v).filter(var -> !StringUtils.isEmpty(var.getValue())).collect(Collectors.toList());
524524
writer.addMetaData(new ScriptMetaData(variableList.toArray(new Variable[0])));
525525
writer.addRecord(new ScriptRecord(scriptContent));
526526
InputStream inputStream = writer.getInputStream();

plugins/linkis/dss-gateway-support/src/main/scala/org/apache/linkis/gateway/parser/DSSRouteLabelParser.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.apache.linkis.gateway.parser
1818

1919
import org.apache.linkis.gateway.http.GatewayContext
20-
import org.apache.linkis.gateway.ujes.route.label.RouteLabelParser
2120
import org.apache.linkis.manager.label.entity.route.RouteLabel
2221
import org.springframework.stereotype.Component
2322

pom.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,20 @@
3939
<module>plugins/dolphinscheduler</module>
4040
</modules>
4141

42+
<repositories>
43+
<repository>
44+
<id>apache.snapshots</id>
45+
<name>Apache Snapshot Repository</name>
46+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
47+
<snapshots>
48+
<enabled>true</enabled>
49+
</snapshots>
50+
</repository>
51+
</repositories>
52+
4253
<properties>
4354
<dss.version>1.1.2</dss.version>
44-
<linkis.version>1.3.2</linkis.version>
55+
<linkis.version>1.4.0-SNAPSHOT</linkis.version>
4556
<scala.version>2.11.12</scala.version>
4657
<jdk.compile.version>1.8</jdk.compile.version>
4758
<maven.version>3.3.3</maven.version>
@@ -205,6 +216,11 @@
205216
<configuration>
206217
<scalaVersion>${scala.version}</scalaVersion>
207218
<recompileMode>all</recompileMode>
219+
<args>
220+
<arg>-nobootcp</arg>
221+
<arg>-target:jvm-${jdk.compile.version}</arg>
222+
</args>
223+
208224
<!-- <useZincServer>true</useZincServer>-->
209225
</configuration>
210226
</plugin>

0 commit comments

Comments
 (0)