0.3 init

合并0.3 server代码，整体还有遗留问题
justeene · Aug 7, 2018 · 7468952 · 7468952
1 parent b4710cf
commit 7468952
Show file tree

Hide file tree

Showing 378 changed files with 21,272 additions and 12,090 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,6 @@ spark-warehouse
 swagger-ui/
 lib/
 tempFiles/
+userfiles/
 .vscode
+webapp/
diff --git a/LICENSE-3RD-PARTY b/LICENSE-3RD-PARTY
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>davinci-parent_2.11</artifactId>
+        <artifactId>davinci-parent_3.01</artifactId>
         <groupId>edp.davinci</groupId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>davinci-assembly_2.11</artifactId>
+    <artifactId>davinci-assembly_3.01</artifactId>
     <packaging>pom</packaging>
 
     <licenses>
@@ -29,13 +29,13 @@
         <build.copyDependenciesPhase>package</build.copyDependenciesPhase>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>edp.davinci</groupId>
-            <artifactId>davinci-server_${scala.binary.version}</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+    <!--<dependencies>-->
+        <!--<dependency>-->
+            <!--<groupId>edp.davinci</groupId>-->
+            <!--<artifactId>davinci-server_${scala.binary.version}</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+    <!--</dependencies>-->
 
     <build>
         <plugins>

diff --git a/bin/build.sh b/bin/build.sh