Merge aa191a3 into a31d6be

bullet-db · Mar 25, 2021 · d37d255 · d37d255
2 parents a31d6be + aa191a3
commit d37d255
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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 clover2:setup test clover2:aggregate clover2:clover

diff --git a/pom.xml b/pom.xml
@@ -38,8 +38,8 @@
         <storm.version>2.2.0</storm.version>
         <storm.metrics.version>2.2.0</storm.metrics.version>
         <jackson.core.version>2.10.2</jackson.core.version>
-        <bullet.core.version>1.2.0</bullet.core.version>
-        <bullet.dsl.version>1.1.1</bullet.dsl.version>
+        <bullet.core.version>1.2.1</bullet.core.version>
+        <bullet.dsl.version>1.1.2</bullet.dsl.version>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/com/yahoo/bullet/storm/BulletStormConfig.java b/src/main/java/com/yahoo/bullet/storm/BulletStormConfig.java
@@ -96,8 +96,8 @@ public class BulletStormConfig extends BulletConfig implements Serializable {
     public static final Map<String, Number> DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING = new HashMap<>();
     public static final String DEFAULT_BUILT_IN_METRICS_INTERVAL_KEY = "default";
     static {
-        DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put("bullet_active_queries", 10L);
-        DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put(DEFAULT_BUILT_IN_METRICS_INTERVAL_KEY, 10L);
+        DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put("bullet_active_queries", 10);
+        DEFAULT_TOPOLOGY_METRICS_BUILT_IN_EMIT_INTERVAL_MAPPING.put(DEFAULT_BUILT_IN_METRICS_INTERVAL_KEY, 10);
     }
     public static final List<String> DEFAULT_TOPOLOGY_METRICS_CLASSES = new ArrayList<>();
     static {