summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkata Harish Kajur <vk250x@att.com>2019-01-07 18:15:20 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-07 18:15:20 +0000
commit1b20fdda530d3325e0a0780fdac5484c6d2093bd (patch)
tree08cf91e7c32d15f39e0d1cd289514e9671d90f35
parent7bc0c64e94ed084f2144ff3f6d0df11a877c9b72 (diff)
parentb179d63aeef9beb3ef9d5b4f028af9a716f2faaf (diff)
Merge "Update ring dependency, fix event issue" into casablanca3.0.1-ONAP1.3.1casablanca
-rw-r--r--pom.xml4
-rw-r--r--project.clj2
-rw-r--r--src/chameleon/kafka.clj1
3 files changed, 3 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 8ac528a..bf48053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<name>aai-chameleon</name>
<description/>
<scm>
- <tag>0e3c742bec42615ac1576d07c8fa322512e4c215</tag>
+ <tag>694cabe2c0c5aaa05de06e731112b4bf78366de5</tag>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -206,7 +206,7 @@
<dependency>
<groupId>ring</groupId>
<artifactId>ring-core</artifactId>
- <version>1.6.3</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>ring</groupId>
diff --git a/project.clj b/project.clj
index 8813069..b8e4413 100644
--- a/project.clj
+++ b/project.clj
@@ -4,7 +4,7 @@
[org.clojure/core.async "0.4.474"]
[com.7theta/utilis "1.0.4"]
[http-kit "2.2.0"]
- [ring/ring-core "1.6.3"]
+ [ring/ring-core "1.7.1"]
[ring/ring-defaults "0.3.1"]
[ring/ring-anti-forgery "1.1.0"]
[compojure "1.6.0"]
diff --git a/src/chameleon/kafka.clj b/src/chameleon/kafka.clj
index bdfc07d..357d68a 100644
--- a/src/chameleon/kafka.clj
+++ b/src/chameleon/kafka.clj
@@ -99,7 +99,6 @@
(loop []
(let [consumer-records (.poll consumer 0)]
(when (and (->> consumer-records
- (s/conform :kafka/consumer-record)
(map consumer-record->clojure)
(send-with-sla-timeout chan sla-timeout))
(try (.commitSync consumer)