修改poml文件，添加adaptor

qzenger · Jun 13, 2018 · 3506222 · 3506222
1 parent a15fec7
commit 3506222
Show file tree

Hide file tree

Showing 11 changed files with 157 additions and 112 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,8 +16,6 @@
         <module>streamingpro-dl4j</module>
         <module>streamingpro-tensorflow</module>
         <module>streamingpro-opencv</module>
-        <module>streamingpro-spark-2.2.0-adaptor</module>
-        <module>streamingpro-spark-2.3.0-adaptor</module>
     </modules>
 
     <properties>
@@ -94,6 +92,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>scala-2.10</id>
             <properties>
@@ -180,6 +179,7 @@
                 <spark.version>2.2.0</spark.version>
             </properties>
             <modules>
+                <module>streamingpro-spark-2.2.0-adaptor</module>
                 <module>streamingpro-dsl-legacy</module>
                 <module>streamingpro-spark-2.0</module>
                 <module>streamingpro-crawler</module>
@@ -246,6 +246,7 @@
                 <spark.version>2.3.0</spark.version>
             </properties>
             <modules>
+                <module>streamingpro-spark-2.3.0-adaptor</module>
                 <module>streamingpro-dsl</module>
                 <module>streamingpro-spark-2.0</module>
                 <module>streamingpro-crawler</module>
@@ -382,14 +383,6 @@
             <scope>${scope}</scope>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.ansj</groupId>-->
-        <!--<artifactId>ansj_seg</artifactId>-->
-        <!--<version>5.0</version>-->
-        <!--<scope>system</scope>-->
-        <!--<systemPath>${project.basedir}/lib/ansj_seg-5.0.0-all-in-one.jar</systemPath>-->
-        <!--</dependency>-->
-
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -442,11 +435,6 @@
             <version>2.6.2</version>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId></groupId>-->
-        <!--<artifactId></artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>net.csdn</groupId>
             <artifactId>serviceframework-dispatcher_${scala.binary.version}</artifactId>

diff --git a/streamingpro-api/pom.xml b/streamingpro-api/pom.xml
@@ -17,6 +17,12 @@
             <version>${spark.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-core_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/streamingpro-commons/pom.xml b/streamingpro-commons/pom.xml
@@ -11,8 +11,6 @@
 
     <artifactId>streamingpro-common</artifactId>
     <dependencies>
-
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>

diff --git a/streamingpro-crawler/pom.xml b/streamingpro-crawler/pom.xml
@@ -13,23 +13,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>streaming.king</groupId>
-            <artifactId>streamingpro-spark-common</artifactId>
-            <version>${parent.version}</version>
-            <scope>compile</scope>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-sql_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.11</artifactId>
+            <artifactId>spark-core_${scala.binary.version}</artifactId>
             <version>${spark.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-sql_2.11</artifactId>
+            <artifactId>spark-mllib_${scala.binary.version}</artifactId>
             <version>${spark.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
@@ -85,6 +87,7 @@
             </exclusions>
         </dependency>
 
+
     </dependencies>
 
 </project>
diff --git a/streamingpro-dl4j/pom.xml b/streamingpro-dl4j/pom.xml
@@ -12,6 +12,25 @@
     <artifactId>streamingpro-dl4j</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-sql_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-core_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-mllib_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>streaming.king</groupId>
             <artifactId>streamingpro-api</artifactId>
@@ -31,6 +50,14 @@
                     <groupId>org.apache.spark</groupId>
                     <artifactId>spark-sql_${scala.binary.version}</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.spark</groupId>
+                    <artifactId>spark-mllib_${scala.binary.version}</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.spark</groupId>
+                    <artifactId>spark-core_${scala.binary.version}</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
@@ -89,11 +116,6 @@
             <version>0.9.1</version>
 
         </dependency>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-sql_${scala.binary.version}</artifactId>
-            <version>${spark.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
+
     </dependencies>
 </project>
diff --git a/streamingpro-opencv/pom.xml b/streamingpro-opencv/pom.xml
@@ -11,6 +11,25 @@
 
     <artifactId>streamingpro-opencv</artifactId>
     <dependencies>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-sql_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-core_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-mllib_${scala.binary.version}</artifactId>
+            <version>${spark.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>javacv-platform</artifactId>
@@ -27,22 +46,11 @@
             <artifactId>streamingpro-api</artifactId>
             <version>${parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-sql_${scala.binary.version}</artifactId>
-            <version>${spark.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-mllib_${scala.binary.version}</artifactId>
-            <version>${spark.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
         <dependency>
             <groupId>org.imgscalr</groupId>
             <artifactId>imgscalr-lib</artifactId>
             <version>4.2</version>
         </dependency>
+
     </dependencies>
 </project>