fix：modify pom.xml and add .gitignore #32

aliyun · May 20, 2024 · a76ff31 · a76ff31
1 parent 47052c6
commit a76ff31
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,40 @@
+/.idea/
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
diff --git a/client/migrationx-domain/migrationx-domain-azkaban/pom.xml b/client/migrationx-domain/migrationx-domain-azkaban/pom.xml
@@ -32,7 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <azkaban.version>3.71.0-3</azkaban.version>
+        <azkaban.version>3.58.0</azkaban.version>
     </properties>
 
     <dependencies>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.linkedin.azkaban</groupId>
             <artifactId>az-core</artifactId>
-            <version>${azkaban.version}-1</version>
+            <version>${azkaban.version}</version>
         </dependency>
         <dependency>
             <groupId>com.linkedin.azkaban</groupId>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.linkedin.azkaban</groupId>
             <artifactId>azkaban-spi</artifactId>
-            <version>${azkaban.version}</version>
+            <version>${azkaban.spi.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/client/migrationx-domain/migrationx-domain-dataworks/pom.xml b/client/migrationx-domain/migrationx-domain-dataworks/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.2.16-preview_07</version>
+            <version>1.2.17</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -51,7 +51,7 @@
         <spark.launcher.version>2.4.3</spark.launcher.version>
         <oozie.version>5.1.0</oozie.version>
         <druid-version>1.2.9_preview_04</druid-version>
-        <azkaban.version>3.71.0-3</azkaban.version>
+        <azkaban.version>3.58.0</azkaban.version>
         <powermock.version>2.0.9</powermock.version>
     </properties>
     <dependencyManagement>
@@ -80,7 +80,7 @@
             <dependency>
                 <groupId>com.linkedin.azkaban</groupId>
                 <artifactId>az-core</artifactId>
-                <version>${azkaban.version}-1</version>
+                <version>${azkaban.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.linkedin.azkaban</groupId>
@@ -90,7 +90,7 @@
             <dependency>
                 <groupId>com.linkedin.azkaban</groupId>
                 <artifactId>azkaban-spi</artifactId>
-                <version>${azkaban.version}</version>
+                <version>${azkaban.spi.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.reflections</groupId>

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,8 @@
         <spark.launcher.version>2.4.3</spark.launcher.version>
         <oozie.version>5.1.0</oozie.version>
         <druid-version>1.2.9_preview_04</druid-version>
-        <azkaban.version>3.71.0-3</azkaban.version>
+        <azkaban.version>3.58.0</azkaban.version>
+        <azkaban.spi.version>3.50.3</azkaban.spi.version>
         <powermock.version>2.0.9</powermock.version>
     </properties>
     <dependencyManagement>
@@ -72,7 +73,7 @@
             <dependency>
                 <groupId>com.linkedin.azkaban</groupId>
                 <artifactId>az-core</artifactId>
-                <version>${azkaban.version}-1</version>
+                <version>${azkaban.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.linkedin.azkaban</groupId>
@@ -82,7 +83,7 @@
             <dependency>
                 <groupId>com.linkedin.azkaban</groupId>
                 <artifactId>azkaban-spi</artifactId>
-                <version>${azkaban.version}</version>
+                <version>${azkaban.`spi.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>