Skip to content

Commit 50b0b1f

Browse files
allwefantasyallwefantasy
committed
udpate
1 parent 1014e4d commit 50b0b1f

4 files changed

Lines changed: 10 additions & 126 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This guide document introduce [how to contribute to MLSQL](https://github.com/al
3030

3131
* The lasted version is MLSQL v1.2.0
3232
* You can download from [MLSQL Website](http://download.mlsql.tech/)
33-
* Spark 2.2.0/2.3.2/2.4.3 are tested
33+
* Spark 2.3.2/2.4.3 are tested
3434

3535

3636
Run PreBuild Distribution:

‎pom.xml‎

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<spark.streaming.kafka.artifactId>spark-streaming-kafka-0-8_${scala.binary.version}
6767
</spark.streaming.kafka.artifactId>
6868
<spark.sql.kafka.artifactId>spark-sql-kafka-0-10_${scala.binary.version}</spark.sql.kafka.artifactId>
69-
<spark.version>2.2.0</spark.version>
70-
<spark.bigversion>2.2</spark.bigversion>
69+
<spark.version>2.4.3</spark.version>
70+
<spark.bigversion>2.4</spark.bigversion>
7171

7272

7373
<flink.version>1.4.2</flink.version>
@@ -341,75 +341,7 @@
341341

342342
</profile>
343343

344-
<profile>
345-
346-
<id>spark-2.2.0</id>
347-
<properties>
348-
<spark.streaming.kafka.artifactId>spark-streaming-kafka-0-8_${scala.binary.version}
349-
</spark.streaming.kafka.artifactId>
350-
<spark.sql.kafka.artifactId>spark-sql-kafka-0-10_${scala.binary.version}</spark.sql.kafka.artifactId>
351-
<spark.version>2.2.0</spark.version>
352-
<spark.bigversion>2.2</spark.bigversion>
353-
<bigdl.spark.version.minor>2.2.0</bigdl.spark.version.minor>
354-
</properties>
355-
<modules>
356-
<module>streamingpro-spark-2.2.0-adaptor</module>
357-
<module>streamingpro-dsl-legacy</module>
358-
<module>streamingpro-mlsql</module>
359-
<module>streamingpro-crawler</module>
360-
</modules>
361-
<dependencies>
362-
<dependency>
363-
<groupId>javax.servlet</groupId>
364-
<artifactId>javax.servlet-api</artifactId>
365-
<version>3.1.0</version>
366-
</dependency>
367-
<dependency>
368-
<groupId>net.csdn</groupId>
369-
<artifactId>serviceframework-jetty-9-server</artifactId>
370-
<version>${serviceframework.version}</version>
371-
<exclusions>
372-
<!--<exclusion>-->
373-
<!--<groupId>org.eclipse.jetty</groupId>-->
374-
<!--<artifactId>jetty-server</artifactId>-->
375-
<!--</exclusion>-->
376-
<!--<exclusion>-->
377-
<!--<groupId>org.eclipse.jetty</groupId>-->
378-
<!--<artifactId>jetty-http</artifactId>-->
379-
<!--</exclusion>-->
380-
<!--<exclusion>-->
381-
<!--<groupId>org.eclipse.jetty</groupId>-->
382-
<!--<artifactId>jetty-io</artifactId>-->
383-
<!--</exclusion>-->
384-
<!--<exclusion>-->
385-
<!--<groupId>org.eclipse.jetty</groupId>-->
386-
<!--<artifactId>jetty-continuation</artifactId>-->
387-
<!--</exclusion>-->
388-
<!--<exclusion>-->
389-
<!--<groupId>org.eclipse.jetty</groupId>-->
390-
<!--<artifactId>jetty-util</artifactId>-->
391-
<!--</exclusion>-->
392-
<exclusion>
393-
<groupId>org.eclipse.jetty</groupId>
394-
<artifactId>jetty-servlet</artifactId>
395-
</exclusion>
396-
<exclusion>
397-
<groupId>junit</groupId>
398-
<artifactId>junit</artifactId>
399-
</exclusion>
400-
<exclusion>
401-
<groupId>org.scala-lang</groupId>
402-
<artifactId>jline</artifactId>
403-
</exclusion>
404-
<exclusion>
405-
<groupId>com.alibaba</groupId>
406-
<artifactId>dubbo</artifactId>
407-
</exclusion>
408-
</exclusions>
409-
</dependency>
410-
</dependencies>
411-
</profile>
412-
344+
413345

414346
<profile>
415347
<id>spark-2.3.0</id>

‎streamingpro-mlsql/pom.xml‎

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -157,28 +157,6 @@
157157
</dependencies>
158158
</profile>
159159

160-
<profile>
161-
<id>dsl</id>
162-
<dependencies>
163-
<dependency>
164-
<groupId>tech.mlsql</groupId>
165-
<artifactId>streamingpro-dsl</artifactId>
166-
<version>${project.parent.version}</version>
167-
</dependency>
168-
</dependencies>
169-
</profile>
170-
171-
<profile>
172-
<id>dsl-legacy</id>
173-
<dependencies>
174-
<dependency>
175-
<groupId>tech.mlsql</groupId>
176-
<artifactId>streamingpro-dsl-legacy</artifactId>
177-
<version>${project.parent.version}</version>
178-
</dependency>
179-
</dependencies>
180-
</profile>
181-
182160

183161
<profile>
184162
<id>crawler</id>
@@ -352,38 +330,6 @@
352330
</dependencies>
353331
</profile>
354332

355-
<profile>
356-
<id>streamingpro-spark-2.2.0-adaptor</id>
357-
<dependencies>
358-
<dependency>
359-
<groupId>tech.mlsql</groupId>
360-
<artifactId>streamingpro-spark-2.2.0-adaptor</artifactId>
361-
<version>${project.parent.version}</version>
362-
</dependency>
363-
<dependency>
364-
<groupId>com.intel.analytics.bigdl</groupId>
365-
<artifactId>bigdl-SPARK_2.2</artifactId>
366-
<version>0.6.0</version>
367-
<exclusions>
368-
<exclusion>
369-
<groupId>com.google.guava</groupId>
370-
<artifactId>guava</artifactId>
371-
</exclusion>
372-
<exclusion>
373-
<groupId>junit</groupId>
374-
<artifactId>junit</artifactId>
375-
</exclusion>
376-
</exclusions>
377-
</dependency>
378-
<!--<dependency>-->
379-
<!--<groupId>com.intel.analytics.zoo</groupId>-->
380-
<!--<artifactId>analytics-zoo-bigdl_0.6.0-spark_2.2.0</artifactId>-->
381-
<!--<version>0.3.0</version>-->
382-
<!--</dependency>-->
383-
384-
</dependencies>
385-
</profile>
386-
387333
<profile>
388334
<id>streamingpro-spark-2.3.0-adaptor</id>
389335
<dependencies>
@@ -532,6 +478,12 @@
532478
</profiles>
533479
<dependencies>
534480

481+
<dependency>
482+
<groupId>tech.mlsql</groupId>
483+
<artifactId>streamingpro-dsl</artifactId>
484+
<version>${project.parent.version}</version>
485+
</dependency>
486+
535487
<dependency>
536488
<groupId>tech.mlsql</groupId>
537489
<artifactId>streamingpro-spark-common</artifactId>

streamingpro-mlsql/src/main/java/org/apache/spark/sql/catalyst/plans/logical/MLSQLDFParser.scala renamed to streamingpro-spark-2.4.0-adaptor/src/main/java/org/apache/spark/sql/catalyst/plans/logical/MLSQLDFParser.scala

File renamed without changes.

0 commit comments

Comments
 (0)