Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare release v170 #327

Merged
merged 3 commits into from Jul 19, 2019
Merged

Prepare release v170 #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40fa97c
prepare release v1.7.0
uncleGen Jul 19, 2019
2e2c9e6
update
uncleGen Jul 19, 2019
82309c0
Merge branch 'prepare-release-v170' of github.com:aliyun/aliyun-emapr…
uncleGen Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ emr-druid/target/*
examples/target/*
emr-hbase/target/*
emr-jdbc/target/*
emr-redis/target/*
emr-sql/target/*
assembly/target/*
*.iml
log.txt
Expand Down
14 changes: 1 addition & 13 deletions pom.xml
View file
Open in desktop
Expand Up @@ -675,23 +675,11 @@
<properties>
<shc.version>1.1.3-2.4-s_2.11</shc.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-aliyun-avro_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql-kafka-0-10_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>gpg</id>
<properties>
<shc.version>1.1.3-2.4-s_2.11</shc.version>
<shc.version>1.1.1-2.1-s_2.11</shc.version>
</properties>
<build>
<plugins>
Expand Down