From c26a2cc6c2323d7df5f40c5b80e5bf26717a12cb Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Mar 2019 12:18:19 +0100 Subject: [PATCH 1/8] Bump dev version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d5dadd3e..b6f3e51a 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ subprojects { // Configuration // //---------------------------------------------------------------------------// - version = '0.12.0' + version = '0.12.1-SNAPSHOT' group = 'org.radarbase' ext.githubRepoName = 'RADAR-base/radar-commons' From 7ace1679607b50bc8b5ac221fefccb1c1ee5ba85 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 11 Mar 2019 12:24:21 +0100 Subject: [PATCH 2/8] Fix bintray org --- gradle/publishing.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index bab00a0f..c3703871 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -82,14 +82,14 @@ publishing { } bintray { - user project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') - key project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') - override false - publications 'mavenJar' + user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') + key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') + override = false + publications = 'mavenJar' pkg { repo = project.group name = project.name - userOrg = 'radar-cns' + userOrg = 'radar-base' desc = project.description licenses = ['Apache-2.0'] websiteUrl = website From d5d51792c33fa22f3d8dd3fdb8fcc5295ef0bd0a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 18 Mar 2019 14:51:10 +0100 Subject: [PATCH 3/8] Fix publication and dependencies --- gradle/publishing.gradle | 2 +- radar-commons-testing/build.gradle | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index c3703871..b81f2dc5 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -85,7 +85,7 @@ bintray { user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') override = false - publications = 'mavenJar' + publications 'mavenJar' pkg { repo = project.group name = project.name diff --git a/radar-commons-testing/build.gradle b/radar-commons-testing/build.gradle index 8fb78f6f..b8ca6ef1 100644 --- a/radar-commons-testing/build.gradle +++ b/radar-commons-testing/build.gradle @@ -18,7 +18,12 @@ apply plugin: 'application' mainClassName = 'org.radarbase.mock.MockProducer' +configurations { + applicationRuntimeOnly +} + run { + classpath += configurations.applicationRuntimeOnly if (project.hasProperty("mockConfig")) { args project.property("mockConfig") } else { @@ -49,7 +54,7 @@ dependencies { exclude group: 'org.slf4j', module: 'slf4j-log4j12' } - runtimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion + applicationRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion // Direct producer uses KafkaAvroSerializer if initialized testImplementation group: 'junit', name: 'junit', version: junitVersion From 68b0d4976257c403e45606e791c875fb7bc1fa5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 29 Apr 2019 06:18:50 +0000 Subject: [PATCH 4/8] Bump opencsv from 4.5 to 4.6 Bumps opencsv from 4.5 to 4.6. Signed-off-by: dependabot[bot] --- radar-commons-testing/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radar-commons-testing/build.gradle b/radar-commons-testing/build.gradle index 8fb78f6f..522ede89 100644 --- a/radar-commons-testing/build.gradle +++ b/radar-commons-testing/build.gradle @@ -41,7 +41,7 @@ dependencies { api group: 'org.apache.avro', name: 'avro', version: avroVersion api group: 'org.radarcns', name: 'radar-schemas-commons', version: radarSchemasVersion - implementation group: 'com.opencsv', name: 'opencsv', version: '4.5' + implementation group: 'com.opencsv', name: 'opencsv', version: '4.6' implementation group: 'com.fasterxml.jackson.core' , name: 'jackson-databind' , version: jacksonVersion implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaVersion implementation (group: 'io.confluent', name: 'kafka-avro-serializer', version: confluentVersion) { From dff16ca585dd556f963a5eab2c4e05b0adf06338 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 1 May 2019 06:17:04 +0000 Subject: [PATCH 5/8] Bump com.jfrog.artifactory from 4.9.1 to 4.9.6 Bumps com.jfrog.artifactory from 4.9.1 to 4.9.6. Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d5dadd3e..b37bd307 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { // Get bintray version id 'com.jfrog.bintray' version '1.8.4' apply false - id 'com.jfrog.artifactory' version '4.9.1' apply false + id 'com.jfrog.artifactory' version '4.9.6' apply false id 'com.commercehub.gradle.plugin.avro' version '0.16.0' } From 64e14afdb72714e522bf2d255a4c7711d69304a1 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 21 May 2019 08:46:27 +0200 Subject: [PATCH 6/8] Updated dependencies --- build.gradle | 16 ++++++++-------- .../collector/NumericAggregateCollectorTest.java | 8 ++++---- .../java/org/radarbase/data/AvroRecordData.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 69cad038..2c94e95f 100644 --- a/build.gradle +++ b/build.gradle @@ -35,16 +35,16 @@ subprojects { ext.githubRepoName = 'RADAR-base/radar-commons' ext.slf4jVersion = '1.7.26' - ext.kafkaVersion = '2.1.1' + ext.kafkaVersion = '2.2.0-cp2' ext.avroVersion = '1.8.2' - ext.confluentVersion = '5.1.2' - ext.jacksonVersion = '2.9.8' - ext.okhttpVersion = '3.13.1' + ext.confluentVersion = '5.2.1' + ext.jacksonVersion = '2.9.9' + ext.okhttpVersion = '3.14.1' ext.junitVersion = '4.12' - ext.mockitoVersion = '2.24.5' + ext.mockitoVersion = '2.27.0' ext.hamcrestVersion = '1.3' - ext.codacyVersion = '4.0.5' - ext.radarSchemasVersion = '0.4.3' + ext.codacyVersion = '6.0.0' + ext.radarSchemasVersion = '0.5.0' ext.orgJsonVersion = '20180813' ext.githubUrl = "https://github.com/$githubRepoName" @@ -111,5 +111,5 @@ subprojects { } wrapper { - gradleVersion '5.2.1' + gradleVersion '5.4.1' } diff --git a/radar-commons-server/src/test/java/org/radarbase/stream/collector/NumericAggregateCollectorTest.java b/radar-commons-server/src/test/java/org/radarbase/stream/collector/NumericAggregateCollectorTest.java index a7879c69..13e60a86 100644 --- a/radar-commons-server/src/test/java/org/radarbase/stream/collector/NumericAggregateCollectorTest.java +++ b/radar-commons-server/src/test/java/org/radarbase/stream/collector/NumericAggregateCollectorTest.java @@ -148,19 +148,19 @@ public void testAddRecord() { @Test public void testAddRecordWithNull() { this.valueCollector = new NumericAggregateCollector("recordsCached", ApplicationRecordCounts.getClassSchema(), false); - valueCollector.add(new ApplicationRecordCounts(0d, 1, 0, 1)); + valueCollector.add(new ApplicationRecordCounts(0d, 1L, 0L, 1)); assertEquals(1, valueCollector.getCount()); assertEquals(1d, valueCollector.getMean(), 1e-5d); - valueCollector.add(new ApplicationRecordCounts(0d, null, 0, 1)); + valueCollector.add(new ApplicationRecordCounts(0d, null, 0L, 1)); assertEquals(1, valueCollector.getCount()); assertEquals(1d, valueCollector.getMean(), 1d); - valueCollector.add(new ApplicationRecordCounts(0d, 2, 0, 1)); + valueCollector.add(new ApplicationRecordCounts(0d, 2L, 0L, 1)); assertEquals(2, valueCollector.getCount()); assertEquals(1.5d, valueCollector.getMean(), 1e-5d); } @Test - public void testSerialization() throws IOException { + public void testSerialization() { valueCollector = new NumericAggregateCollector(); NumericAggregateState state = new NumericAggregateState(); state.setName("test"); diff --git a/radar-commons/src/main/java/org/radarbase/data/AvroRecordData.java b/radar-commons/src/main/java/org/radarbase/data/AvroRecordData.java index 2451f4be..9180e7a6 100644 --- a/radar-commons/src/main/java/org/radarbase/data/AvroRecordData.java +++ b/radar-commons/src/main/java/org/radarbase/data/AvroRecordData.java @@ -49,7 +49,7 @@ public Iterator iterator() { @Override public boolean isEmpty() { - return records.isEmpty(); + return false; } @Override From c8e2bc98e4b8b63f8ccb4e2d24e54bada1f82bbc Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 21 May 2019 08:48:02 +0200 Subject: [PATCH 7/8] Updated gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 55190 -> 55616 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 18 +++++++++++++++++- gradlew.bat | 18 +++++++++++++++++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644 GIT binary patch delta 3320 zcmai0c|2768`iN!wwN(!Oxeo5?`tVU3{m#%jC~noTx!q_nHtNnR`zAgWC@krB#b55 znJk4YA);()+(!K-w|npJuix)IpYu7-^SqzuJ>T~|?;j_-ma(;-@!<_I_B>B@4FVej z11CRtM@$8afpkN^v*te{ycR9yTldxXJbmio?@}x{9}zaw&=aQt(a^ZXN9S3i8a+Z% zGc@&(5}jplZjJKk2wNlTp(mbeKL5J9Gjo==yT{-eVKj?*rT1%bQ@%#Xce~~1f{19^ zoD75QEoSzDVh@!9qG4yl`;9=Ysp?rRX=(8$VDRz=R+oA3>jLxjW-H!-2biNSYuy)U z7-B-qC5l;>qjMTg!DbWPY}h7qxi6xp)_T)_O2+*&NDg?v;RyY@5XtWHx%(ImQ_3E% zA%$s3xrxE0Fk>DhG!pG)4}I!pWJl~QtV_3Jl2W4PuWWssMq^UpGatK+4CING9pB#5 z_NDc)aonVrZuXsr5!RcE#?aXFZQjt2VMd)-p00K$EheT?H!m_D2Mdqq;0moaO=C&y zgJnvzgUn!wkx^{r049pU#gsIMhl`%{MDNl;}JRbneC zSTB=5f;o9=2Rt24_lt&%%f~m{Ts)zu8H9j`INrgMp>l-|k%Kj%U`OXL1J2e+CJHJxreHLD_#o*ZeuXE4uGDQAJS_PpEGt7hmd7psmLEBL^h zD#JbHiklZEXkk9(6uF$ErsUu^jg7c~1oRS&CuTq*Xg_cOvGw~FZ&1#p(6|jz9lJnP zSIJ)sX_W2$PSksX&}*_ejz+t*X)xK|JcakaMRGd%c*R)cQcT|?sM^#{fdjh5_I$iK zBX_d;wz+cf>b}r!i3yo6eaua)d`|Mi_|Q3mAz5Qn?#~xgE9In<;TwYN^~mtaYy#WU z*ffWtxwlk&!e@UfqQ$bn23RDFV3o-H_WM}44yQpYw;JuRf$at#XX-qmuVnKqg-Bo# zJjZE39)!{i$qJh?oJzVzWFDlSW;{Wf`Z)33Y$Fh^+qasrsEJsfy9yhyTFe?Lej&3n zEAS(D8WCt(ew(SGD z-J#7@l?KI*ZbS)AVQ23qV&{c=$@zUp0@6=kZp+5by+gnAWdB||7e=!yJ|WTpG0OC7 zKlKWFv6#(>nrEq@d1i-#L9SVxTDNb1DaY%2$=@)`k&3s8wz$M*;THa&!2Isj%6CQS zY>A4HtmWY3@9e@F)mCHJQzBz~Lt(wcJE{!CAr=wxn4|5n(jslTy)~IF?tNK zD^2#hTM0d6MDg>`9;s5*(4W1V8y}F8OT6Xap{`=h1XVKO3zrBh=;JnIs*RB>@7t5T zwV=G^T)L=(9P7tS={6`tEBBBm^u~_!-#m75G*h}y_Jj7|STtiY_LDR5UUHI@awWmB zDn6q9{2M-EHaTm53ln%ENJ$HpLwRcL>7^hUrM=}&`qmWTgtr{Ul*Lqcd_9S0xZ1s>F2dVd(s)3&$`gxFAu6jXYIS ze#M~w@=X@lm)sFI4EEiqKh7JxN=_?+}D=iHCc&S2<^VPZ6 zYKXZgvi(Yne9}k6o=ezgquABVB77}x$nKXh`@LjH&lQPqm_;MTL>4RGO|E#_7AS4@43rz=ij?gcMZalnd-JK4ILhL)Ee(3G zN}g99HmhxoBjHR~y@b>-7{f+`p zIZ<^8%d;wCA#xfwSc6$DNVPjAX6FCkb|MQ|6hFyz9UhoLF0^xUd#*^2Ofn zOJgmwDyb1=Z8T)ArRy|VQOM+BrhZ>W_ELJ6u(d^JTu|j%*6g8JKZ-ewoj)sXJCdS= zHOo?HscL;Z`H18}%WnE1&o42KZ+=fg(*VN>t>kRkcd{mP9NF6;MnzH&m2WsD)sX~h zbhv|Ux$w2avQwoI`IKiGMLrL;Z>R}Y_0K*L=63V z)ut+5tM74Glzb?92kbu5@3M#1Hi7K3$c)?TL$}`aKf0hC3`r!>Xy3!f{ z`}Y#@$`|mG1JlKzVE!vD04aX}x#hV*+AC>bQ|%XJ1<&;=0?uX!RM?CIB=+!tgkB-w zu*HF--^U4#nG1mXz0v^0@|UCs1lt}!1zTaTwoe+k?sPym`pyB-F25ivXx)#1|1%|e zJ7Vpujkk#Lu%U{v6xiQ5LW2`~QXrR`ja@*L=b0ejT977v%C)0WAik0gV7U z6a-7##p#p>>>3a{^Z}e3Z~?A|foBFU12bqaEE*0vqdCCVLFq%{;F%$Dkb6i8;Qo!C z&;zkU(!i5zbSMd)zQzg8(kU^HPQ^flVIzR)<^jwbwget09YD?zV*rx+mx@0IN{#S< zsB|8Ve>>sJI7sHE!@=(((ttqL0ks%C4M^r5!0H?rJ;MV|jtT)1cMl{|9xo_Okp@Ka ze^CzbCPf?IDFWLlE`V1FDDpZ0C@7~VMZt%!6%SFtxz{!Tb1UfBDEg~49x!4|2#_L! zX=6UXeh28_?VY*suC^Sy!?XXp?9-G{ zEbF`ELqycMcTK-$-pw|Jox9S^<_NX$7{PI7aX1p5N>aOyj&D01H#;3?=q^!=_mq@k zUHheWO_|CDYA~8r<-%q8&Gm$uPSx4S`reKPnv?Nif4kS)^smTg&m@kLYT87txGxGxw+Qc zTAi=`vzavOlyLrgf2A~;1~Gx$jcb|fkhfctRt6CjRooL|#wr)(*8D4n;2cBe>p9_T zCeJf!IgCH0h1m)UPLk3hZz120oe5YH$oXjSMHcPv@#wX;OP5bBSJMavm2}5Q8(V&# zXGA!+dAwOiXuQ)|+XwF2HW1@_MPm3*v{M86V_~+xk1K7cI7mxBKU5#bofCjZqqjs$ z(sipv#Ul%KJ)h?ua}a3Dg(6yaxeJ(HD-&`AT9kZJVLJTz?WIfgao$bYwEhXh+&GA= zkpI03HVxtWc*H!~z~9%DC;;Qej=WppOD!i1$MO1`&8LW%IWd2sbnS7j+<0b`v1%qx!owUU+ZIHJFp1yH9BFvUYI^up=ZYX$K_YM|Bn2fCG3sq#(EpRB$|A9~9*^M%Sq)EAjr0&W`hHyz96Z9h*odHK|Ju$JQ0c zO9oayZQv;2b{pLJo`T)C%yS@sAKO*WC%22XDmrdRTd;uFr*sb_{GDl=*Y`l*;>lNWh=XCbn#V}C&jmw3>t zNH(fnG%j@AI$TSggf(e3DxrpHjnpeKExsb|hC`kxjD4HUSmu)&aJNt&DtCWh#51*} zS!qfplP(f0`hJ)VHrXFD_uB7ia4#%U)3S8lGY9^(T1)M8xQxP*3w4&QJr~O`$A&N5 z_taom$34zt+reJDV?oZ*qr5ERUH7#~xm7)D(u#q#m`~~-F+TZ6Q*L)s_#T3GZUuZM zhCH9!{qXnD)9jln$|GDeDPqo=+D6#vQkAjdHtT>{VxU#AQJW-je=UWN5*R>v5vWF6 zK_6z?#thq>&%@fu5epvO$rfx`v9GojdOLGFaQ2V8?Ri z(?L2JBK(;G)bIF7r5T6Ahzst5k4j#hvhl3a`@Ksfyj3^Cx}zGE)vm$ecB$?~2`S&e zE)Nx6TiDO*JO6UmWWc+zLDmnII+)ROEvW3_{*%Fjs8Q^k4+Z&cJ0lp=@p*N!fw0>L zPSWrxar=HPDCwZnmN%orA-K2142{bJ0el>N{KM(xoHJu_HWSQihq^y%SEmj>CsBjl zj6)jxqm7NwiVHh-xQ`ex^02-y_ZO`A`P(1UwLK5G_T8=uI8@e%Kh31Xay z>H$7OG8cQ%>c_RjXhRA|Yh=93MnM)V0JlD#yP-1YNx}5`sg}-vE%slfve&}e$*L>+ zSAq_CMc5SYx6N)5h%-)?JOAhiVM5`TWT7?<9 zKKxMMb9GXHpQ1ajAr?!hxcauobJLf{IpvJ=9ny}FwdGCYmwgj?0qhIG{5zbTTVc2b zo+3h|{F_Yg96k{?rVn`m`%d??#avI-eh^XnTH2r*o>5n>`UuIsuCIeN5Br62W!Yy#8)0uWcVG%-QnMHczpWoe zftoSf-WJq~x8`|ws<-9{Va9@s#SoH3uw`>4!~uyB-(lV)SD9f(TPNa!o7JLL%!a)@gUmedno%~}$ z#zZLYah$5mf@Z2}a(oDDM^$qq>*nb;?aVn?D`($Om=?j+T%S?eSgR1t=zzwGw|kvM zt~WiOO&UVW=7N=8ERxM<4?Wbj4bPIP4z3=hjp(uuT}ne*E9ct0)Lsk?bG=1nNo=oB z0JEoKzAw45q-lB!IbJKsY=Lpru48qY6ql!Z#J13ywC&7??l&AtxiowZ|Cg(k*UE#@ zrJm|m^EV_6jz}f($PrOb`S;imdEwtu`#cCu3aMXBgUUH4t2j_qu=KmOO645(v(_DL z^G5PF%RR0@X5D{(V%x5L{xD1Sa>^wR+$0j(DeVfwk;tp3<@i$~qOsvx^uUy!zV8G0~0`$f?VV=?vm zOwYnZB>UV_b#sh6ibtN`5I+l%mTE9T%*J!xaz}cWisUNLg@>nEiKv4hgmv`5C)GIDbBOgq{?5K-!=>z{CLJ$wIBkL-~yV{}~e*^#eZ1f%)RR;DgcM zfOqnA#42!t$D;@!QT3n50ve1d0$Zl^m}ABc){bz2HDhq#o&{ZLlQ=*lO9Alv7y_uW z`bTL2KkVsP<{%6$`1yeL}DmCZuxPZRJp*( z*Kk1M23@g@UjhQ6PEZ{58CL@Aqv>cB0|#ltT;SR`95{}ptMe0@zz&v<>j{GNDt-bE zn5EFw?u0e)Ee+J0^aq@C>E_j>A%MyU^@?Rcohe{^TCd{d<=ub5$bWAh Date: Tue, 21 May 2019 08:48:52 +0200 Subject: [PATCH 8/8] Bump version --- README.md | 8 ++++---- build.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 512b524f..2dbbcc10 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation group: 'org.radarbase', name: 'radar-commons', version: '0.12.0' + implementation group: 'org.radarbase', name: 'radar-commons', version: '0.12.1' } ``` @@ -26,7 +26,7 @@ repositories { } dependencies { - implementation group: 'org.radarbase', name: 'radar-commons-server', version: '0.12.0' + implementation group: 'org.radarbase', name: 'radar-commons-server', version: '0.12.1' } ``` @@ -40,7 +40,7 @@ repositories { } dependencies { - testImplementation group: 'org.radarbase', name: 'radar-commons-testing', version: '0.12.0' + testImplementation group: 'org.radarbase', name: 'radar-commons-testing', version: '0.12.1' } ``` @@ -53,7 +53,7 @@ repositories { } dependencies { - runtimeOnly group: 'org.radarbase', name: 'radar-commons-unsafe', version: '0.12.0' + runtimeOnly group: 'org.radarbase', name: 'radar-commons-unsafe', version: '0.12.1' } ``` diff --git a/build.gradle b/build.gradle index 2c94e95f..6fc7d184 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ subprojects { // Configuration // //---------------------------------------------------------------------------// - version = '0.12.1-SNAPSHOT' + version = '0.12.1' group = 'org.radarbase' ext.githubRepoName = 'RADAR-base/radar-commons'