Merge 9bf80b2 into 73faf59

komamitsu · Aug 31, 2019 · 170d704 · 170d704
2 parents 73faf59 + 9bf80b2
commit 170d704
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 2.4.0 (2019-08-31)
+
+Features:
+
+- Rename `flushIntervalMillis` to `flushAttemptIntervalMillis` in fluency-fluentd
+- Add `senderMaxRetryIntervalMillis` and `senderBaseRetryIntervalMillis` to `FluencyBuilderForFluentd
+
+Security:
+
+- Use jackson-dataformat-msgpack:2.9.9.3 through msgpack-java:0.8.18 to take care of some CVE
+
+Misc:
+
+- Replace JUnit4 tests with JUnit5
+
 ## 2.3.3 (2019-06-19)
 
 Security:

diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,7 @@ subprojects {
 
   group = 'org.komamitsu'
   archivesBaseName = 'fluency'
-  version = '2.4.0-SNAPSHOT'
+  version = '2.4.0'
 
   def deployUsername = project.hasProperty('ossrhUsername') ? ossrhUsername : ''
   def deployPassword = project.hasProperty('ossrhPassword') ? ossrhPassword : ''

diff --git a/fluency-core/src/main/java/org/komamitsu/fluency/FluencyBuilder.java b/fluency-core/src/main/java/org/komamitsu/fluency/FluencyBuilder.java
@@ -79,7 +79,7 @@ public void setBufferChunkRetentionTimeMillis(Integer bufferChunkRetentionTimeMi
     }
 
     /**
-     * @deprecated  As of release 2.3.3, replaced by {@link #getFlushAttemptIntervalMillis()}
+     * @deprecated  As of release 2.4.0, replaced by {@link #getFlushAttemptIntervalMillis()}
      */
     @Deprecated
     public Integer getFlushIntervalMillis()
@@ -88,7 +88,7 @@ public Integer getFlushIntervalMillis()
     }
 
     /**
-     * @deprecated  As of release 2.3.3, replaced by {@link #setFlushAttemptIntervalMillis(Integer flushAttemptIntervalMillis)}
+     * @deprecated  As of release 2.4.0, replaced by {@link #setFlushAttemptIntervalMillis(Integer flushAttemptIntervalMillis)}
      */
     @Deprecated
     public void setFlushIntervalMillis(Integer flushAttemptIntervalMillis)

diff --git a/fluency-core/src/main/java/org/komamitsu/fluency/flusher/Flusher.java b/fluency-core/src/main/java/org/komamitsu/fluency/flusher/Flusher.java
@@ -200,7 +200,7 @@ public Ingester getIngester()
     }
 
     /**
-     * @deprecated  As of release 2.3.3, replaced by {@link #getFlushAttemptIntervalMillis()}
+     * @deprecated  As of release 2.4.0, replaced by {@link #getFlushAttemptIntervalMillis()}
      */
     @Deprecated
     public int getFlushIntervalMillis()
@@ -246,7 +246,7 @@ public static class Config
         private int waitUntilTerminated = 60;
 
         /**
-         * @deprecated  As of release 2.3.3, replaced by {@link #getFlushAttemptIntervalMillis()}
+         * @deprecated  As of release 2.4.0, replaced by {@link #getFlushAttemptIntervalMillis()}
          */
         @Deprecated
         public int getFlushIntervalMillis()
@@ -255,7 +255,7 @@ public int getFlushIntervalMillis()
         }
 
         /**
-         * @deprecated  As of release 2.3.3, replaced by {@link #setFlushAttemptIntervalMillis(int flushAttemptIntervalMillis)}
+         * @deprecated  As of release 2.4.0, replaced by {@link #setFlushAttemptIntervalMillis(int flushAttemptIntervalMillis)}
          */
         @Deprecated
         public void setFlushIntervalMillis(int flushAttemptIntervalMillis)