Merge pull request #24 from aliyun/feature/release-v1.1.4

release-1.1.4

Author: Garfier

client/migrationx-common/pom.xml

@@ -22,11 +22,11 @@
     <parent>
         <artifactId>migrationx</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
 
     <artifactId>migrationx-common</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.4</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

client/migrationx-domain/migrationx-domain-airflow/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-domain-dataworks</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
     </dependencies>
 

client/migrationx-domain/migrationx-domain-aliyunemr/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.26.0</version>
+            <version>1.21</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

client/migrationx-domain/migrationx-domain-azkaban/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,6 +36,10 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.aliyun.dataworks</groupId>
+            <artifactId>dw-common-spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.linkedin.azkaban</groupId>
             <artifactId>az-core</artifactId>

client/migrationx-domain/migrationx-domain-azkaban/src/main/java/com/aliyun/dataworks/migrationx/domain/dataworks/azkaban/service/AzkabanPackageParser.java

@@ -15,17 +15,39 @@
 
 package com.aliyun.dataworks.migrationx.domain.dataworks.azkaban.service;
 
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 import azkaban.Constants;
 import azkaban.flow.Edge;
 import azkaban.flow.Flow;
 import azkaban.flow.Node;
-import azkaban.project.*;
+import azkaban.project.DirectoryFlowLoader;
+import azkaban.project.DirectoryYamlFlowLoader;
+import azkaban.project.FlowLoader;
+import azkaban.project.FlowLoaderFactory;
+import azkaban.project.Project;
 import azkaban.utils.Props;
+import com.aliyun.dataworks.common.spec.utils.ReflectUtils;
 import com.aliyun.dataworks.migrationx.domain.dataworks.azkaban.objects.ConfigProperty;
 import com.aliyun.dataworks.migrationx.domain.dataworks.azkaban.objects.Job;
 import com.aliyun.dataworks.migrationx.domain.dataworks.azkaban.objects.JobType;
 import com.aliyun.migrationx.common.utils.FileNameUtils;
-import com.aliyun.migrationx.common.utils.ReflectUtils;
 import com.google.common.base.Joiner;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
@@ -34,14 +56,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 /**
  * @author sam.liux
  * @date 2020/08/04
@@ -197,7 +211,7 @@ private Job parseJobFile(FlowLoader flowLoader, File flowFile, Flow flow, Node n
         JobType jobType = JobType.getByName(type);
         Job job = JobType.newJobInstance(jobType);
         job.setName(node.getId());
-        if (props == null || StringUtils.isNotBlank(props.getSource())) {
+        if (StringUtils.isNotBlank(props.getSource())) {
             job.setJobFile(new File(projectDir, props.getSource()));
         }
         List<Field> fields = ReflectUtils.getPropertyFields(job);

client/migrationx-domain/migrationx-domain-caiyunjian/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-domain-dataworks</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
     </dependencies>
 

client/migrationx-domain/migrationx-domain-core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.aliyun.dataworks</groupId>
         <artifactId>migrationx-domain</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
 
     <artifactId>migrationx-domain-core</artifactId>

client/migrationx-domain/migrationx-domain-datago/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,17 +38,17 @@
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-domain-caiyunjian</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-common</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-domain-dataworks</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>

client/migrationx-domain/migrationx-domain-dataworks/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.2</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.aliyun.dataworks</groupId>
             <artifactId>migrationx-domain-core</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

client/migrationx-domain/migrationx-domain-dataworks/src/main/java/com/aliyun/dataworks/migrationx/domain/dataworks/service/DataWorksSpecPackageFileService.java

@@ -156,8 +156,8 @@ private void writeNodeCode(File workflowDir, Node node) {
 
     private void writeNodeSpec(File workflowDir, Node node) {
         Specification<DataWorksWorkflowSpec> specification = new Specification<>();
-        specification.setVersion(SpecVersion.V_1_1_0);
-        specification.setKind(SpecKind.CYCLE_WORKFLOW);
+        specification.setVersion(SpecVersion.V_1_1_0.getLabel());
+        specification.setKind(SpecKind.CYCLE_WORKFLOW.getLabel());
 
         node.setGlobalUuid(UUID.randomUUID().toString());
         completeNodeFolder(node);