Core 1.2.1, Travis fix, Kafka 2.6 (#24)

bullet-db · Mar 25, 2021 · 5f68495 · 5f68495
1 parent d7f982f
commit 5f68495
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ script:
 - mvn verify
 after_success:
 - mvn coveralls:report
-- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_TAG}" != "" && mvn deploy --settings travis/settings.xml
+- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_BRANCH}" != "master" && mvn deploy --settings travis/settings.xml
 cache:
   directories:
   - "~/.m2"

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ jar:
 	    mvn clean package
 
 release:
-	    mvn -B release:prepare release:clean
+	    mvn -B release:prepare release:clean && git checkout `git describe --abbrev=0` -b `git describe --abbrev=0` && git push -u origin HEAD && git checkout master && git pull
 
 coverage:
 	    mvn clean scoverage:report

diff --git a/pom.xml b/pom.xml
@@ -38,10 +38,10 @@
         <scala.dep.version>2.12</scala.dep.version>
         <scoverage.plugin.version>1.3.0</scoverage.plugin.version>
         <spark.version>3.0.1</spark.version>
-        <bullet.core.version>1.2.0</bullet.core.version>
-        <bullet.dsl.version>1.0.1</bullet.dsl.version>
+        <bullet.core.version>1.2.1</bullet.core.version>
+        <bullet.dsl.version>1.1.3</bullet.dsl.version>
         <avro.version>1.9.2</avro.version>
-        <kafka.clients.version>2.3.0</kafka.clients.version>
+        <kafka.clients.version>2.6.0</kafka.clients.version>
         <pulsar.client.version>2.2.1</pulsar.client.version>
     </properties>