From 20aa0e38f7e3092fe74f831f81bc7dc278a88435 Mon Sep 17 00:00:00 2001 From: William Chong Date: Wed, 26 Mar 2025 19:51:31 +0400 Subject: [PATCH 01/21] update gradle --- .github/workflows/release.yml | 64 ++++-- db-client-java/build.gradle | 117 ++++++++--- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 ++++++++++++++--------- 5 files changed, 283 insertions(+), 157 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c202d9eb..a8c62d0a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,22 +1,42 @@ -name: Initiate Release - -on: - push: - tags: - - "*" - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Get the version - id: get_version - run: | - echo ::set-output name=version::${GITHUB_REF:10} - echo ::set-output name=target::${GITHUB_REF} - - name: Perform Release - run: | - curl -X POST https://api.github.com/repos/EventStore/TrainStation/dispatches \ - -H 'Accept: application/vnd.github.everest-preview+json' \ - -u ${{ secrets.GH_PAT }} \ - --data '{"event_type": "java-grpc-client-release", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "version": "${{ steps.get_version.outputs.version }}", "target": "${{ steps.get_version.outputs.target }}" }}' \ No newline at end of file +name: Publish + +on: + workflow_dispatch: + inputs: + dry-run: + description: 'Run in dry-run mode' + required: false + default: true + type: boolean + +jobs: + publish: + name: Publish + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + with: + gradle-version: 8.13 + + - name: 🚀 Publish JVM library to Maven Central + env: + JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} + JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.MAVENCENTRAL_USERNAME }} + JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.MAVENCENTRAL_PASSWORD }} + run: | + if [ "${{ github.event.inputs.dry-run }}" == "true" ]; then + gradle jreleaserDeploy --dry-run + else + gradle jreleaserDeploy + fi \ No newline at end of file diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle index 7ff66926..202704ea 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -1,17 +1,21 @@ buildscript { dependencies { classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' - //classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.4.4' classpath 'de.undercouch:gradle-download-task:5.5.0' } } plugins { - id 'java-library' + id 'java' id 'com.google.protobuf' version '0.9.4' id 'idea' id 'maven-publish' id 'signing' + id 'org.jreleaser' version '1.15.0' +} + +repositories { + mavenCentral() } tasks.withType(JavaCompile) { @@ -19,11 +23,16 @@ tasks.withType(JavaCompile) { } group = 'io.kurrent' -version = '1.0.0' +version = '1.0.0-alpha.3' java { - withJavadocJar() withSourcesJar() + withJavadocJar() +} + +artifacts { + archives javadocJar + archives sourcesJar } configurations { @@ -34,7 +43,7 @@ configurations { } dependencies { - api "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}" + implementation "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}" implementation "javax.annotation:javax.annotation-api:${annotationApiVersion}" implementation "javax.validation:validation-api:${validationApiVersion}" @@ -184,10 +193,6 @@ protobuf { } } -def isSnapshot = project.version.toString().endsWith("-SNAPSHOT") -def publishLogin = project.hasProperty("ossrhUsername") ? project.getProperties().get("ossrhUsername") : "" -def publishPassword = project.hasProperty("ossrhPassword") ? project.getProperties().get("ossrhPassword") : "" - javadoc { options.addStringOption('Xdoclint:none', '-quiet') failOnError = false @@ -195,12 +200,12 @@ javadoc { publishing { publications { - mavenJava(MavenPublication) { + myPub(MavenPublication) { artifactId = 'kurrentdb-client' from components.java pom { - name = 'KurrentDB Client Java' + name = 'KurrentDB gRPC Java client' // packaging 'jar' // optionally artifactId can be defined here description = 'KurrentDB gRPC Java client' @@ -211,14 +216,12 @@ publishing { developerConnection = 'https://github.com/EventStore/KurrentDB-Client-Java.git' url = 'https://github.com/EventStore/KurrentDB-Client-Java' } - licenses { license { name = 'The Apache License, Version 2.0' url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' } } - developers { developer { id = 'ylaupa' @@ -229,34 +232,88 @@ publishing { } } } - repositories { maven { - def releaseUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' - def snapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots' - def finalUrl = isSnapshot ? snapshotUrl : releaseUrl - - name = 'Sonatype' - url = finalUrl - credentials { - username = publishLogin - password = publishPassword - } + name = "LocalMavenWithChecksums" + url = uri(layout.buildDirectory.dir("staging-deploy")) + } + + maven { + name = "PreDeploy" + url = uri(layout.buildDirectory.dir("pre-deploy")) } + + // Old accounts way +// maven { +// name = "OSSRH" +// url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" +// +// credentials { +// username = findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") +// password = findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") +// } +// } + +// maven { +// def releaseUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' +// def snapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots' +// def finalUrl = isSnapshot ? snapshotUrl : releaseUrl +// +// name = 'Sonatype' +// url = finalUrl +// credentials { +// username = publishLogin +// password = publishPassword +// } +// } } } signing { - useGpgCmd() - sign configurations.archives - sign publishing.publications.mavenJava + setRequired { + gradle.taskGraph.allTasks.any { it.name.contains("LocalMavenWithChecksums") } + } + sign publishing.publications.myPub } -tasks.withType(Sign) { - onlyIf { - gradle.taskGraph.hasTask(":db-client-java:publish") +jreleaser { + project { + copyright = 'kurrent.io' + description = 'Kurrent gRPC Java client' + } + signing { + active = 'ALWAYS' + armored = true + } + deploy { + maven { + // New accounts way + mavenCentral { + sonatype { + active = 'ALWAYS' + url = 'https://central.sonatype.com/api/v1/publisher' + username = findProperty("ossrhUsername") ?: System.getenv("MAVENCENTRAL_USERNAME") + password = findProperty("ossrhPassword") ?: System.getenv("MAVENCENTRAL_PASSWORD") + stagingRepository('build/pre-deploy') + } + } + } + } + release { + github { + enabled = false + } } } + +//// For generation of checksums in build/libs +//tasks.withType(Jar) { task -> +// task.doLast { +// ant.checksum algorithm: 'md5', file: it.archivePath +// ant.checksum algorithm: 'sha1', file: it.archivePath +// } +//} + sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 20926 zcmY(p19zBh*tDC*wr$(CZQHhW$3|n@W@Fn%V>fmhHTa(WuDw3|hwGe~>zEmy1FKsG zYYc=z@M+Z>Uk4n- zf>LPE!P?mA5#!>@QlN|1%u#eAY%z9sYzTix2)?dl^qr+FV;S+1iF%X=EN6X@efcip zx4L{6MHen@KT&~3ddxw!vGK3 zDR6IzmfS(C#hBd@wn!OgvMoF}phsEk&F5-Dcwt7G2xG&Dm&xutI)E-Va!-qKz~+w0 z-=AFd+H(~(Q$3%N5nez;ZIxbBM31j>5Nyo-YkiExY1M<@u<0e*nz!!R z;{N$-qP&QO{9nWv^INxb>J`g-yYMA$eDo8qb{Bw9^fZ9m+S(Rz2Zph#(1yUfaZB?I z#eOI?a)(CpDeqla5F^C|B-C7T7CC2S%N!%mR&iZ=7m$e>8JAYv-&Am?exYu9F)s@^ z9C)0W-|mW~Vu~>&H5kvxytGG67Zv0pEg}b-m(ggB8~^+aXZ&XbbIGOp!bkEM{Np3q z@-SX2K#W$Hez?IRlyxVVm5t}P- zltiFvZ&=0@Q}LqUpz=6(h07TA`ZYSz8rFm{Z{-~Qw!}yL8*=dtF@T_H90~mu8Kw1t z)le9013)H|!YcV=K?2_d9ifA*Q*M@vBRhpdibeK-gIY}{cl&GETL*)(oq?%BoP{H$ zn4O~f$L0bBm?qk}Rxw_2yYt*IM#^$v;IJSd(9j_NsR~GbNZnQu7zjwxm0I8$)sVjq#M(yl^fk=Y`b_$ZVpEG;yCH|Z~I1>MTYdpi8P>+NQC zE_BSsn_WD^EqD%(G{YUlEBLDQx{o%zvDKPVnupGJe#6t<@AjO#$J70?_*f7K>5NMO zCdGnVcF-Cu*i*B@rqUDnlJ*oFjO4O5fDMd!aWYNYr?1Q%bXxmhTs+GlOuiIos<7s9?Rq}Re!?8dR-lV6wuAMP@lIdDi#5Rjy`J^G=>=w^ zv-=qd_E^Jjec?ZYvRRjl)ZU`Tp|r;fQ0+e;vL#MSm0`uzNi*svh0g|21$yHVsskBt}fvlw5cR}CPTD)g#ZN9hWkzJiL`q# zI0YW?x=^LciAbCH`Blg1^v-&f2K#)4q@^MJV*02DZqX0X-h=qdoEF$}M~SpY3pzsk zjSrpF@05PZM}QhiFzr&-AQw3u5F}%7#F0rPla{VYb0~aE6$(UFm010IA@ar_IZzG_ zmSKga>0=esGyeC;)gc^j&8@M-tPu*a1l=rx;Tmi~=p^ccq;fJgp;+R4&O}&r_s$&9 z^bPU<-gBa}(hLnM2uLMmN+AjrFscLNt+$#cIIg?f@`S%7dnhgg4cg3YC<6`i+c=5< zitavH+cN}B)VnF)fufnbw1PgBBDLI48@83c%)KbAY+(VFXHdA10mkp#-u?N!HIIgE zrq9#*^6RCKN~bwo<}~Lv$NxUyCExF+^ECgl!0qOj(f6zy6Y3)EmkP})un2gc37z-z zpMADl2Uab7drwFZd7rtwr)2~x^xrR;u?I)Um^>$E$nl#uiaq5T@=h_rpMy=9wp*hw zR>EfZS|j?648RT6R_RlASXJrQJBLSNx|T%-@NbDV+~Y6KVAyLEXPp)y<~KAN9Y7H3 z4#5ey|6qDp(DP5oG^Ec4+%yoq&kzKa4jxBeKo{vzW>pvI9~W|Zwue`HMALHOduIe6{6Gf40 zRLkq<1&{5L2TP>S)b`5l8fWRB@9H;NJ~g6L7`uNCYJ7xGu0_WX!y8n*E2h?~d*n_o z)z>t38Qk&FyCXF?)d^L7v`d>XW|HN4diuv0MOM&r!&)RoHO(3d+e<4FVv zIM&Bs#*1A9dU$XEB1POPbt`fUTx0WxVE6s~u2vq?k(r4?$1xH5+uPlhot8Sk^|j|+ z<;Ds;`#is=0ADlpL^-E`>NyK^HV zP%0cOvzyynZW>O0)U7pjV9f+WW()Oo72Vyvbx3?y7jT}yua~En>kC*bNI$B*D~i5EwtR-PR+E)dDo{=}GMv@e~Jo=F#|ab_Ui3^ZPl zj*_7V>L+e+;<6-J%cYu#^H`HFBM|ri(7NtrF)>n@v@7e;v8E^M29ngLY!|gePuwOG zH*%$9l(}SYGEttK>CHo%CWvCpwjjgD$JHD0se~WB%CNYsoB~d+yy!&Rc9{W5DrEVb zZd0N2!7hwb&I9?aS<*SoJw=J8UF4|K5VV#+Xw!!bMHv##=j0jsKab-5a&%4%MY0v~98iJ4 z?9Uk;!%6D*%aJ|&F3JYXfQwRDzgSW1)S76ku1d|-3>O8xmwvAA7v|M?Ll*{=i? zE;5}7yed-bGu@ZphkjV-lUM-@21k*vbhtwF*$oft>|eZq*pbw04y;i1y-J|`(fC_i zZM!(?)nquXW1|jB@TV^=GRiqmmSU!4hsfD;*pQO#2ScFjQN`PqymvOi@+(fD=+Q0o zR>40M7~Fea4o%(Vq{_JCsjE3+$cW_o#h|gh6DtWf{Ag}nPtw3TywPd`Yh6aED)@D8iZ(Puv5=hi;?ev&|m|%CuVP&vGeS0h=NykRI=q**z z60h@d-2M?JyAOdc!8kg^9b(Y-B8@eecwnFb#5-k!2!)+u(bhkE{&&!vQ8#(JX?oh{ zzr*y3>wpKlprHoa58Qsle}7*bD*MHcxL#*L`>vKYBw)eRgp~m#c6{u3&Z~rxA%sg0 zH7*x3#}>yIR81IYW`e^Hp-&&rFF@mkD_rJEj=OC)RC9~n#e;34 zB8ucD9wIh6e_MT%XxqoAnBp>-7#J;V4uUKF1F9xN$N?m?DQo=jTXR0tNbg=X1LV}H!7!x&-6z@D#<}1l}M|wUee!@W4|eZ zE-ri-P+EYIjgckuXi|^{T(G=<|0AU}Br-NL2O@LyVX)sgW+vn%8R_(#qh9G~!wT$a z|M-?u@I8YuP1|w0#g02jiy+lkdeWC$ssO?dePpkPKNP*Mal{SO^alvrKVtC8(4Tp! z^HN%W6Es(Je!}?y`44yS()^H{GX8Y$Re~TmzzVf=s4A$#6f$!lz#&Od2M*d76UN$IZSD83`o#6EFYrYGq z{S)+_qW9B<5~~hu2a1KJ4;(jyF;r3>ZZUwS1mbs5lw&(KhH()Es}?izw`cI+?7x)-??%CsoK9;>6{ zzD`I6_vk=3VvfF?&3lZ1Viq^ZH+hPn_4;fiYt!uKd1|(1((AufUDb0`UD=E!O50*b z+jL#1#(%21l14=h#ZU}qc26Gu8W%vJlk_7$DMjjU{XOsu4lkrXgroX+Jb;2=cmnOy zZ}2+e3eiM8vhW^t((WV}dfHrPZM4^KxfvZnZ&BZUnQ3P3csN1g>KdGqnC#6XbsaSz z*PkQs)Fs>C$cuog9;bo_?3afb`wO>5utUCcq8Q=3zchtyFid@+Y8R@bt`y)_i9u~s za?+Y_TV;S-IJ!x8+SZl3bwREuYknK$o^u8R#cQEdI8HHJvhm?HNX__AH*T%dzL!_@ zpHpP(_PfPZA2ebp#O%Rj(BgpBx%x;%TwFVa?qwB?QEFLm2sCh3nF8(yxJu``PUoAf z{nHJW)+YnmOUaQor!cx{MX@&(%`UnE``zAgYq`}Aa|{Bt4SzM$CY^LNHt==%bbaT= zN=>HRUh|=>gG+JjruW0Dbr-68sLoZnp0xS{hNBr(W`OhSL*=>=nV z%U^=k{5w&f0}8CB8z6$9kiCcUC|VKDx^VTkY*?OLr)R$Pa z6MvHJfG9W~OSq#INO3)~@{Vx0({U|0^q_8N8vhYAHp4*O#9pKM&7(jC{RY>qFE<}t zfu22LjW2-ov>`XY3>WoHV*NtuYr#E^!yA75XT%X}VR}IdMS98?^vRc zHqgt)Dl^B}DyimTyvhuOf_%c7^Uw+{P+Z}BNa+RpFFtUIU%>#@x4X##o0nWfAdIuC z|I@({>IAWLfv+r7;#r8OA}}kE{O$7mWgnUDwj2H^&H{Vez@i% zNFs=^7Y}f8X8zYI=ybGM90@A;UT z6C>>adZvv`Y~6kJ&C~KscaL!#&fOs5>4taDk%iFRlz;y&T#T5L=Mv{pG9n^dKd@pi zT*hobD$qPd~1Ek_On}pk<}}&>&s@i^<)ORpblTmmY6x zj3X*t)A;3|ng^*KBA1lkK7iN@or3~C$H0A2C%rjjxIO^-ICww)MD=qaXyBjPQ*Pmm z6zZ#+w=+0rn{|8f?gzvtg>SDkI}n~fFp-p7mnhwR7!fVEsdUy*RMP0okS1^J7a7I^ zdInUGLO#ob2+ZNbfXj>~7m%E4OJk;~aknUFj%U^;G>T{7kF^ZnbS=9xKAef-iB!5e zU?||ouINGYLiQK{^pPZ&h)?{gt8fF$vC>r)L2((6jmznLN;xB3p)lz`(x$+${-w)l+WLX>e+#z{KXU3b(zFfTXJ`+)hr%Lc z>75w!kfN^GcUXS6XcgW-G zV%Oqm(gF#-Xi|9=?IC0m7;=ANVN~&bkl5B_#2d%aT|x@QL-&eg$ryqPEGidR#oUxe z&=Ey1-`mym-jqY`H>(%-u4dwZH$nFH$3L@l-+qs~@QH%=3l<=Dqofe?>P-;yszrwz zuHFgw`8E4Kw6f%#;PYC}86jA&_o708Avp|_<~?f9N}^j}kNn`YhPuocZI38ppXz9h zv*BQk#*E8kgUY>bk77)(9^%Wy!C%^&Q9SgX#YC>RdrJ&ZCzU%*3=i*|7~LL&K|Xc* zG|-z-K8)?t@ox37J4cM$!Ow@wURUn|{N3AesE>}qVsxa5Hz*B%Xr$^_W>s21lBN8R zlu(tqexHn%^B_5f&v_$}&UIMo(_4Fx?BUVO_5O%fFjy)5K<%|PWL|nss!TdrD0Y7G z;E}d3h^hJ&wXb%cj@I+A2Gq^#%FYI^o#_19anGx?#7^s9QoVpcoiXLLc2XJZk1`x* zntj3u*)wKvvGQl&52G3$VF!!@>FwWnaRh9&grC|gKP9t2eck&VC64(Oo;HS)!Umcf zZ4fvRb>4+ntoa?z$;cvBJBG6eovpf`q;nPDOg}I((RkI*noA7YBd8mIO*0)~1-acS zJH5upSDst~BOXl?(?ffPLw=?U<>rzc6q2 z_(4(OQXpGkOvrHr!W&-KJf%HZ8&wIdobcrc=aljc3g6JHPo?`4y!kbmp9QHBJ&Eh5 z+-8#X5xK$p`P4;O6M-cV7nm+STSQ`W1=>IzmM3vjBdxYMkNx>yW$}&5^aa+bkNW(~ z_8D=R5YoWH{XQTp2ro{1?BMK}>1xG#_^XItH&DN3Dcypu1|FmFtwdhQ#+;JlFkQ3y!`Qwj8xE0mJ3SN-m9^8h3z%jI9+LNm zG{Ds&C=l#|sisMR~!`4W58e~;umktsyI?nBU)%g+QH2S)e{3v zk0>#g1h3#F#O(`qLjC?&o;1%^gfOO_&^>RilU3cXHu=*S;dHPC+gEbX{YvPg2#a1I zFA1+_yz}ky#qJLf2`$`-eMk=`a(sX%vcyuRw1_Fevqj+s#uU)Jc19TOXW){0XGfsq zt~lc>Y2DEw^p81#|MBZsrMYxvpHjPF%q^d^BQNZqm2eIL5*?A+$x$Wabj)P>_9hQr zK&J&V+ncN@>=nrk<+<03g!U6bbv+3eDZEZECcCIczhr>H0*(&|VD*j*XS@HXIs(|I zy&SoofwPMi)|pEO4vk#*`Z4(H4}`o$2LTRVakG>M^#C{u-0=NO1}9uaX{R;p); zBTsTmb4(heR}K~0x;um=Z-vTYd1JX6!o(a;=Yhf$mI&tGO!GU?_ppfBn#}PsKOuy; zt+Sepg#f>076B9R3?>D7qr8+zgYg8s&o)YS7PV?RE%9(lT8T7L(CkV`wW{ZLD1EdR zXAP7V4i>2y3&|Ltn99Wwe;Iw^$52w+dLQbtx$xTf6yD~-#pd7?2zFc!rI#_K5g+Vs zO5D+8AVRW1|G=O1EnbmUSx=Ma}A}!vHnKiXFGgl7I zR=-Q_%9F*Z*Z|#Ajbi5tqD`TM)=I_%!lr&c2X5v; zm5hm4rdvWYPMF#VoTW0S3t<_GFbeD~Z-D{)5>EH5_1(9A*hiq88G9G24Np{!<8^pl z131z!r1DKYwN+&CK&Os4LJQ_TP7}|k-G;sC{G$;>AP_5HFbh>WC}tkGd|@moaS~sb z9j)t~HZ|VLJev!?&OoTh1t!bpR=zLZd}^4F(R{Ub5}?u&msH8IFD`2@{h-NAT ztxBm$<+|0is|`&>pVOyjTUTsPjm&YA^UFM$;mkuV7^h(>dTbuNz-gOVe!x60BpY7e z5whoQ_c=0GO++o+*!Xbtva1)8hQtiXoEz9V4E`cX6fjK6xo*adj0Ztni zQ;SK4&p|sG6}&TN+{u+m z5>syBaPtGB{S3A|kNKyD%6&+AhNczIj6Vanq2CIqf{-|%&9J~d-8jK4a=k2OIp$u> zXX&{2ayS~o3if*1-L6Q=lKMmXfl-8#%=@6>rRk;-63C{4l0U5bAo(+Us!s>RogF&4 z6)F~`0<00mcQGulo-Wk80tv}|D%1*nxJIyFU>tpia@5y!u&Ev|Z=kwfuxx771>{=N zu4Uvz*isl?kl8VIF(4}sa4ZO$0&MjY*C$THU~bIy#8P_ia; zH!2nx@xYVHKjY1iS6*BWa6yrJS+8Eg{8v{ zdRV!#Ce3Sd82*H3(;c6R`kLP%mUJv?gg^k4vi}WR28vfyN8-akUR^YR4(xA3SjCa@0>)7$=qcSHH+g>oFJjdLNv38uK$2%<0e>v}vKQV% z4`*eelNE|cO`3$VnEWS)?z%Kn<3o?Y8opNMpj@SP7OR~~ZhJe9TTpfRkdQ2h?R5)H zSxq}*=pCK2)cMij#l+GZKj&RD?l7HBeG%PS(d1DelPWq`FCe3_tf8{V4_;5|zLYMk z`h>I%MjyIj))r3!_y-~73ZZ6A<~Zs}x-Q#V>M)H>y3hu=RZO^8!LNPJ?6`XIreVz{iv z8>Rx^_Nh6T@)k0+oXNkP%oA;TDn8Y-pO%S5YD3zo81A9A98fF;BKcu0Ym?$yHYl&P zDkoxGb(U(n3UAz=s=g2!@rP|6XW}g*X%(X|{KE%bkHG&|9j3r;;HH$Cp{0a#jzf?u zXX$CAsBkd?T0Z{hS_I#HS1i-!LF}mu5S!(gTeBjV)!1 zR%;tNpnnTDbrXHp>HZ2f#mF}4h%S!(6SnJhTGXtQ61XIKR+ISrwDe5bnN3E0d^_&- zx&6G^dwKD5n*Tfh&KOL7^`4HG;%QyC5#c};p#7><%Rq~GIi6Aam9J$aDy zrt3``%xTvLm`=wY)^09rrtC5=#7EsC5`xbdpCr= zgx`Gu$b!g2P-3q?<0$;s68&eA)_Im4^naax(LVOnJHUaV(oYcmPAb>SmMMR#ImA z)QPrY^>dV^-|?e@LTtrWoyv0K3OCC$+S<}Z;hJF#$7qvk-loYcF@N%-M!q{QS8<-W zT!>wam=}8*l92<<_1K}aJ?ZY7Kmsm+w^3BCj|o$d?5sNUX?~r0ZUa*R&NvUXJbN}5 zY{D?sb^7-VM$LnjvucYqrEmbGIzfA^jbk~wO$AxU0LSl`kj`wJok{v_o1FzG*fIx) zt@b~{8TkiZ#|5T9^A2PT!+v-cma|x6kdiPzbQZSFxF&?NmF{-}{Uoh=**-hq2}4g4 zezq3pIKrVf2tG&cjci5Jps*GdGJogGCs?yjB2W8@k5q8l%d{U0+ZV<}_X^ubdte9K zm*58bUwV`MFY>qFMTIz-sSbIe`(y2)L9>^sZ>ih`d<4Z!fd#p*HxCiXz9xkbv8^lJ zslf=T-MM{;4*Gnk4mR9XhKvJub`bq0pZyXc%**vS*~3?1LNOf{L=+;4M_#Cb4f{y1 zB_ULIR1m2mJ@P zu=yjU154*;9#-;FO15gEJetQtiii&n8!>6E8K#o^Q#vAK&Yu+N)`Gx!=bD5=cL#pu zxxAA*H!cU`^qkb>uS#NBIi~tlWxN)SRTn$0!cO}NhAlFyCn}?`oa2wMKUb<7b`6N+ zx?WW>b*-=!PGIQ{s(3m$G|Qe=_9w=QaU|mpZQ%9ssdoR$KD$+w+E0W3WXlE6RaOY_ zVI}A3K`x~yxwINovxx)2DrPJU3RtVOUDc>=eIYSBnPOIRRR;g*td*MH%;fH|&pNZy zn|}H!!>q-RX1|1Tg7|vZ0?Vy%tP#eC8Io^y4jtpa2(_IabJ?*ZO_gzoqN*`kkOw|4 zJf+GZp)QWpsWTQ9D@uD>sCycI_IZv+()VCR^-m6|UYBE5@YcW^zL#!v7~C4E^C@HI z#sEQICG%962}QYr-gLP`Znq7=TabN+bU_ZHHnrei9}k(4nBZXZe6G#dW-|0>(0h!yt?&oJMdJ@<;9A6!j8=uSWl z?1maA?8r(dd?|^~DVNua;V+lh%i&-b@QdL=7w}6Zu`Zy1n(mGtH*^GP>D3?C&N`92 z5X~Uy-)Q!k$e>Iskz+a?7(pVoWl9xQmvUb(xOrzeQ2zt!?axbRq z_vQ|J_)EOzO2T2=P2`?)0{ZNM6Fyw3MsIkMY+J?rA=K=K2~zndIX{7-)fdqRqR72< zS-WrWbPs@mXn3NQlD>eoXq4#rR6H6+KZ~rcF9urE(uD)XLgkXcaQJZei_JS7$)um^ zdULmD6is{aFkeuwkOCPochCdW%=)C^5<-AUjA0O!0!0-SF*zrngGb_EAN;~M@!N}) zisz?90473h;@5d2i{Xhn-}bZE5xBS7}0f_?fGYq*# zrCLC$;CD=56T-jIANc4pBQnb*CSn*bCc?R5^89fkF8TSZiDuILFa{rJ!-t^BjO9=y zDdiUA0bC@n;HxWy)r>-uj>HUg(8;BGi*juc*sDBOQX^((C2GMcE=a3ubt8WA+wq^r zX-G=Zwml$F(o;U{UCChF()zHAepZpxsI>3{F%pSS2UD?eBlUd= zhHv;mhXv$@MiAet%X=-oft}VZu($t-AOB~GSi8SJ9smjgf&=*E-j0>=ng+0yLU-sj;$Q{I-IHgZ)( z3d?M6o~HqGex8;u^Ls@7AoRu?!uUQomZ<2K7T(m$JOmItb9mCmBIBf?Dt})S=s0mX z2AOp?Pj5R<*lRNq=rqrV7`?XBsW`)d+eg|uX(&250DQ)Z*pPfD+y z!~8}hbzLmO#gjfJ|A=2#Iv({ach#E4L+|_d!(s`yF>ICpCog_o!zR_^M0_3I!uW2Mn_H3`2v;#+HK;tCRa5;QE@8k>?EPTsG@If-hoAwz9Cb_W%wD9dB z_YVfyh0TS+Wh!c)rSyxMJerg-&61N1(e!KlMjjXz7YHqdxWf<_G#WI>WJ<@w^aP5C z^B)9R9TAtT{HEBq-hOHuSe_|>$>BHlFBuE@CA_pkET)iFcj1=SRxz^>S63+BqErTv z5**_XasQl?ev$85bu5~(6N0uFId-m4jgDIE2>WItlKFS!{CrYyN7ClOpN$GSsbeg( zLdgX@5$Od2l23AYDdnifmkZh`FwgiUSK*?HkgW3ikcF10b1U+kctu2jz+2-CZ~TKH z?Kj4z)7d7K^&(jp^7TX4;t2;vh|{uAg!BUr9?>8{HSS&QPb{*nrjq>pjBak0?KFJU zz2OxcmaOvt{B18U6VTo=j_<+^DV{)_+`YO*capOLuS$JPy|OaxGxB&9l9( z?bk2AU)Fu!olcglGLXSvf`IpJj^Dh%3;nm-O(&O9|JT5S9+;wNb#I$T_y^AXc=kbq$;gh~ae-#Sg16yBG7r}~@1sXK`|lFF zLUDz6XaUnwhfX=yg}Xre#6G2vQ~DRc!0U9NDdd!vgpy)brfSx<{=7 z!@p_FY1xLNZFqmHtW!MOU}!wGj3DqPHHk5vA-?-_`{>jV2l~7@ z)CpVpvcz`9GGt)nm`fff%nL&9T?>Oy@)Em^f2ZP>cl+2UFVY>xl75w1PFxS5R*|Rw z=hRE)+tDW5y)UNW`H_RyX!>^Y=+Zl}(!IA}kM0wJbm1R+pGt*clPyy}fXcQ(CEjU~h6L{LLq+G8mbGAci=6)=-7Mi($5_GLqhMbBajXSX zW?=tQ`}HY+|P%M7u`Szoia z*7G;{mqMLhJA2(m+bUbUh|$6KzbH*1_6E_g3N z7@z84#6(=J$~!Ryg7xldr>MmmH0Mn&BVRUWmUBiHYs#@MnT)n)XQCsG@Xp?OvJocl zRf#0-;Dwz2`Ln%o&r!M#@ExVw=-G+Ei@B|j=Bh>^II#jl7o)i6bK zk+6E^SDUnH36V7TEl7AFJ$37F&%BHt8L-k^)8=3UDkH)vW7nY5V((+eI>atOU)?a9 zz4FQk&y`4Isp~6C$CTL!%V*d8xT(xfwo*A4vFR^WsT4SzJ`lYMP)(!a?jf`rH?!eH z__TlvwtLfOB|4CVbDunP9&)t}jsn{< z*tjO^J|-5BkSJhK#NC?r=Wg7;qnf95rjW08eVmkeySC{E+d>9n_I^ir%~(utm*UZU zLUk6b5rw8`Zg;JBv1x@meo~zTe#Ib+WknwQFf6T4v^MK5U{e*8Y5w;`C$DX_%<{to zDn*$i6HjTQ+7E((IIqi%zDja$oU*PcztV>4=(qnpjkiK0WKeSB)mWhMJSLc9+hLM2 zDG5ptHvT+9Oc!`;3)>N5Wob=~^tA4>OCmU{q)`j zoW~(%kbs$0J^umZHis_`qoQO3w8&A5+n7!pRFCEgkbq>KTL>RlrZHg}&sw5rY>r4( zhT|+rX&}8_`sOf&n?X*aF9zB?MBf*`Xg)G!?$e&UKsM8~ALG78pGz%G+q-sb`K$WM zyjadV(C~D ze5Zdnfg&_~=T^PJJp#;%%W}}+kkMEyw!g>xxyw{<-&VdJf0@$Db+fZoXwqZQJLSS! z(RsWk)je$_r^6Pj*{o6x-pYI!gg6@1{*1FXU<}n9%6ng98~FFp2Tt423of?|uJ)U| zXQVaD?ck7+@codNZK^i(AG82$elEPoODrxKe`^oJ{kwd zf!B_~#5<8tqLcBTq;6P>xWMXu!~GGY(4Z3T2f7f$>^j01mMaW_%fq1+_PLcIO9AXfCLI^RXPCM)G%xc6CPx{~SEmYQjOMXHlf!DCP zgQZEwmJB&ubf6DI0d<>)v?B6~jv40f}3LRQy za^~uqx#ZzsmE-J$@@NJ>wtSd{A}(Pee8GIL?4KH|-s~`j>sG4e;SFkg)t3!AqRn0N zR#5ArJ3w`~Es4(r8#nlLVq7)WS}$;t1*o=xdqrODP8C;n&5w|Ybg#EAY7a^PJWh16 zAp!T;n44fCXDq~iJjiv@BCV_(NTHBrmT(cM%6yD#q0`;wG7E8Ht?Go}T`QhdCxbWM z^q~KK-BqhlOq)u*CJq2#1x;0;imd(m**bDG4ZLTIn+JC{szC)@ZmKX z+Ap{dsGN|z|3!iGOALihjYnny_{8^^v3{;g9H0FmGYI(|V#xlQ@j({~Fc|d*gPlV} z!}OA&D~vWVdlPz0PuljeoGI>^_2l&?VaKq)#8^zje=(RM=m%Qe-M&GD8lex&PZ`9r zLb&4Z&gBjQ`$DiKLNbp_*k!E0ss{ngSnrX1R0}{RCBBXaAy8-HPrnPWQFU*G@P+ri zvkyq$(C22FsZvrqL{SVI(7GyTl0hz~`7}DUvLktpAN~@V6#8CyHG=%s!!H>{O;dff z{vZl9GD#e3!2K{1G`ahaeU^LiVbl$hF|z7kxfY>M>2%;cRZlx~@H>}IUp|yE@E7T_ z>1US;a{0k$82Jl$^-uwv@l^s=R;PzoG~9z}Pz4?Cp`UR~M0OokRyyqXZN4+k0X)T@TbtdJV<_~>rLHm+$0+2r(ZrnzHjtg3b$@Pddv1s|Cvy6)K+ zSoP@VHZpjXMRs!^MWpeJWzOjlZoB&~#CS;?;dYo6b-nk$9ZvyUehd4Zuz%BG()eJ} zwJ`*v?)Al5I|;|Ks@p5%0gRz1zAU0mJ7ybZzX~+3Cjri76C+u{a8>U;!riO#S zc$}=b(+8p&=rB<74^e$=a|AhwYAOz7JncWv;B-V>)D+?0oZT*){4m-ql$!GR(Pn5I zGo=fB)aiukrfnj&oyM13t&7CXO6SMoch~FY2tA~72JC@Takx`-AveCt^sT`h*BFm? zE*T|KcZk}{2r4RV`lC~QlYUCf78Fp+J;_x6x;C8lQ82Z#MtjZ_l~kg81WL(2r-4nl z@yT(5993JF+z-p^qgK6OX-cNsaKfAE4--c{*W4RbePk$bR1R{7pX7;~D`a&Dm{brYw7#BjbP7P7}~)t-9OC_D7Bv80)b`k;waw$3OIVTw9C`N$Hf zV_S)&(Om0}<%DE-=&tAY{^~Wt?J}A&A8algd_Y{+nhVN-`Bc zrfkf1W}wb&HKI#()d(|BTGUeiI3e7ebzaYDnH<3CVI){5tRN%?srXJzn#kXj-=uK~ za`7CM^2S+F4{HN@x}WwanlIG;%kt|cokOJ}S>4T^tNB;fgzw{2`6SNs*VDBkss^Tr zSObm|#2v%2F@&pQs$NS|GkQmk2nL$r#?{iwRi}!;g!Vv6 z0c(Ic;_>NEto|SVTPR5vwgZ$pTD=pNhEOW7%6jDjYd9HuZ?7ZrrZfCaF$(eHGLYUx zNAmKQql{R`Vt=2B0k6Iu+sZG?_oxe}qQqh*kZZ$t?9IfZ_0|1-k^VyWs0Z0d8K?OI z_Pl(2(xbp^eO*r>o3fLal!n&Bz-(9T>pK9Z)hY?;+O)Q|G)o-;$JSbqq3F??=6YDZ zYB=S2xla5-&fN4bg=*(Y#>C0k8Pz#wTok*MG!??5q5%%DJ-6Cm#Q|vq$ag z!6_zVgqzm{!4HeLHenta(AOWw1$7K8?UaeLd}qEFB`>C<2$`KIAUj~~fN)k19_4IB_!C7J))-9CDG4vU+VjCb!3Epa(DcO& z7P|Va9G6+ccUbs%Y_N)dHp-KM0ti1?9k2XI2q3VKJdG5P7MNcJqB!Ja@P6nONcyqU zuAGs?6I#Y6p!AA9uG_e8fAazg<4*A*{vnvQD|fI8ghx|SXN&5EaX}SY$4uc+y$l#q zHYj36S#P8Hk(H%82D`ptvWdzYBr~aG2s;T?G52aWCFC_UhYbK9yCV2{t^NipNf@KZK%w{c)5Nd#?QQ}}5qw|J@ zQCY*FCDzbGqS>05lJTx`dRiwH3sqZ=>nkN!udV8B6o$gk!hDysCpFG_r*e(h0_wNJv z3w(v!AaSon@-Dm|FE{}AEn(bV?20QAvRCFB2*f}2!gqCP08H0Mq&K85nn{Ki0p}X; zOplgjDg(SqE+9Y;;xUxg;{h0C-rCtKx-DnN7hy{3Hp$c^U9+XYS-mdNIMe(kd`W?E zI24(|N20yon=+SlSK}gjtMG4v8p&G9=2vX)&woB|-WiC&-zY%l8#Q`BkR@2_DzY7g z0C-jeiejRrzOKSD#w&+1W7+NEOA!e9G<6rriKUQcjGF;Y1}~YCsrdh@;yS~c*tRGP zMS2fl=pa>!bO=aC=_p7MsUlL8W`a_bP$ET&fuUGvA|0eCT_H#jf&!sP6+#VosRAOM z$IbKJ_ni4LYp=7;p6@%~`7z&~eHNRv&@U>B^fZR(LWOki@8dYzE86^qKPi+)Fq z!vc*s?9_5nQ&P~2o&H9bah!$;N6qJTg21?no>Wa2;idC(Pvt9L^wfakGBSgP%s&! zQl>njcn1fc-log>DQQ->*s|J5HJII^sY#K8q~t&0K0eIf^x&HwkAiP?K1)ZR2YTS6 zZ_)|jo0nD^P_<#l99qUw4k#;3gs%_zYQ=YD&I#JS;}=;rNN1#EWO(Pb3$JhL!;ann zA*2>7>vGP%=P*d}gZ)8`PZ-LCVUO*Q1SJmxAw&eh)g){hDTx>x%zFX_*9l*I?m1oB}B)|Y>4%jn>GZ*s~v%I)Jw8jJKpMUjqO z6-26@wM~H_vY67L@6%>yaeGs+qiSy>+z7JPz4(*x3Jx3QkfdIDI6c-XC!rH5zV!1^j&8AElZQM z>n3c!RIcIK1GxsL*AEkpKW#aZvZf!Vid&JXN8n)wNFQi{qw0~al*(rr$UJZU=Xt8C z`SV|{s0qeaRW{j22nM5WUa1%s)!av$pA(rP-PXKl;*T=Ry*SM!7!s3QV^>_lC(Y=g zTYcl^>k|^w@}H#@VJD;ENl#rnNyUXW=Y`M@OcJ|!RM>LS=V|nevZEu9?6yZ{nJ`LV zX)XU^7t;Uv4J(G{ zO_F<(F9wOJJ6>+S@BTK+4x1ZZUyxNj;vq3>jC2i6=p7LQ?4LSstz1DHx?hU4*i}E~ z>kdh^FEQxiW}YxeUz}z$nGndMlH=>#fgE`3TyPl6Ix!QqN$r+Z)?0^J2a83vizn9x zNqee4C2Wp$(?zv~3%3}?F0->ZWW`uc*i-X7E^0)er<$_aQwdIr1~%)RwRA$hgV_9Tk6OsZXOtY+tWi>~=X2Lgia6 zc*`s=&w5vequlxtoWpnvO35B?r?rOEf)tygh@XvQLNWro1fl*NKHj>ZvwQW)1#pN` zg?2*?ihX0CEH__lZbmR?F@~jxiZfUr36U~OT8g5k4KEI{%u?(M(0TISRkSGVa;8F0 z9~iFG8Ju7%T$pcd7bVxB8LYTbEM=5Jr5#PafzZQ|Se&^9HBWD(mfQ-u^u!Gk{CumM z6ny#0^-4t>Q=I!f?Zl4e!5ivvw3cyqEYFSqM9nI0nhn{1OAfJ)RMVuRlwP%u@xBVm0e|q zSePOtWQtAP5}LouK#-$6J)h6w%CFwb9IU}nh~b}1IFIGEe~3s`T)?~!-|o9Ib@DF6 z<~>01oyGZCBB*9(j_e-}#GK!~Qp(AMXVYfW7LyQ*X!f4SpM-*qreFIku8{K`l4u%b zOtM!=#K_3QZxg;`j6DiL22oTd?nzp3_O*OODS^@j4qq-vV7Kho+U)(f*Y( zx>aLRtA-uuspKS++Oq`OCetR5z4(t~38fJNHpxjUcb!rnBVh{*Xt_}F@{Nu7^Tqzk z-_He%-Q<+3xoB5-t0A*X<>m%Mu0hcxy3Q`bPU*C2K%v-C`ija2;;ZzSCNanY|7ssX zZ)vOYa&xyHxP3)lK^+;0QkCVSA+&9acCTwlUbF_MZ5%sr3Y)``2x*EXq08suOM z;d7ZpGMK-duQ|IE0Bs~Ydnr_S0*`%wK}*F$)uPmc9+gD$iw~sk{ZXOUCdrwpRU<#O zusF{^LLx#e(5u^XBc+5s&rx(3R#vfgP*+J}*$t^vRPyv{V_uy9{Unt$Q ziU!Rbr?nmP<)rAZ7p~befB}!ASs2}zp)$+r#W8{E@k(VIPmmwe&PH^YtHm>wZ*D5` z4(r)7zUIQy&E43&&xv=5R%zyH{nfgwkwrDf6528h3i@np6<^r@p}^P|6KLHI7f|Q> zL=wu``gC-Ug4c0gOY`=!sGuXwjGK}Z^~_f$N7|Wy9i(piOTg#lz}7uadqpYTp0Tu& zJ3wB1f%qp|LnWkX2V3RI%F6Q}#jy*I8)C;6u+LZ8H@_X;y}e%+)-~j|SCS!twUbr6 zOj%H0O*OdB&AZLbrLR4@9w)zbmiUzCc$-lk`YS&$U z8S0c3=}(}?9w3(B%!v;PlD55v!(zaTC{G$O{uI#E&F*%BE(Oi<3-74%chzeq^Bf9W zWwc)UEha1PkY^5rH}6`o<$9-xxWQ8;2XHlsO4^={4NYaw3hb|a`kH&w4%l}PwZu+D zc{!N7)isNpXstDNJf65GE2Wjg{mUm7R+VNWk)@$M7|xGUHSTr7c0($}VD$NAPF5nr zlKS#IV@EGur)m8~b#?$(N^a9eD#L18WkLJyxx+ccF!$7CBB%<)ij{D?tC z%SyShF!tAB6hEM{XB?>I?hR4gw=kUWD$e0#3GLOuw8$7fPeD2TxXXq~+u*7Vje9`B zeX^O_hmiRu_Y*|kKwLpp@VDv(qg`8rjNUC>V|+4vdH#BfuUmef}fm`Fo#u7(Hn>U?K_FE zliW#qg1oBFvxzjqhuNKu`tuB-AJ@}$+N18XFJX9h%-hF&;U^w zocp>JhqA0O{>!}I;1os*mwP~el?$#K%$nZDW2(R@s%qS5(ynLec$J;bswJF&hwCyT zJ(n|PkF!JPcb>#=8Gm7Y<@&x5b4Qof-^MTGg{D%wgOrC2&0GB$peoMO3}(B5i>Qi! z|5iE8Gg$q{?VhG8IgHoRNIfmguC`w|tcxS1<~f9645hY!_Zn~Lv2K(}^Gy7lfIm;M z;D1B-23;mFYE&JF38ZA{oh_D8<=2Y|I#*J)W4Fb_UIO&VVe&vK>@8Ch=lDQGaqzW@;$ z)*Us^O-w@FF@UL>HD)ZUPPM3rh`qLM%+fFrtiwrjxnno`r{wms`7=Ltsp-;?izTAq zwTAcAx84bvLvJ`xujLbNx z4Pkv*!(WgucVbiE$q0I#6xxS#&`6LrdK89cWL4UF|MDDFE~C7P`L6f5e&mR(aR?)L zF*-=}WfJUwSyE+%1IwV(6^j~dMY=xy={AlP9?6XPcDmj-BVyeD^OYeX5%@=S z`pgU8Vg4$50FLMW4aY~c05f4?_*sx2d@;@hx{N{rE6G!e3w$~b-5AzW6sWhMSr)AWQ=ig|ItwLhcHfu znC)-j%9s%MAAk4%5L)X07AgbgH;6ECocs5eV8u8DIB+16>h|>D(zqD+A73GVB*HuW z7P5kzGfd#EQ?ou%cOq5i%0r~`JecVInUWW-e3v+A_U#PV>%j`rf0F>@e1B7#Ktdq+ z^qV=b8VF8*vjUWYK;=m_z%2-z4v+_#rkKFGNhq)pavGimS0>GXS7G2x3O8swr41-Y z5Mgg9BT+a!1qIS0i4+4~37CvMg+ibwUKZ$jLWCH+9&k7DH>3a=)Yh~)aQoRQ)CA4vnLuy`3M6F{M`SX%z||QE0G&$=wF)Ugg=}`B z%3~G^q~`xiznO&r`9=SRhWX4ymHZqO$SwIzvkcED i_W%EDg1>@4`_NK(#)z|gdCiK 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..f407850a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" From 58c22833b160881ea89e8fa355537ac77a820a7a Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 10:33:51 +0400 Subject: [PATCH 02/21] feat: publish to maven central --- db-client-java/build.gradle | 89 +++++++++++++------------------------ 1 file changed, 30 insertions(+), 59 deletions(-) diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle index 202704ea..857e6134 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -11,9 +11,11 @@ plugins { id 'idea' id 'maven-publish' id 'signing' - id 'org.jreleaser' version '1.15.0' + id 'org.jreleaser' version '1.17.0' } +def ENV = System.getenv() + repositories { mavenCentral() } @@ -23,7 +25,9 @@ tasks.withType(JavaCompile) { } group = 'io.kurrent' -version = '1.0.0-alpha.3' +version = '1.0.0-alpha.2' + +archivesBaseName = 'kurrentdb-client' java { withSourcesJar() @@ -42,6 +46,10 @@ configurations { } } +repositories { + mavenCentral() +} + dependencies { implementation "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}" @@ -200,21 +208,20 @@ javadoc { publishing { publications { - myPub(MavenPublication) { + maven(MavenPublication) { + groupId = 'io.kurrent' artifactId = 'kurrentdb-client' from components.java pom { name = 'KurrentDB gRPC Java client' - // packaging 'jar' - // optionally artifactId can be defined here description = 'KurrentDB gRPC Java client' url = 'https://kurrent.io' scm { - connection = 'https://github.com/EventStore/KurrentDB-Client-Java.git' - developerConnection = 'https://github.com/EventStore/KurrentDB-Client-Java.git' - url = 'https://github.com/EventStore/KurrentDB-Client-Java' + connection = 'https://github.com/kurrent-io/KurrentDB-Client-Java.git' + developerConnection = 'https://github.com/kurrent-io/KurrentDB-Client-Java.git' + url = 'https://github.com/kurrent-io/KurrentDB-Client-Java' } licenses { license { @@ -234,67 +241,39 @@ publishing { } repositories { maven { - name = "LocalMavenWithChecksums" - url = uri(layout.buildDirectory.dir("staging-deploy")) + name = "StagingDeploy" + url = layout.buildDirectory.dir('staging-deploy') } - - maven { - name = "PreDeploy" - url = uri(layout.buildDirectory.dir("pre-deploy")) - } - - // Old accounts way -// maven { -// name = "OSSRH" -// url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" -// -// credentials { -// username = findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") -// password = findProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") -// } -// } - -// maven { -// def releaseUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' -// def snapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots' -// def finalUrl = isSnapshot ? snapshotUrl : releaseUrl -// -// name = 'Sonatype' -// url = finalUrl -// credentials { -// username = publishLogin -// password = publishPassword -// } -// } } } -signing { - setRequired { - gradle.taskGraph.allTasks.any { it.name.contains("LocalMavenWithChecksums") } - } - sign publishing.publications.myPub -} - jreleaser { project { - copyright = 'kurrent.io' + copyright = 'Kurrent, Inc' description = 'Kurrent gRPC Java client' } signing { active = 'ALWAYS' armored = true + passphrase = ENV.JRELEASER_GPG_PASSPHRASE + publicKey = ENV.JRELEASER_GPG_PUBLIC_KEY + secretKey = ENV.JRELEASER_GPG_SECRET_KEY + } + environment { + variables = '/home/w1am/.jreleaser/config.toml' } deploy { maven { - // New accounts way mavenCentral { sonatype { active = 'ALWAYS' url = 'https://central.sonatype.com/api/v1/publisher' - username = findProperty("ossrhUsername") ?: System.getenv("MAVENCENTRAL_USERNAME") - password = findProperty("ossrhPassword") ?: System.getenv("MAVENCENTRAL_PASSWORD") - stagingRepository('build/pre-deploy') + authorization = 'BEARER' + username = ENV.JRELEASER_MAVENCENTRAL_USERNAME + password = ENV.JRELEASER_MAVENCENTRAL_PASSWORD + retryDelay = 60 + maxRetries = 60 + stagingRepository('build/staging-deploy') } } } @@ -307,13 +286,5 @@ jreleaser { } -//// For generation of checksums in build/libs -//tasks.withType(Jar) { task -> -// task.doLast { -// ant.checksum algorithm: 'md5', file: it.archivePath -// ant.checksum algorithm: 'sha1', file: it.archivePath -// } -//} - sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 From 4fdfae4fcb6e0d2cc7b0a6b148f12eb1fae5803e Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 10:36:39 +0400 Subject: [PATCH 03/21] chore: update secrets --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8c62d0a..777466ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,11 +29,11 @@ jobs: - name: 🚀 Publish JVM library to Maven Central env: - JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} - JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} - JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.MAVENCENTRAL_USERNAME }} - JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.MAVENCENTRAL_PASSWORD }} + JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }} + JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }} + JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} + JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }} + JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }} run: | if [ "${{ github.event.inputs.dry-run }}" == "true" ]; then gradle jreleaserDeploy --dry-run From 95e1232067ebe02b9848ffc4b70687fb001b0de9 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 10:41:05 +0400 Subject: [PATCH 04/21] chore: remove dry run --- .github/workflows/release.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 777466ba..8d7f7755 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,12 +2,6 @@ name: Publish on: workflow_dispatch: - inputs: - dry-run: - description: 'Run in dry-run mode' - required: false - default: true - type: boolean jobs: publish: @@ -27,16 +21,11 @@ jobs: with: gradle-version: 8.13 - - name: 🚀 Publish JVM library to Maven Central + - name: Release env: JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }} JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }} JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }} JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }} - run: | - if [ "${{ github.event.inputs.dry-run }}" == "true" ]; then - gradle jreleaserDeploy --dry-run - else - gradle jreleaserDeploy - fi \ No newline at end of file + run: ./gradlew publish jreleaserFullRelease -S From a157fa85ab12b2b8241b6d998342686149c4cbc2 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 10:58:13 +0400 Subject: [PATCH 05/21] fix scm --- db-client-java/build.gradle | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle index 857e6134..6527dd92 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -25,7 +25,7 @@ tasks.withType(JavaCompile) { } group = 'io.kurrent' -version = '1.0.0-alpha.2' +version = '1.0.0-alpha.3' archivesBaseName = 'kurrentdb-client' @@ -206,6 +206,19 @@ javadoc { failOnError = false } +tasks.register('checkVersion') { + doFirst { + def xml = new URL( + 'https://repo.maven.apache.org/maven2/dev/aoqia/leaf/installer/maven-metadata.xml').text + def metadata = new groovy.xml.XmlSlurper().parseText(xml) + def versions = metadata.versioning.versions.version*.text(); + if (versions.contains(version)) { + throw new RuntimeException("${version} has already been released!") + } + } +} +publish.mustRunAfter checkVersion + publishing { publications { maven(MavenPublication) { @@ -219,8 +232,8 @@ publishing { url = 'https://kurrent.io' scm { - connection = 'https://github.com/kurrent-io/KurrentDB-Client-Java.git' - developerConnection = 'https://github.com/kurrent-io/KurrentDB-Client-Java.git' + connection = 'scm:git:https://github.com/kurrent-io/KurrentDB-Client-Java.git' + developerConnection = 'scm:git:ssh:https://github.com/kurrent-io/KurrentDB-Client-Java.git' url = 'https://github.com/kurrent-io/KurrentDB-Client-Java' } licenses { From 02d9e35766acf8bba4ea6c57171b792b247f795e Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 11:38:03 +0400 Subject: [PATCH 06/21] remove config --- db-client-java/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle index 6527dd92..9687a35c 100644 --- a/db-client-java/build.gradle +++ b/db-client-java/build.gradle @@ -272,9 +272,6 @@ jreleaser { publicKey = ENV.JRELEASER_GPG_PUBLIC_KEY secretKey = ENV.JRELEASER_GPG_SECRET_KEY } - environment { - variables = '/home/w1am/.jreleaser/config.toml' - } deploy { maven { mavenCentral { From 29936799d72eba0519443d74a73c133cf020222d Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 11:39:55 +0400 Subject: [PATCH 07/21] move project to root dir --- build.gradle | 308 +++++++++++++++++- db-client-java/build.gradle | 300 ----------------- .../io/kurrent/dbclient/AbortProjection.java | 0 .../dbclient/AbortProjectionOptions.java | 0 .../AbstractCreatePersistentSubscription.java | 0 .../AbstractDeletePersistentSubscription.java | 0 ...PersistentSubscriptionSettingsBuilder.java | 0 .../io/kurrent/dbclient/AbstractRead.java | 0 .../dbclient/AbstractRegularSubscription.java | 0 ...stractSubscribePersistentSubscription.java | 0 .../AbstractUpdatePersistentSubscription.java | 0 .../main/java/io/kurrent/dbclient/Acl.java | 0 .../main/java/io/kurrent/dbclient/Acls.java | 0 .../io/kurrent/dbclient/AppendToStream.java | 0 .../dbclient/AppendToStreamOptions.java | 0 .../io/kurrent/dbclient/Checkpointer.java | 0 .../kurrent/dbclient/ClientCertificate.java | 0 .../kurrent/dbclient/ClientFeatureFlags.java | 0 .../io/kurrent/dbclient/ClientTelemetry.java | 0 .../dbclient/ClientTelemetryAttributes.java | 0 .../dbclient/ClientTelemetryConstants.java | 0 .../kurrent/dbclient/ClientTelemetryTags.java | 0 .../io/kurrent/dbclient/ClusterDiscovery.java | 0 .../java/io/kurrent/dbclient/ClusterInfo.java | 0 .../kurrent/dbclient/ConnectionMetadata.java | 0 .../kurrent/dbclient/ConnectionService.java | 0 .../dbclient/ConnectionSettingsBuilder.java | 0 .../dbclient/ConnectionShutdownException.java | 0 .../io/kurrent/dbclient/ConnectionState.java | 0 .../ConnectionStringParsingException.java | 0 .../main/java/io/kurrent/dbclient/Consts.java | 0 .../java/io/kurrent/dbclient/ContentType.java | 0 .../io/kurrent/dbclient/CreateChannel.java | 0 .../CreatePersistentSubscriptionToAll.java | 0 ...atePersistentSubscriptionToAllOptions.java | 0 .../CreatePersistentSubscriptionToStream.java | 0 ...PersistentSubscriptionToStreamOptions.java | 0 .../io/kurrent/dbclient/CreateProjection.java | 0 .../dbclient/CreateProjectionOptions.java | 0 .../io/kurrent/dbclient/CustomAclCodec.java | 0 .../DeletePersistentSubscriptionOptions.java | 0 .../DeletePersistentSubscriptionToAll.java | 0 .../DeletePersistentSubscriptionToStream.java | 0 .../io/kurrent/dbclient/DeleteProjection.java | 0 .../dbclient/DeleteProjectionOptions.java | 0 .../io/kurrent/dbclient/DeleteResult.java | 0 .../io/kurrent/dbclient/DeleteStream.java | 0 .../kurrent/dbclient/DeleteStreamOptions.java | 0 .../java/io/kurrent/dbclient/Direction.java | 0 .../kurrent/dbclient/DisableProjection.java | 0 .../dbclient/DisableProjectionOptions.java | 0 .../java/io/kurrent/dbclient/Discovery.java | 0 .../io/kurrent/dbclient/EnableProjection.java | 0 .../dbclient/EnableProjectionOptions.java | 0 .../java/io/kurrent/dbclient/EventData.java | 0 .../io/kurrent/dbclient/EventDataBuilder.java | 0 .../java/io/kurrent/dbclient/EventFilter.java | 0 .../io/kurrent/dbclient/EventTypeFilter.java | 0 .../io/kurrent/dbclient/FeatureFlags.java | 0 .../GetPersistentSubscriptionInfo.java | 0 .../GetPersistentSubscriptionInfoOptions.java | 0 .../kurrent/dbclient/GetProjectionResult.java | 0 .../dbclient/GetProjectionResultOptions.java | 0 .../kurrent/dbclient/GetProjectionState.java | 0 .../dbclient/GetProjectionStateOptions.java | 0 .../dbclient/GetProjectionStatistics.java | 0 .../GetProjectionStatisticsOptions.java | 0 .../kurrent/dbclient/GetProjectionStatus.java | 0 .../dbclient/GetProjectionStatusOptions.java | 0 .../io/kurrent/dbclient/GossipClient.java | 0 .../java/io/kurrent/dbclient/GrpcClient.java | 0 .../java/io/kurrent/dbclient/GrpcUtils.java | 0 .../java/io/kurrent/dbclient/HttpUtils.java | 0 .../io/kurrent/dbclient/KurrentDBClient.java | 0 .../kurrent/dbclient/KurrentDBClientBase.java | 0 .../dbclient/KurrentDBClientSettings.java | 0 .../dbclient/KurrentDBConnectionString.java | 0 ...urrentDBPersistentSubscriptionsClient.java | 0 .../KurrentDBProjectionManagementClient.java | 0 .../dbclient/ListPersistentSubscriptions.java | 0 .../ListPersistentSubscriptionsOptions.java | 0 .../io/kurrent/dbclient/ListProjections.java | 0 .../dbclient/ListProjectionsOptions.java | 0 .../dbclient/ListProjectionsResult.java | 0 .../main/java/io/kurrent/dbclient/Msg.java | 0 .../java/io/kurrent/dbclient/NackAction.java | 0 .../dbclient/NamedConsumerStrategy.java | 0 .../dbclient/NoClusterNodeFoundException.java | 0 .../io/kurrent/dbclient/NodePreference.java | 0 .../io/kurrent/dbclient/NodeSelector.java | 0 .../kurrent/dbclient/NotLeaderException.java | 0 .../io/kurrent/dbclient/OperationKind.java | 0 .../java/io/kurrent/dbclient/OptionsBase.java | 0 .../dbclient/OptionsWithBackPressure.java | 0 ...ionsWithPositionAndResolveLinkTosBase.java | 0 .../OptionsWithResolveLinkTosBase.java | 0 ...ithStartRevisionAndResolveLinkTosBase.java | 0 .../dbclient/OptionsWithStreamStateBase.java | 0 .../dbclient/PersistentSubscription.java | 0 .../PersistentSubscriptionConnectionInfo.java | 0 .../dbclient/PersistentSubscriptionInfo.java | 0 .../PersistentSubscriptionListener.java | 0 .../PersistentSubscriptionSettings.java | 0 .../dbclient/PersistentSubscriptionStats.java | 0 .../PersistentSubscriptionToAllInfo.java | 0 .../PersistentSubscriptionToAllSettings.java | 0 .../PersistentSubscriptionToAllStats.java | 0 .../PersistentSubscriptionToStreamInfo.java | 0 ...ersistentSubscriptionToStreamSettings.java | 0 .../PersistentSubscriptionToStreamStats.java | 0 .../java/io/kurrent/dbclient/Position.java | 0 .../dbclient/PrefixFilterExpression.java | 0 .../kurrent/dbclient/ProjectionDetails.java | 0 .../java/io/kurrent/dbclient/ReadAll.java | 0 .../io/kurrent/dbclient/ReadAllOptions.java | 0 .../java/io/kurrent/dbclient/ReadMessage.java | 0 .../dbclient/ReadResponseObserver.java | 0 .../java/io/kurrent/dbclient/ReadResult.java | 0 .../java/io/kurrent/dbclient/ReadStream.java | 0 .../kurrent/dbclient/ReadStreamConsumer.java | 0 .../kurrent/dbclient/ReadStreamOptions.java | 0 .../io/kurrent/dbclient/ReadSubscriber.java | 0 .../io/kurrent/dbclient/RecordedEvent.java | 0 .../dbclient/RegularFilterExpression.java | 0 .../dbclient/ReplayParkedMessages.java | 0 .../dbclient/ReplayParkedMessagesOptions.java | 0 .../io/kurrent/dbclient/ResetProjection.java | 0 .../dbclient/ResetProjectionOptions.java | 0 .../io/kurrent/dbclient/ResolvedEvent.java | 0 .../dbclient/ResourceNotFoundException.java | 0 ...estartPersistentSubscriptionSubsystem.java | 0 ...ersistentSubscriptionSubsystemOptions.java | 0 .../dbclient/RestartProjectionSubsystem.java | 0 .../RestartProjectionSubsystemOptions.java | 0 .../kurrent/dbclient/RevisionOrPosition.java | 0 .../java/io/kurrent/dbclient/RunWorkItem.java | 0 .../io/kurrent/dbclient/ServerFeatures.java | 0 .../java/io/kurrent/dbclient/ServerInfo.java | 0 .../io/kurrent/dbclient/ServerVersion.java | 0 .../java/io/kurrent/dbclient/Shutdown.java | 0 .../kurrent/dbclient/SingleNodeDiscovery.java | 0 .../java/io/kurrent/dbclient/StreamAcl.java | 0 .../io/kurrent/dbclient/StreamConsumer.java | 0 .../dbclient/StreamDeletedException.java | 0 .../io/kurrent/dbclient/StreamFilter.java | 0 .../io/kurrent/dbclient/StreamMetadata.java | 0 .../dbclient/StreamNotFoundException.java | 0 .../io/kurrent/dbclient/StreamPosition.java | 0 .../java/io/kurrent/dbclient/StreamState.java | 0 ...ubscribePersistentSubscriptionOptions.java | 0 .../SubscribePersistentSubscriptionToAll.java | 0 ...bscribePersistentSubscriptionToStream.java | 0 .../io/kurrent/dbclient/SubscribeToAll.java | 0 .../dbclient/SubscribeToAllOptions.java | 0 .../kurrent/dbclient/SubscribeToStream.java | 0 .../dbclient/SubscribeToStreamOptions.java | 0 .../io/kurrent/dbclient/Subscription.java | 0 .../kurrent/dbclient/SubscriptionFilter.java | 0 .../dbclient/SubscriptionFilterBuilder.java | 0 .../dbclient/SubscriptionListener.java | 0 .../dbclient/SubscriptionStreamConsumer.java | 0 .../dbclient/SubscriptionTracingCallback.java | 0 .../kurrent/dbclient/SystemMetadataKeys.java | 0 .../io/kurrent/dbclient/SystemStreamAcl.java | 0 .../io/kurrent/dbclient/SystemStreams.java | 0 .../kurrent/dbclient/ThrowingBiFunction.java | 0 .../io/kurrent/dbclient/ThrowingFunction.java | 0 .../main/java/io/kurrent/dbclient/Tuple.java | 0 .../dbclient/UnsupportedFeatureException.java | 0 .../UpdatePersistentSubscriptionToAll.java | 0 ...atePersistentSubscriptionToAllOptions.java | 0 .../UpdatePersistentSubscriptionToStream.java | 0 ...PersistentSubscriptionToStreamOptions.java | 0 .../io/kurrent/dbclient/UpdateProjection.java | 0 .../dbclient/UpdateProjectionOptions.java | 0 .../io/kurrent/dbclient/UserCredentials.java | 0 .../io/kurrent/dbclient/UserStreamAcl.java | 0 .../java/io/kurrent/dbclient/WorkItem.java | 0 .../io/kurrent/dbclient/WorkItemArgs.java | 0 .../java/io/kurrent/dbclient/WriteResult.java | 0 .../WrongExpectedVersionException.java | 0 .../resolution/DeferredNodeResolution.java | 0 .../resolution/DeprecatedNodeResolution.java | 0 .../resolution/FixedSeedsNodeResolution.java | 0 .../dbclient/resolution/NodeResolution.java | 0 .../src => src}/main/proto/code.proto | 0 .../src => src}/main/proto/gossip.proto | 0 .../src => src}/main/proto/persistent.proto | 0 .../main/proto/projectionmanagement.proto | 0 .../main/proto/serverfeatures.proto | 0 .../src => src}/main/proto/shared.proto | 0 .../src => src}/main/proto/status.proto | 0 .../src => src}/main/proto/streams.proto | 0 .../test/java/io/kurrent/dbclient/Action.java | 0 .../java/io/kurrent/dbclient/BazEvent.java | 0 .../io/kurrent/dbclient/ClientTracker.java | 0 .../io/kurrent/dbclient/ConnectionAware.java | 0 .../java/io/kurrent/dbclient/Database.java | 0 .../io/kurrent/dbclient/DatabaseFactory.java | 0 .../java/io/kurrent/dbclient/Exceptions.java | 0 .../test/java/io/kurrent/dbclient/Foo.java | 0 .../java/io/kurrent/dbclient/MiscTests.java | 0 .../PersistentSubscriptionsTests.java | 0 .../io/kurrent/dbclient/PluginsTests.java | 0 .../io/kurrent/dbclient/StreamsTests.java | 0 .../io/kurrent/dbclient/TelemetryTests.java | 0 .../databases/DockerContainerDatabase.java | 0 .../databases/ExternallyCreatedCluster.java | 0 .../kurrent/dbclient/misc/EventDataTests.java | 0 .../dbclient/misc/ExpectedRevisionTests.java | 0 .../dbclient/misc/NodeSelectorTest.java | 0 .../dbclient/misc/OfflineMetadataTests.java | 0 .../ParseInvalidConnectionStringTests.java | 0 .../misc/ParseValidConnectionStringTests.java | 0 .../kurrent/dbclient/misc/PositionTests.java | 0 .../dbclient/misc/ServerVersionTests.java | 0 .../CreatePersistentSubscriptionTests.java | 0 ...tePersistentSubscriptionToStreamTests.java | 0 ...PersistentSubscriptionManagementTests.java | 0 ...stentSubscriptionToAllWithFilterTests.java | 0 ...bePersistentSubscriptionToStreamTests.java | 0 ...tePersistentSubscriptionToStreamTests.java | 0 .../ClientCertificateAuthenticationTests.java | 0 .../kurrent/dbclient/samples/TestEvent.java | 0 .../appending_events/AppendingEvents.java | 0 .../authentication/UserCertificate.java | 0 .../opentelemetry/Instrumentation.java | 0 .../PersistentSubscriptions.java | 0 .../ProjectionManagement.java | 0 .../samples/quick_start/QuickStart.java | 0 .../samples/reading_events/ReadingEvents.java | 0 .../ServerSideFiltering.java | 0 .../SubscribingToStream.java | 0 .../kurrent/dbclient/streams/AppendTests.java | 0 .../streams/ClientLifecycleTests.java | 0 .../dbclient/streams/DeadlineTests.java | 0 .../kurrent/dbclient/streams/DeleteTests.java | 0 .../dbclient/streams/InterceptorTests.java | 0 .../dbclient/streams/MetadataTests.java | 0 .../dbclient/streams/ReadStreamTests.java | 0 .../dbclient/streams/SubscriptionTests.java | 0 ...scriptionsTracingInstrumentationTests.java | 0 .../dbclient/telemetry/SpanProcessorSpy.java | 0 .../StreamsTracingInstrumentationTests.java | 0 .../dbclient/telemetry/TelemetryAware.java | 0 .../TracingContextInjectionTests.java | 0 .../test/resources/all-back-c3386-p3386.json | 0 .../test/resources/all-back-e0-e10.json | 0 .../test/resources/all-c1788-p1788.json | 0 .../test/resources/all-e0-e10.json | 0 ...l-positions-filtered-stream194-e0-e30.json | 0 ...ll-versions-filtered-stream194-e0-e30.json | 0 .../count-events-partitioned-projection.js | 0 .../test/resources/count-events-projection.js | 0 .../resources/dataset20M-1800-e0-e10.json | 0 .../dataset20M-1800-e1999-e1990.json | 0 .../test/resources/junit-platform.properties | 0 .../test/resources/simplelogger.properties | 0 .../resources/state-with-unknown-keynames.js | 0 259 files changed, 298 insertions(+), 310 deletions(-) delete mode 100644 db-client-java/build.gradle rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbortProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbortProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractRead.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Acl.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Acls.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AppendToStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/AppendToStreamOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Checkpointer.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClientCertificate.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClientFeatureFlags.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClientTelemetry.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClientTelemetryTags.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClusterDiscovery.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ClusterInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ConnectionMetadata.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ConnectionService.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ConnectionShutdownException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ConnectionState.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Consts.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ContentType.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreateChannel.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreateProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CreateProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/CustomAclCodec.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeleteProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeleteResult.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeleteStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DeleteStreamOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Direction.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DisableProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/DisableProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Discovery.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/EnableProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/EnableProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/EventData.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/EventDataBuilder.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/EventFilter.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/EventTypeFilter.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/FeatureFlags.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionResult.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionState.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionStatistics.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionStatus.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GossipClient.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GrpcClient.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/GrpcUtils.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/HttpUtils.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/KurrentDBClient.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/KurrentDBClientBase.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ListProjections.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ListProjectionsOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ListProjectionsResult.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Msg.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/NackAction.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/NodePreference.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/NodeSelector.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/NotLeaderException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OperationKind.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OptionsBase.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Position.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/PrefixFilterExpression.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ProjectionDetails.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadAll.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadAllOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadMessage.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadResponseObserver.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadResult.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadStreamConsumer.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadStreamOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReadSubscriber.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RecordedEvent.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RegularFilterExpression.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReplayParkedMessages.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ResetProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ResetProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ResolvedEvent.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ResourceNotFoundException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RevisionOrPosition.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/RunWorkItem.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ServerFeatures.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ServerInfo.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ServerVersion.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Shutdown.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamAcl.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamConsumer.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamDeletedException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamFilter.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamMetadata.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamNotFoundException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamPosition.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/StreamState.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribeToAll.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribeToStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Subscription.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscriptionFilter.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscriptionListener.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SystemMetadataKeys.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SystemStreamAcl.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/SystemStreams.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ThrowingBiFunction.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/ThrowingFunction.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/Tuple.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UpdateProjection.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UserCredentials.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/UserStreamAcl.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/WorkItem.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/WorkItemArgs.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/WriteResult.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java (100%) rename {db-client-java/src => src}/main/java/io/kurrent/dbclient/resolution/NodeResolution.java (100%) rename {db-client-java/src => src}/main/proto/code.proto (100%) rename {db-client-java/src => src}/main/proto/gossip.proto (100%) rename {db-client-java/src => src}/main/proto/persistent.proto (100%) rename {db-client-java/src => src}/main/proto/projectionmanagement.proto (100%) rename {db-client-java/src => src}/main/proto/serverfeatures.proto (100%) rename {db-client-java/src => src}/main/proto/shared.proto (100%) rename {db-client-java/src => src}/main/proto/status.proto (100%) rename {db-client-java/src => src}/main/proto/streams.proto (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/Action.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/BazEvent.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/ClientTracker.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/ConnectionAware.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/Database.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/DatabaseFactory.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/Exceptions.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/Foo.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/MiscTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/PluginsTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/StreamsTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/TelemetryTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/EventDataTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/PositionTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/TestEvent.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/AppendTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/DeadlineTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/DeleteTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/InterceptorTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/MetadataTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java (100%) rename {db-client-java/src => src}/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java (100%) rename {db-client-java/src => src}/test/resources/all-back-c3386-p3386.json (100%) rename {db-client-java/src => src}/test/resources/all-back-e0-e10.json (100%) rename {db-client-java/src => src}/test/resources/all-c1788-p1788.json (100%) rename {db-client-java/src => src}/test/resources/all-e0-e10.json (100%) rename {db-client-java/src => src}/test/resources/all-positions-filtered-stream194-e0-e30.json (100%) rename {db-client-java/src => src}/test/resources/all-versions-filtered-stream194-e0-e30.json (100%) rename {db-client-java/src => src}/test/resources/count-events-partitioned-projection.js (100%) rename {db-client-java/src => src}/test/resources/count-events-projection.js (100%) rename {db-client-java/src => src}/test/resources/dataset20M-1800-e0-e10.json (100%) rename {db-client-java/src => src}/test/resources/dataset20M-1800-e1999-e1990.json (100%) rename {db-client-java/src => src}/test/resources/junit-platform.properties (100%) rename {db-client-java/src => src}/test/resources/simplelogger.properties (100%) rename {db-client-java/src => src}/test/resources/state-with-unknown-keynames.js (100%) diff --git a/build.gradle b/build.gradle index add7563e..1fe2b885 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,304 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Java Library project to get you started. - * For more details take a look at the Java Libraries chapter in the Gradle - * User Manual available at https://docs.gradle.org/6.6.1/userguide/java_library_plugin.html - */ -allprojects { +buildscript { + dependencies { + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' + classpath 'de.undercouch:gradle-download-task:5.5.0' + } +} + +plugins { + id 'java' + id 'com.google.protobuf' version '0.9.4' + id 'idea' + id 'maven-publish' + id 'signing' + id 'org.jreleaser' version '1.17.0' +} + +def ENV = System.getenv() + +repositories { + mavenCentral() +} + +tasks.withType(JavaCompile) { + options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked'] +} + +group = 'io.kurrent' +version = '1.0.0-alpha.3' + +archivesBaseName = 'kurrentdb-client' + +java { + withSourcesJar() + withJavadocJar() +} + +artifacts { + archives javadocJar + archives sourcesJar +} + +configurations { + exposedRuntime { + canBeResolved = false + canBeConsumed = true + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}" + + implementation "javax.annotation:javax.annotation-api:${annotationApiVersion}" + implementation "javax.validation:validation-api:${validationApiVersion}" + + implementation "com.google.protobuf:protobuf-java:${protobufVersion}" + implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}" + implementation 'com.google.errorprone:error_prone_annotations:2.23.0' + implementation "io.grpc:grpc-netty-shaded:${grpcVersion}" + implementation "io.grpc:grpc-stub:${grpcVersion}" + implementation "io.grpc:grpc-protobuf:${grpcVersion}" + implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + implementation "org.slf4j:slf4j-api:2.0.17" + implementation "org.bouncycastle:bcprov-jdk18on:1.80" + implementation "org.bouncycastle:bcpkix-jdk18on:1.80" + + implementation platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}") + implementation "io.opentelemetry:opentelemetry-api" + implementation "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemConvVersion}" + implementation "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${openTelemetrySemConvVersion}" + + testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" + testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}" + testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" + testImplementation "org.junit.platform:junit-platform-suite:1.10.0" + testImplementation 'org.junit-pioneer:junit-pioneer:1.9.1' + testImplementation 'io.reactivex.rxjava3:rxjava:3.1.8' + testImplementation "org.reactivestreams:reactive-streams-tck:${reactiveStreamsApiVersion}" + testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}" + testImplementation platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}") + testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' + testImplementation "com.github.javafaker:javafaker:1.0.2" + testImplementation 'org.slf4j:slf4j-simple:2.0.17' + testImplementation "io.opentelemetry:opentelemetry-sdk" + testImplementation "io.opentelemetry:opentelemetry-sdk-testing" + testImplementation 'io.opentelemetry:opentelemetry-exporter-logging:1.38.0' + testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp-trace:1.14.0' +} + +tasks.withType(Test).configureEach { + testLogging { + events "PASSED", "SKIPPED", "FAILED" + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = true + } +} + +tasks.register("generateCertificates", Exec) { + description = "Generates SSL certificates to start a secured ESDB server" + commandLine 'docker', 'compose', '--file', '../configure-tls-for-tests.yml', 'up' +} + +tasks.register("generateUserCertificates", Exec) { + description = "Generates X.509 certificates for Plugins tests" + commandLine 'docker', 'compose', '--file', '../configure-user-certs-for-tests.yml', 'up' +} + +tasks.register("startDockerCompose", Exec) { + description = "Starts ESDB cluster" + commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'up', '-d' +} + +tasks.register("stopDockerCompose", Exec) { + description = "Stop ESDB cluster" + commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'down' +} + + +tasks.register("miscTests", Test) { + useJUnitPlatform { + include("**/MiscTests.class") + } +} + +tasks.register("singleNodeTests", Test) { + useJUnitPlatform { + include("**/StreamsTests.class") + include("**/PersistentSubscriptionsTests.class") + include("**/TelemetryTests.class") + } +} + +tasks.register("secureNodeTests", Test) { + dependsOn generateCertificates + environment "SECURE", "true" + + useJUnitPlatform { + include("**/StreamsTests.class") + include("**/PersistentSubscriptionsTests.class") + } +} + +tasks.register("clusterTests", Test) { + dependsOn startDockerCompose + finalizedBy stopDockerCompose + environment "SECURE", "true" + environment "CLUSTER", "true" + + useJUnitPlatform { + include("**/StreamsTests.class") + include("**/PersistentSubscriptionsTests.class") + } +} + +tasks.register("pluginsTests", Test) { + dependsOn generateCertificates + dependsOn generateUserCertificates + + environment "SECURE", "true" + + useJUnitPlatform { + include("**/PluginsTests.class") + } +} + +tasks.register("ci", Test) { + useJUnitPlatform() +} + +test { + dependsOn miscTests, singleNodeTests, secureNodeTests, clusterTests +} + +protobuf { + protoc { + // The artifact spec for the Protobuf Compiler + artifact = "com.google.protobuf:protoc:${protocVersion}" + } + plugins { + // Optional: an artifact spec for a protoc plugin, with "grpc" as + // the identifier, which can be referred to in the "plugins" + // container of the "generateProtoTasks" closure. + grpc { + artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" + } + } + generateProtoTasks { + ofSourceSet('main')*.plugins { + // Apply the "grpc" plugin whose spec is defined above, without + // options. Note the braces cannot be omitted, otherwise the + // plugin will not be added. This is because of the implicit way + // NamedDomainObjectContainer binds the methods. + grpc {} + } + } +} + +javadoc { + options.addStringOption('Xdoclint:none', '-quiet') + failOnError = false +} + +tasks.register('checkVersion') { + doFirst { + def xml = new URL( + 'https://repo.maven.apache.org/maven2/dev/aoqia/leaf/installer/maven-metadata.xml').text + def metadata = new groovy.xml.XmlSlurper().parseText(xml) + def versions = metadata.versioning.versions.version*.text(); + if (versions.contains(version)) { + throw new RuntimeException("${version} has already been released!") + } + } +} +publish.mustRunAfter checkVersion + +publishing { + publications { + maven(MavenPublication) { + groupId = 'io.kurrent' + artifactId = 'kurrentdb-client' + + from components.java + pom { + name = 'KurrentDB gRPC Java client' + description = 'KurrentDB gRPC Java client' + url = 'https://kurrent.io' + + scm { + connection = 'scm:git:https://github.com/kurrent-io/KurrentDB-Client-Java.git' + developerConnection = 'scm:git:ssh:https://github.com/kurrent-io/KurrentDB-Client-Java.git' + url = 'https://github.com/kurrent-io/KurrentDB-Client-Java' + } + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { + id = 'ylaupa' + name = 'Yorick Laupa' + email = 'yorick.laupa@eventstore.com' + } + } + } + } + } repositories { - mavenCentral() + maven { + name = "StagingDeploy" + url = layout.buildDirectory.dir('staging-deploy') + } + } +} + +jreleaser { + project { + copyright = 'Kurrent, Inc' + description = 'Kurrent gRPC Java client' + } + signing { + active = 'ALWAYS' + armored = true + passphrase = ENV.JRELEASER_GPG_PASSPHRASE + publicKey = ENV.JRELEASER_GPG_PUBLIC_KEY + secretKey = ENV.JRELEASER_GPG_SECRET_KEY + } + deploy { + maven { + mavenCentral { + sonatype { + active = 'ALWAYS' + url = 'https://central.sonatype.com/api/v1/publisher' + authorization = 'BEARER' + username = ENV.JRELEASER_MAVENCENTRAL_USERNAME + password = ENV.JRELEASER_MAVENCENTRAL_PASSWORD + retryDelay = 60 + maxRetries = 60 + stagingRepository('build/staging-deploy') + } + } + } + } + release { + github { + enabled = false + } } } + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + if (!JavaVersion.current().isJava8Compatible()) { throw new Exception("Java 8 is required to build Kurrent-Client-Java") -} \ No newline at end of file +} diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle deleted file mode 100644 index 9687a35c..00000000 --- a/db-client-java/build.gradle +++ /dev/null @@ -1,300 +0,0 @@ -buildscript { - dependencies { - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' - classpath 'de.undercouch:gradle-download-task:5.5.0' - } -} - -plugins { - id 'java' - id 'com.google.protobuf' version '0.9.4' - id 'idea' - id 'maven-publish' - id 'signing' - id 'org.jreleaser' version '1.17.0' -} - -def ENV = System.getenv() - -repositories { - mavenCentral() -} - -tasks.withType(JavaCompile) { - options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked'] -} - -group = 'io.kurrent' -version = '1.0.0-alpha.3' - -archivesBaseName = 'kurrentdb-client' - -java { - withSourcesJar() - withJavadocJar() -} - -artifacts { - archives javadocJar - archives sourcesJar -} - -configurations { - exposedRuntime { - canBeResolved = false - canBeConsumed = true - } -} - -repositories { - mavenCentral() -} - -dependencies { - implementation "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}" - - implementation "javax.annotation:javax.annotation-api:${annotationApiVersion}" - implementation "javax.validation:validation-api:${validationApiVersion}" - - implementation "com.google.protobuf:protobuf-java:${protobufVersion}" - implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}" - implementation 'com.google.errorprone:error_prone_annotations:2.23.0' - implementation "io.grpc:grpc-netty-shaded:${grpcVersion}" - implementation "io.grpc:grpc-stub:${grpcVersion}" - implementation "io.grpc:grpc-protobuf:${grpcVersion}" - implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - implementation "org.slf4j:slf4j-api:2.0.17" - implementation "org.bouncycastle:bcprov-jdk18on:1.80" - implementation "org.bouncycastle:bcpkix-jdk18on:1.80" - - implementation platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}") - implementation "io.opentelemetry:opentelemetry-api" - implementation "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemConvVersion}" - implementation "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${openTelemetrySemConvVersion}" - - testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" - testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}" - testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" - testImplementation "org.junit.platform:junit-platform-suite:1.10.0" - testImplementation 'org.junit-pioneer:junit-pioneer:1.9.1' - testImplementation 'io.reactivex.rxjava3:rxjava:3.1.8' - testImplementation "org.reactivestreams:reactive-streams-tck:${reactiveStreamsApiVersion}" - testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}" - testImplementation platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}") - testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' - testImplementation "com.github.javafaker:javafaker:1.0.2" - testImplementation 'org.slf4j:slf4j-simple:2.0.17' - testImplementation "io.opentelemetry:opentelemetry-sdk" - testImplementation "io.opentelemetry:opentelemetry-sdk-testing" - testImplementation 'io.opentelemetry:opentelemetry-exporter-logging:1.38.0' - testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp-trace:1.14.0' -} - -tasks.withType(Test).configureEach { - testLogging { - events "PASSED", "SKIPPED", "FAILED" - showExceptions true - exceptionFormat "full" - showCauses true - showStackTraces true - showStandardStreams = true - } -} - -tasks.register("generateCertificates", Exec) { - description = "Generates SSL certificates to start a secured ESDB server" - commandLine 'docker', 'compose', '--file', '../configure-tls-for-tests.yml', 'up' -} - -tasks.register("generateUserCertificates", Exec) { - description = "Generates X.509 certificates for Plugins tests" - commandLine 'docker', 'compose', '--file', '../configure-user-certs-for-tests.yml', 'up' -} - -tasks.register("startDockerCompose", Exec) { - description = "Starts ESDB cluster" - commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'up', '-d' -} - -tasks.register("stopDockerCompose", Exec) { - description = "Stop ESDB cluster" - commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'down' -} - - -tasks.register("miscTests", Test) { - useJUnitPlatform { - include("**/MiscTests.class") - } -} - -tasks.register("singleNodeTests", Test) { - useJUnitPlatform { - include("**/StreamsTests.class") - include("**/PersistentSubscriptionsTests.class") - include("**/TelemetryTests.class") - } -} - -tasks.register("secureNodeTests", Test) { - dependsOn generateCertificates - environment "SECURE", "true" - - useJUnitPlatform { - include("**/StreamsTests.class") - include("**/PersistentSubscriptionsTests.class") - } -} - -tasks.register("clusterTests", Test) { - dependsOn startDockerCompose - finalizedBy stopDockerCompose - environment "SECURE", "true" - environment "CLUSTER", "true" - - useJUnitPlatform { - include("**/StreamsTests.class") - include("**/PersistentSubscriptionsTests.class") - } -} - -tasks.register("pluginsTests", Test) { - dependsOn generateCertificates - dependsOn generateUserCertificates - - environment "SECURE", "true" - - useJUnitPlatform { - include("**/PluginsTests.class") - } -} - -tasks.register("ci", Test) { - useJUnitPlatform() -} - -test { - dependsOn miscTests, singleNodeTests, secureNodeTests, clusterTests -} - -protobuf { - protoc { - // The artifact spec for the Protobuf Compiler - artifact = "com.google.protobuf:protoc:${protocVersion}" - } - plugins { - // Optional: an artifact spec for a protoc plugin, with "grpc" as - // the identifier, which can be referred to in the "plugins" - // container of the "generateProtoTasks" closure. - grpc { - artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" - } - } - generateProtoTasks { - ofSourceSet('main')*.plugins { - // Apply the "grpc" plugin whose spec is defined above, without - // options. Note the braces cannot be omitted, otherwise the - // plugin will not be added. This is because of the implicit way - // NamedDomainObjectContainer binds the methods. - grpc {} - } - } -} - -javadoc { - options.addStringOption('Xdoclint:none', '-quiet') - failOnError = false -} - -tasks.register('checkVersion') { - doFirst { - def xml = new URL( - 'https://repo.maven.apache.org/maven2/dev/aoqia/leaf/installer/maven-metadata.xml').text - def metadata = new groovy.xml.XmlSlurper().parseText(xml) - def versions = metadata.versioning.versions.version*.text(); - if (versions.contains(version)) { - throw new RuntimeException("${version} has already been released!") - } - } -} -publish.mustRunAfter checkVersion - -publishing { - publications { - maven(MavenPublication) { - groupId = 'io.kurrent' - artifactId = 'kurrentdb-client' - - from components.java - pom { - name = 'KurrentDB gRPC Java client' - description = 'KurrentDB gRPC Java client' - url = 'https://kurrent.io' - - scm { - connection = 'scm:git:https://github.com/kurrent-io/KurrentDB-Client-Java.git' - developerConnection = 'scm:git:ssh:https://github.com/kurrent-io/KurrentDB-Client-Java.git' - url = 'https://github.com/kurrent-io/KurrentDB-Client-Java' - } - licenses { - license { - name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id = 'ylaupa' - name = 'Yorick Laupa' - email = 'yorick.laupa@eventstore.com' - } - } - } - } - } - repositories { - maven { - name = "StagingDeploy" - url = layout.buildDirectory.dir('staging-deploy') - } - } -} - -jreleaser { - project { - copyright = 'Kurrent, Inc' - description = 'Kurrent gRPC Java client' - } - signing { - active = 'ALWAYS' - armored = true - passphrase = ENV.JRELEASER_GPG_PASSPHRASE - publicKey = ENV.JRELEASER_GPG_PUBLIC_KEY - secretKey = ENV.JRELEASER_GPG_SECRET_KEY - } - deploy { - maven { - mavenCentral { - sonatype { - active = 'ALWAYS' - url = 'https://central.sonatype.com/api/v1/publisher' - authorization = 'BEARER' - username = ENV.JRELEASER_MAVENCENTRAL_USERNAME - password = ENV.JRELEASER_MAVENCENTRAL_PASSWORD - retryDelay = 60 - maxRetries = 60 - stagingRepository('build/staging-deploy') - } - } - } - } - release { - github { - enabled = false - } - } -} - - -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java b/src/main/java/io/kurrent/dbclient/AbortProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java rename to src/main/java/io/kurrent/dbclient/AbortProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java b/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java rename to src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java rename to src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java b/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java rename to src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java b/src/main/java/io/kurrent/dbclient/AbstractRead.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java rename to src/main/java/io/kurrent/dbclient/AbstractRead.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java rename to src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java rename to src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java rename to src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Acl.java b/src/main/java/io/kurrent/dbclient/Acl.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Acl.java rename to src/main/java/io/kurrent/dbclient/Acl.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Acls.java b/src/main/java/io/kurrent/dbclient/Acls.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Acls.java rename to src/main/java/io/kurrent/dbclient/Acls.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java b/src/main/java/io/kurrent/dbclient/AppendToStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java rename to src/main/java/io/kurrent/dbclient/AppendToStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java b/src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java rename to src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java b/src/main/java/io/kurrent/dbclient/Checkpointer.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java rename to src/main/java/io/kurrent/dbclient/Checkpointer.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java b/src/main/java/io/kurrent/dbclient/ClientCertificate.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java rename to src/main/java/io/kurrent/dbclient/ClientCertificate.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java b/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java rename to src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java b/src/main/java/io/kurrent/dbclient/ClientTelemetry.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java rename to src/main/java/io/kurrent/dbclient/ClientTelemetry.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java rename to src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java rename to src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java rename to src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java b/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java rename to src/main/java/io/kurrent/dbclient/ClusterDiscovery.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java b/src/main/java/io/kurrent/dbclient/ClusterInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java rename to src/main/java/io/kurrent/dbclient/ClusterInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java b/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java rename to src/main/java/io/kurrent/dbclient/ConnectionMetadata.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java b/src/main/java/io/kurrent/dbclient/ConnectionService.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java rename to src/main/java/io/kurrent/dbclient/ConnectionService.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java b/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java rename to src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java b/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java rename to src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java b/src/main/java/io/kurrent/dbclient/ConnectionState.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java rename to src/main/java/io/kurrent/dbclient/ConnectionState.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java b/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java rename to src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Consts.java b/src/main/java/io/kurrent/dbclient/Consts.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Consts.java rename to src/main/java/io/kurrent/dbclient/Consts.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java b/src/main/java/io/kurrent/dbclient/ContentType.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java rename to src/main/java/io/kurrent/dbclient/ContentType.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java b/src/main/java/io/kurrent/dbclient/CreateChannel.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java rename to src/main/java/io/kurrent/dbclient/CreateChannel.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java b/src/main/java/io/kurrent/dbclient/CreateProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java rename to src/main/java/io/kurrent/dbclient/CreateProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java b/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java b/src/main/java/io/kurrent/dbclient/CustomAclCodec.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java rename to src/main/java/io/kurrent/dbclient/CustomAclCodec.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java b/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java rename to src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java rename to src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java rename to src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java b/src/main/java/io/kurrent/dbclient/DeleteProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java rename to src/main/java/io/kurrent/dbclient/DeleteProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java b/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java b/src/main/java/io/kurrent/dbclient/DeleteResult.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java rename to src/main/java/io/kurrent/dbclient/DeleteResult.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java b/src/main/java/io/kurrent/dbclient/DeleteStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java rename to src/main/java/io/kurrent/dbclient/DeleteStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java b/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java rename to src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Direction.java b/src/main/java/io/kurrent/dbclient/Direction.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Direction.java rename to src/main/java/io/kurrent/dbclient/Direction.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java b/src/main/java/io/kurrent/dbclient/DisableProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java rename to src/main/java/io/kurrent/dbclient/DisableProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java b/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java b/src/main/java/io/kurrent/dbclient/Discovery.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java rename to src/main/java/io/kurrent/dbclient/Discovery.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java b/src/main/java/io/kurrent/dbclient/EnableProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java rename to src/main/java/io/kurrent/dbclient/EnableProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java b/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventData.java b/src/main/java/io/kurrent/dbclient/EventData.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/EventData.java rename to src/main/java/io/kurrent/dbclient/EventData.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java b/src/main/java/io/kurrent/dbclient/EventDataBuilder.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java rename to src/main/java/io/kurrent/dbclient/EventDataBuilder.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java b/src/main/java/io/kurrent/dbclient/EventFilter.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java rename to src/main/java/io/kurrent/dbclient/EventFilter.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java b/src/main/java/io/kurrent/dbclient/EventTypeFilter.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java rename to src/main/java/io/kurrent/dbclient/EventTypeFilter.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java b/src/main/java/io/kurrent/dbclient/FeatureFlags.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java rename to src/main/java/io/kurrent/dbclient/FeatureFlags.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java b/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java rename to src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java b/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java rename to src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java b/src/main/java/io/kurrent/dbclient/GetProjectionResult.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java rename to src/main/java/io/kurrent/dbclient/GetProjectionResult.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java rename to src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java b/src/main/java/io/kurrent/dbclient/GetProjectionState.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java rename to src/main/java/io/kurrent/dbclient/GetProjectionState.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java rename to src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java rename to src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java rename to src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java rename to src/main/java/io/kurrent/dbclient/GetProjectionStatus.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java rename to src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java b/src/main/java/io/kurrent/dbclient/GossipClient.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java rename to src/main/java/io/kurrent/dbclient/GossipClient.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GrpcClient.java b/src/main/java/io/kurrent/dbclient/GrpcClient.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GrpcClient.java rename to src/main/java/io/kurrent/dbclient/GrpcClient.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GrpcUtils.java b/src/main/java/io/kurrent/dbclient/GrpcUtils.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/GrpcUtils.java rename to src/main/java/io/kurrent/dbclient/GrpcUtils.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java b/src/main/java/io/kurrent/dbclient/HttpUtils.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java rename to src/main/java/io/kurrent/dbclient/HttpUtils.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java b/src/main/java/io/kurrent/dbclient/KurrentDBClient.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java rename to src/main/java/io/kurrent/dbclient/KurrentDBClient.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java b/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java rename to src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java b/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java rename to src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java b/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java rename to src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java b/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java rename to src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java b/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java rename to src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java b/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java rename to src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java b/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java rename to src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java b/src/main/java/io/kurrent/dbclient/ListProjections.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java rename to src/main/java/io/kurrent/dbclient/ListProjections.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java b/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java rename to src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java b/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java rename to src/main/java/io/kurrent/dbclient/ListProjectionsResult.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Msg.java b/src/main/java/io/kurrent/dbclient/Msg.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Msg.java rename to src/main/java/io/kurrent/dbclient/Msg.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java b/src/main/java/io/kurrent/dbclient/NackAction.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java rename to src/main/java/io/kurrent/dbclient/NackAction.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java b/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java rename to src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java b/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java rename to src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java b/src/main/java/io/kurrent/dbclient/NodePreference.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java rename to src/main/java/io/kurrent/dbclient/NodePreference.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java b/src/main/java/io/kurrent/dbclient/NodeSelector.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java rename to src/main/java/io/kurrent/dbclient/NodeSelector.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java b/src/main/java/io/kurrent/dbclient/NotLeaderException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java rename to src/main/java/io/kurrent/dbclient/NotLeaderException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java b/src/main/java/io/kurrent/dbclient/OperationKind.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java rename to src/main/java/io/kurrent/dbclient/OperationKind.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java b/src/main/java/io/kurrent/dbclient/OptionsBase.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java rename to src/main/java/io/kurrent/dbclient/OptionsBase.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java b/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java rename to src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java rename to src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java rename to src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java rename to src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java rename to src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java b/src/main/java/io/kurrent/dbclient/PersistentSubscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Position.java b/src/main/java/io/kurrent/dbclient/Position.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Position.java rename to src/main/java/io/kurrent/dbclient/Position.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java b/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java rename to src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java b/src/main/java/io/kurrent/dbclient/ProjectionDetails.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java rename to src/main/java/io/kurrent/dbclient/ProjectionDetails.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java b/src/main/java/io/kurrent/dbclient/ReadAll.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java rename to src/main/java/io/kurrent/dbclient/ReadAll.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java b/src/main/java/io/kurrent/dbclient/ReadAllOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java rename to src/main/java/io/kurrent/dbclient/ReadAllOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java b/src/main/java/io/kurrent/dbclient/ReadMessage.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java rename to src/main/java/io/kurrent/dbclient/ReadMessage.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java b/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java rename to src/main/java/io/kurrent/dbclient/ReadResponseObserver.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java b/src/main/java/io/kurrent/dbclient/ReadResult.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java rename to src/main/java/io/kurrent/dbclient/ReadResult.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java b/src/main/java/io/kurrent/dbclient/ReadStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java rename to src/main/java/io/kurrent/dbclient/ReadStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java b/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java rename to src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java b/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java rename to src/main/java/io/kurrent/dbclient/ReadStreamOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java b/src/main/java/io/kurrent/dbclient/ReadSubscriber.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java rename to src/main/java/io/kurrent/dbclient/ReadSubscriber.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java b/src/main/java/io/kurrent/dbclient/RecordedEvent.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java rename to src/main/java/io/kurrent/dbclient/RecordedEvent.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java b/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java rename to src/main/java/io/kurrent/dbclient/RegularFilterExpression.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java b/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java rename to src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java b/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java rename to src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java b/src/main/java/io/kurrent/dbclient/ResetProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java rename to src/main/java/io/kurrent/dbclient/ResetProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java b/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java b/src/main/java/io/kurrent/dbclient/ResolvedEvent.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java rename to src/main/java/io/kurrent/dbclient/ResolvedEvent.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java b/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java rename to src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java b/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java rename to src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java b/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java rename to src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java b/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java rename to src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java b/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java rename to src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java b/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java rename to src/main/java/io/kurrent/dbclient/RevisionOrPosition.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java b/src/main/java/io/kurrent/dbclient/RunWorkItem.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java rename to src/main/java/io/kurrent/dbclient/RunWorkItem.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java b/src/main/java/io/kurrent/dbclient/ServerFeatures.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java rename to src/main/java/io/kurrent/dbclient/ServerFeatures.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java b/src/main/java/io/kurrent/dbclient/ServerInfo.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java rename to src/main/java/io/kurrent/dbclient/ServerInfo.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java b/src/main/java/io/kurrent/dbclient/ServerVersion.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java rename to src/main/java/io/kurrent/dbclient/ServerVersion.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java b/src/main/java/io/kurrent/dbclient/Shutdown.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java rename to src/main/java/io/kurrent/dbclient/Shutdown.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java b/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java rename to src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java b/src/main/java/io/kurrent/dbclient/StreamAcl.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java rename to src/main/java/io/kurrent/dbclient/StreamAcl.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java b/src/main/java/io/kurrent/dbclient/StreamConsumer.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java rename to src/main/java/io/kurrent/dbclient/StreamConsumer.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java b/src/main/java/io/kurrent/dbclient/StreamDeletedException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java rename to src/main/java/io/kurrent/dbclient/StreamDeletedException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java b/src/main/java/io/kurrent/dbclient/StreamFilter.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java rename to src/main/java/io/kurrent/dbclient/StreamFilter.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java b/src/main/java/io/kurrent/dbclient/StreamMetadata.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java rename to src/main/java/io/kurrent/dbclient/StreamMetadata.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java b/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java rename to src/main/java/io/kurrent/dbclient/StreamNotFoundException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java b/src/main/java/io/kurrent/dbclient/StreamPosition.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java rename to src/main/java/io/kurrent/dbclient/StreamPosition.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java b/src/main/java/io/kurrent/dbclient/StreamState.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java rename to src/main/java/io/kurrent/dbclient/StreamState.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java b/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java rename to src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java rename to src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java rename to src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java b/src/main/java/io/kurrent/dbclient/SubscribeToAll.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java rename to src/main/java/io/kurrent/dbclient/SubscribeToAll.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java b/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java rename to src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java b/src/main/java/io/kurrent/dbclient/SubscribeToStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java rename to src/main/java/io/kurrent/dbclient/SubscribeToStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java b/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java rename to src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java b/src/main/java/io/kurrent/dbclient/Subscription.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java rename to src/main/java/io/kurrent/dbclient/Subscription.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java b/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java rename to src/main/java/io/kurrent/dbclient/SubscriptionFilter.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java b/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java rename to src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java b/src/main/java/io/kurrent/dbclient/SubscriptionListener.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java rename to src/main/java/io/kurrent/dbclient/SubscriptionListener.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java b/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java rename to src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java b/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java rename to src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java b/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java rename to src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java b/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java rename to src/main/java/io/kurrent/dbclient/SystemStreamAcl.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java b/src/main/java/io/kurrent/dbclient/SystemStreams.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java rename to src/main/java/io/kurrent/dbclient/SystemStreams.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java b/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java rename to src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java b/src/main/java/io/kurrent/dbclient/ThrowingFunction.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java rename to src/main/java/io/kurrent/dbclient/ThrowingFunction.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java b/src/main/java/io/kurrent/dbclient/Tuple.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java rename to src/main/java/io/kurrent/dbclient/Tuple.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java b/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java rename to src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java b/src/main/java/io/kurrent/dbclient/UpdateProjection.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java rename to src/main/java/io/kurrent/dbclient/UpdateProjection.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java b/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java rename to src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java b/src/main/java/io/kurrent/dbclient/UserCredentials.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java rename to src/main/java/io/kurrent/dbclient/UserCredentials.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java b/src/main/java/io/kurrent/dbclient/UserStreamAcl.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java rename to src/main/java/io/kurrent/dbclient/UserStreamAcl.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java b/src/main/java/io/kurrent/dbclient/WorkItem.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java rename to src/main/java/io/kurrent/dbclient/WorkItem.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java b/src/main/java/io/kurrent/dbclient/WorkItemArgs.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java rename to src/main/java/io/kurrent/dbclient/WorkItemArgs.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java b/src/main/java/io/kurrent/dbclient/WriteResult.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java rename to src/main/java/io/kurrent/dbclient/WriteResult.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java b/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java rename to src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java rename to src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java rename to src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java rename to src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java similarity index 100% rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java rename to src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java diff --git a/db-client-java/src/main/proto/code.proto b/src/main/proto/code.proto similarity index 100% rename from db-client-java/src/main/proto/code.proto rename to src/main/proto/code.proto diff --git a/db-client-java/src/main/proto/gossip.proto b/src/main/proto/gossip.proto similarity index 100% rename from db-client-java/src/main/proto/gossip.proto rename to src/main/proto/gossip.proto diff --git a/db-client-java/src/main/proto/persistent.proto b/src/main/proto/persistent.proto similarity index 100% rename from db-client-java/src/main/proto/persistent.proto rename to src/main/proto/persistent.proto diff --git a/db-client-java/src/main/proto/projectionmanagement.proto b/src/main/proto/projectionmanagement.proto similarity index 100% rename from db-client-java/src/main/proto/projectionmanagement.proto rename to src/main/proto/projectionmanagement.proto diff --git a/db-client-java/src/main/proto/serverfeatures.proto b/src/main/proto/serverfeatures.proto similarity index 100% rename from db-client-java/src/main/proto/serverfeatures.proto rename to src/main/proto/serverfeatures.proto diff --git a/db-client-java/src/main/proto/shared.proto b/src/main/proto/shared.proto similarity index 100% rename from db-client-java/src/main/proto/shared.proto rename to src/main/proto/shared.proto diff --git a/db-client-java/src/main/proto/status.proto b/src/main/proto/status.proto similarity index 100% rename from db-client-java/src/main/proto/status.proto rename to src/main/proto/status.proto diff --git a/db-client-java/src/main/proto/streams.proto b/src/main/proto/streams.proto similarity index 100% rename from db-client-java/src/main/proto/streams.proto rename to src/main/proto/streams.proto diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Action.java b/src/test/java/io/kurrent/dbclient/Action.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/Action.java rename to src/test/java/io/kurrent/dbclient/Action.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java b/src/test/java/io/kurrent/dbclient/BazEvent.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java rename to src/test/java/io/kurrent/dbclient/BazEvent.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java b/src/test/java/io/kurrent/dbclient/ClientTracker.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java rename to src/test/java/io/kurrent/dbclient/ClientTracker.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/ConnectionAware.java b/src/test/java/io/kurrent/dbclient/ConnectionAware.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/ConnectionAware.java rename to src/test/java/io/kurrent/dbclient/ConnectionAware.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Database.java b/src/test/java/io/kurrent/dbclient/Database.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/Database.java rename to src/test/java/io/kurrent/dbclient/Database.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java b/src/test/java/io/kurrent/dbclient/DatabaseFactory.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java rename to src/test/java/io/kurrent/dbclient/DatabaseFactory.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java b/src/test/java/io/kurrent/dbclient/Exceptions.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java rename to src/test/java/io/kurrent/dbclient/Exceptions.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Foo.java b/src/test/java/io/kurrent/dbclient/Foo.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/Foo.java rename to src/test/java/io/kurrent/dbclient/Foo.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java b/src/test/java/io/kurrent/dbclient/MiscTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java rename to src/test/java/io/kurrent/dbclient/MiscTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java b/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java rename to src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java b/src/test/java/io/kurrent/dbclient/PluginsTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java rename to src/test/java/io/kurrent/dbclient/PluginsTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java b/src/test/java/io/kurrent/dbclient/StreamsTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java rename to src/test/java/io/kurrent/dbclient/StreamsTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java b/src/test/java/io/kurrent/dbclient/TelemetryTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java rename to src/test/java/io/kurrent/dbclient/TelemetryTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java b/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java rename to src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java b/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java rename to src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java b/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java rename to src/test/java/io/kurrent/dbclient/misc/EventDataTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java b/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java rename to src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java b/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java rename to src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java b/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java rename to src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java b/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java rename to src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java b/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java rename to src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java b/src/test/java/io/kurrent/dbclient/misc/PositionTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java rename to src/test/java/io/kurrent/dbclient/misc/PositionTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java b/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java rename to src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java b/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java rename to src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java b/src/test/java/io/kurrent/dbclient/samples/TestEvent.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java rename to src/test/java/io/kurrent/dbclient/samples/TestEvent.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java b/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java rename to src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java b/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java rename to src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java b/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java rename to src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java b/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java rename to src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java b/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java rename to src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java b/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java rename to src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java b/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java rename to src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java b/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java rename to src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java b/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java rename to src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/AppendTests.java b/src/test/java/io/kurrent/dbclient/streams/AppendTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/AppendTests.java rename to src/test/java/io/kurrent/dbclient/streams/AppendTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java b/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java rename to src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java b/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java rename to src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java b/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java rename to src/test/java/io/kurrent/dbclient/streams/DeleteTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java b/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java rename to src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java b/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java rename to src/test/java/io/kurrent/dbclient/streams/MetadataTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java b/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java rename to src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java b/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java rename to src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java b/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java rename to src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java b/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java rename to src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java b/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java rename to src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java b/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java rename to src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java b/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java similarity index 100% rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java rename to src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java diff --git a/db-client-java/src/test/resources/all-back-c3386-p3386.json b/src/test/resources/all-back-c3386-p3386.json similarity index 100% rename from db-client-java/src/test/resources/all-back-c3386-p3386.json rename to src/test/resources/all-back-c3386-p3386.json diff --git a/db-client-java/src/test/resources/all-back-e0-e10.json b/src/test/resources/all-back-e0-e10.json similarity index 100% rename from db-client-java/src/test/resources/all-back-e0-e10.json rename to src/test/resources/all-back-e0-e10.json diff --git a/db-client-java/src/test/resources/all-c1788-p1788.json b/src/test/resources/all-c1788-p1788.json similarity index 100% rename from db-client-java/src/test/resources/all-c1788-p1788.json rename to src/test/resources/all-c1788-p1788.json diff --git a/db-client-java/src/test/resources/all-e0-e10.json b/src/test/resources/all-e0-e10.json similarity index 100% rename from db-client-java/src/test/resources/all-e0-e10.json rename to src/test/resources/all-e0-e10.json diff --git a/db-client-java/src/test/resources/all-positions-filtered-stream194-e0-e30.json b/src/test/resources/all-positions-filtered-stream194-e0-e30.json similarity index 100% rename from db-client-java/src/test/resources/all-positions-filtered-stream194-e0-e30.json rename to src/test/resources/all-positions-filtered-stream194-e0-e30.json diff --git a/db-client-java/src/test/resources/all-versions-filtered-stream194-e0-e30.json b/src/test/resources/all-versions-filtered-stream194-e0-e30.json similarity index 100% rename from db-client-java/src/test/resources/all-versions-filtered-stream194-e0-e30.json rename to src/test/resources/all-versions-filtered-stream194-e0-e30.json diff --git a/db-client-java/src/test/resources/count-events-partitioned-projection.js b/src/test/resources/count-events-partitioned-projection.js similarity index 100% rename from db-client-java/src/test/resources/count-events-partitioned-projection.js rename to src/test/resources/count-events-partitioned-projection.js diff --git a/db-client-java/src/test/resources/count-events-projection.js b/src/test/resources/count-events-projection.js similarity index 100% rename from db-client-java/src/test/resources/count-events-projection.js rename to src/test/resources/count-events-projection.js diff --git a/db-client-java/src/test/resources/dataset20M-1800-e0-e10.json b/src/test/resources/dataset20M-1800-e0-e10.json similarity index 100% rename from db-client-java/src/test/resources/dataset20M-1800-e0-e10.json rename to src/test/resources/dataset20M-1800-e0-e10.json diff --git a/db-client-java/src/test/resources/dataset20M-1800-e1999-e1990.json b/src/test/resources/dataset20M-1800-e1999-e1990.json similarity index 100% rename from db-client-java/src/test/resources/dataset20M-1800-e1999-e1990.json rename to src/test/resources/dataset20M-1800-e1999-e1990.json diff --git a/db-client-java/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties similarity index 100% rename from db-client-java/src/test/resources/junit-platform.properties rename to src/test/resources/junit-platform.properties diff --git a/db-client-java/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties similarity index 100% rename from db-client-java/src/test/resources/simplelogger.properties rename to src/test/resources/simplelogger.properties diff --git a/db-client-java/src/test/resources/state-with-unknown-keynames.js b/src/test/resources/state-with-unknown-keynames.js similarity index 100% rename from db-client-java/src/test/resources/state-with-unknown-keynames.js rename to src/test/resources/state-with-unknown-keynames.js From 8b28e3ccd315599a5acedb08465bfa43a202238b Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 11:43:35 +0400 Subject: [PATCH 08/21] update settings.gradel --- settings.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 6c704471..64741809 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,5 +7,4 @@ * in the user manual at https://docs.gradle.org/6.6.1/userguide/multi_project_builds.html */ -rootProject.name = 'kurrent-db-client' -include 'db-client-java' +rootProject.name = 'kurrentdb-client' From 7e863393419dd4da26083e40b7d3ef15e2995eff Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 12:13:11 +0400 Subject: [PATCH 09/21] configure releaser --- build.gradle | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/build.gradle b/build.gradle index 1fe2b885..335c9740 100644 --- a/build.gradle +++ b/build.gradle @@ -289,8 +289,35 @@ jreleaser { } } release { + generic { + enabled = true + repoOwner = 'kurrent-io' + name = 'kurrentdb-client' + host = 'https://www.kurrent.io' + username = 'w1am' + token = ENV.JAVA_CLIENT_GH_TOKEN + sign = false + branch = 'release-gradle' + skipRelease = true + skipTag = true + branchPush = '{{projectName}}-{{tagName}}' + } github { enabled = false + repoOwner = 'kurrent-io' + name = 'KurrentDB-Client-Java' + host = 'github.com' + releaseName = '{{tagName}}' + token = ENV.JAVA_CLIENT_GH_TOKEN + sign = true + overwrite = true + artifacts = true + changelog { + enabled = false + formatted = 'ALWAYS' + preset = 'conventional-commits' + extraProperties.put('categorizeScopes', 'true') + } } } } From 9752e320982446193ed4c1a675da51e78360a364 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 12:13:38 +0400 Subject: [PATCH 10/21] bump version to 4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 335c9740..d44c5d72 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ tasks.withType(JavaCompile) { } group = 'io.kurrent' -version = '1.0.0-alpha.3' +version = '1.0.0-alpha.4' archivesBaseName = 'kurrentdb-client' From 0c1902897096a249b8cbbbb89ab551608ec80d9a Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 12:19:30 +0400 Subject: [PATCH 11/21] no upload --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d44c5d72..caf0faab 100644 --- a/build.gradle +++ b/build.gradle @@ -295,12 +295,10 @@ jreleaser { name = 'kurrentdb-client' host = 'https://www.kurrent.io' username = 'w1am' - token = ENV.JAVA_CLIENT_GH_TOKEN sign = false branch = 'release-gradle' skipRelease = true skipTag = true - branchPush = '{{projectName}}-{{tagName}}' } github { enabled = false @@ -320,6 +318,9 @@ jreleaser { } } } + upload { + active = 'NEVER' + } } From 46572fc26e06369721a0f2f68582f5757b8b00c7 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 12:22:38 +0400 Subject: [PATCH 12/21] try using GH_PAT --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d7f7755..b124cc91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,4 +28,5 @@ jobs: JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }} JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }} + JRELEASER_GENERIC_TOKEN: ${{ secrets.GH_PAT }} run: ./gradlew publish jreleaserFullRelease -S From 840c83400abe3354bc0a98953cf0aa45e6b2725c Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 15:12:37 +0400 Subject: [PATCH 13/21] add option to dry run --- .github/workflows/release.yml | 13 ++++++++++++- build.gradle | 16 +++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b124cc91..47677f01 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,12 @@ name: Publish on: workflow_dispatch: + inputs: + dry_run: + description: 'Perform a dry run release' + type: boolean + required: false + default: true jobs: publish: @@ -29,4 +35,9 @@ jobs: JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }} JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }} JRELEASER_GENERIC_TOKEN: ${{ secrets.GH_PAT }} - run: ./gradlew publish jreleaserFullRelease -S + run: | + if [ "${{ inputs.dry_run }}" = "true" ]; then + ./gradlew publish jreleaserFullRelease -S -PdryRun=true + else + ./gradlew publish jreleaserFullRelease -S + fi diff --git a/build.gradle b/build.gradle index caf0faab..a7225e34 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ plugins { } def ENV = System.getenv() +def isDryRunEnabled = (project.hasProperty('dryRun')? project.ext.dryRun: false).toBoolean() repositories { mavenCentral() @@ -24,11 +25,6 @@ tasks.withType(JavaCompile) { options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked'] } -group = 'io.kurrent' -version = '1.0.0-alpha.4' - -archivesBaseName = 'kurrentdb-client' - java { withSourcesJar() withJavadocJar() @@ -221,11 +217,11 @@ publish.mustRunAfter checkVersion publishing { publications { - maven(MavenPublication) { + register('maven', MavenPublication) { groupId = 'io.kurrent' artifactId = 'kurrentdb-client' + version = '1.0.0-alpha.5' - from components.java pom { name = 'KurrentDB gRPC Java client' description = 'KurrentDB gRPC Java client' @@ -261,6 +257,7 @@ publishing { } jreleaser { + dryrun = isDryRunEnabled project { copyright = 'Kurrent, Inc' description = 'Kurrent gRPC Java client' @@ -294,9 +291,6 @@ jreleaser { repoOwner = 'kurrent-io' name = 'kurrentdb-client' host = 'https://www.kurrent.io' - username = 'w1am' - sign = false - branch = 'release-gradle' skipRelease = true skipTag = true } @@ -306,7 +300,7 @@ jreleaser { name = 'KurrentDB-Client-Java' host = 'github.com' releaseName = '{{tagName}}' - token = ENV.JAVA_CLIENT_GH_TOKEN + token = ENV.GH_PAT sign = true overwrite = true artifacts = true From 6ba93cae5708734594582a8cf7ded37ea0fa509d Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 15:22:49 +0400 Subject: [PATCH 14/21] cleanup --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index a7225e34..1e40b23d 100644 --- a/build.gradle +++ b/build.gradle @@ -308,13 +308,9 @@ jreleaser { enabled = false formatted = 'ALWAYS' preset = 'conventional-commits' - extraProperties.put('categorizeScopes', 'true') } } } - upload { - active = 'NEVER' - } } From c1f8a7f8e737a150df193bff9dbfb8979f604135 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 15:26:32 +0400 Subject: [PATCH 15/21] remove dry run --- .github/workflows/release.yml | 13 +------------ build.gradle | 2 -- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47677f01..b124cc91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,12 +2,6 @@ name: Publish on: workflow_dispatch: - inputs: - dry_run: - description: 'Perform a dry run release' - type: boolean - required: false - default: true jobs: publish: @@ -35,9 +29,4 @@ jobs: JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }} JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }} JRELEASER_GENERIC_TOKEN: ${{ secrets.GH_PAT }} - run: | - if [ "${{ inputs.dry_run }}" = "true" ]; then - ./gradlew publish jreleaserFullRelease -S -PdryRun=true - else - ./gradlew publish jreleaserFullRelease -S - fi + run: ./gradlew publish jreleaserFullRelease -S diff --git a/build.gradle b/build.gradle index 1e40b23d..4f1d6c87 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,6 @@ plugins { } def ENV = System.getenv() -def isDryRunEnabled = (project.hasProperty('dryRun')? project.ext.dryRun: false).toBoolean() repositories { mavenCentral() @@ -257,7 +256,6 @@ publishing { } jreleaser { - dryrun = isDryRunEnabled project { copyright = 'Kurrent, Inc' description = 'Kurrent gRPC Java client' From 1d1e4d659f90ccff25b10f0f24bd7b382e04c160 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 15:51:43 +0400 Subject: [PATCH 16/21] add dry run --- .github/workflows/release.yml | 13 ++++++++++++- build.gradle | 13 +++++++++---- gradle.properties | 3 --- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b124cc91..25f08d89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,12 @@ name: Publish on: workflow_dispatch: + inputs: + dry_run: + description: 'Perform a dry run release' + type: boolean + required: false + default: true jobs: publish: @@ -29,4 +35,9 @@ jobs: JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }} JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }} JRELEASER_GENERIC_TOKEN: ${{ secrets.GH_PAT }} - run: ./gradlew publish jreleaserFullRelease -S + run: | + if [ "${{ inputs.dry_run }}" = "true" ]; then + ./gradlew publish jreleaserFullRelease -S --dryrun + else + ./gradlew publish jreleaserFullRelease -S + fi diff --git a/build.gradle b/build.gradle index 4f1d6c87..53cc5334 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,9 @@ tasks.withType(JavaCompile) { options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked'] } +group = 'io.kurrent' +version = '1.0.0-alpha.5' + java { withSourcesJar() withJavadocJar() @@ -216,11 +219,11 @@ publish.mustRunAfter checkVersion publishing { publications { - register('maven', MavenPublication) { + maven(MavenPublication) { groupId = 'io.kurrent' artifactId = 'kurrentdb-client' - version = '1.0.0-alpha.5' + from components.java pom { name = 'KurrentDB gRPC Java client' description = 'KurrentDB gRPC Java client' @@ -289,6 +292,9 @@ jreleaser { repoOwner = 'kurrent-io' name = 'kurrentdb-client' host = 'https://www.kurrent.io' + username = 'w1am' + sign = false + token = ENV.JRELEASER_GENERIC_TOKEN skipRelease = true skipTag = true } @@ -297,8 +303,7 @@ jreleaser { repoOwner = 'kurrent-io' name = 'KurrentDB-Client-Java' host = 'github.com' - releaseName = '{{tagName}}' - token = ENV.GH_PAT + token = ENV.JRELEASER_GENERIC_TOKEN sign = true overwrite = true artifacts = true diff --git a/gradle.properties b/gradle.properties index 2f5f4ae4..ca37c6da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,3 @@ -group=io.kurrent -version=1.0-SNAPSHOT - # Dependencies grpcVersion=1.71.0 protocVersion=4.28.2 From e68b08cb8a899a49dbad7114a270353229b24055 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 15:55:14 +0400 Subject: [PATCH 17/21] trigger on tag release --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 25f08d89..ca5ea0a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,9 @@ name: Publish on: + push: + tags: + - 'release/*' workflow_dispatch: inputs: dry_run: From db7196f4b182e2d5e8f5c2ed61d6b2203c95eebb Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 16:09:43 +0400 Subject: [PATCH 18/21] show dry run in title --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca5ea0a3..2c363d8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ on: jobs: publish: - name: Publish + name: Publish${{ inputs.dry_run && inputs.dry_run == 'true' && ' (dry run)' || '' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From a1e33b8c76f56e70cde1b1241827d773046fed8e Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 16:10:38 +0400 Subject: [PATCH 19/21] remove snapshot workflow --- .github/workflows/snapshot.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/snapshot.yml diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml deleted file mode 100644 index 794ad528..00000000 --- a/.github/workflows/snapshot.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Initiate Snapshot Release - -on: - push: - branches: - - "trunk" - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Perform Release - run: | - curl -X POST https://api.github.com/repos/EventStore/TrainStation/dispatches \ - -H 'Accept: application/vnd.github.everest-preview+json' \ - -u ${{ secrets.GH_PAT }} \ - --data '{"event_type": "java-grpc-client-release", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "version": "snapshot", "target": "trunk" }}' \ No newline at end of file From e14d9d1cdcaf3b27236c4cd0a2b1d22306f8dddd Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 16:51:18 +0400 Subject: [PATCH 20/21] update gradle in tests --- .github/workflows/plugins-tests.yml | 8 ++++---- .github/workflows/pull-requests.yml | 4 ++-- .github/workflows/tests.yml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/plugins-tests.yml b/.github/workflows/plugins-tests.yml index 2883e91e..b9d42291 100644 --- a/.github/workflows/plugins-tests.yml +++ b/.github/workflows/plugins-tests.yml @@ -45,9 +45,9 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: - gradle-version: 7.4 + gradle-version: 8.13 - name: Generate certificates run: | @@ -109,9 +109,9 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: - gradle-version: 7.4 + gradle-version: 8.13 - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 9423717f..0f1e1ec8 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -20,9 +20,9 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: - gradle-version: 7.4 + gradle-version: 8.13 - name: Build run: ./gradlew compileTest diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2f83aeeb..3be3d690 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,9 +37,9 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: - gradle-version: 7.4 + gradle-version: 8.13 - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests @@ -78,9 +78,9 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: - gradle-version: 7.4 + gradle-version: 8.13 - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests @@ -123,9 +123,9 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: - gradle-version: 7.4 + gradle-version: 8.13 - name: Execute Gradle build run: ./gradlew ci --tests ${{ matrix.test }}Tests From c9dfece3671fd074259d91c6e973d12d01140399 Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 27 Mar 2025 16:58:54 +0400 Subject: [PATCH 21/21] update relative path --- build.gradle | 8 ++++---- .../dbclient/databases/DockerContainerDatabase.java | 4 ++-- .../plugins/ClientCertificateAuthenticationTests.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 53cc5334..d37108b7 100644 --- a/build.gradle +++ b/build.gradle @@ -101,22 +101,22 @@ tasks.withType(Test).configureEach { tasks.register("generateCertificates", Exec) { description = "Generates SSL certificates to start a secured ESDB server" - commandLine 'docker', 'compose', '--file', '../configure-tls-for-tests.yml', 'up' + commandLine 'docker', 'compose', '--file', './configure-tls-for-tests.yml', 'up' } tasks.register("generateUserCertificates", Exec) { description = "Generates X.509 certificates for Plugins tests" - commandLine 'docker', 'compose', '--file', '../configure-user-certs-for-tests.yml', 'up' + commandLine 'docker', 'compose', '--file', './configure-user-certs-for-tests.yml', 'up' } tasks.register("startDockerCompose", Exec) { description = "Starts ESDB cluster" - commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'up', '-d' + commandLine 'docker', 'compose', '--file', './docker-compose.yml', 'up', '-d' } tasks.register("stopDockerCompose", Exec) { description = "Stop ESDB cluster" - commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'down' + commandLine 'docker', 'compose', '--file', './docker-compose.yml', 'down' } diff --git a/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java b/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java index 69f84d11..91249a17 100644 --- a/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java +++ b/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java @@ -79,7 +79,7 @@ public DockerContainerDatabase(Builder builder) { if (builder.secure) { verifyCertificatesExist(); - String certsDir = Paths.get(System.getProperty("user.dir"), "..", "certs").toAbsolutePath().toString(); + String certsDir = Paths.get(System.getProperty("user.dir"), "certs").toAbsolutePath().toString(); withEnv("EVENTSTORE_CERTIFICATE_FILE", "/etc/eventstore/certs/node/node.crt"); withEnv("EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE", "/etc/eventstore/certs/node/node.key"); @@ -154,7 +154,7 @@ private static void verifyCertificatesExist() { }; for (String[] strings : files) { - File file = Paths.get(currentDir, "..", "certs", strings[0], strings[1]).toAbsolutePath().toFile(); + File file = Paths.get(currentDir, "certs", strings[0], strings[1]).toAbsolutePath().toFile(); if (!file.exists()) throw new RuntimeException(new FileNotFoundException(file.getAbsolutePath())); diff --git a/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java b/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java index 43438973..bb70dcfe 100644 --- a/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java +++ b/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java @@ -30,7 +30,7 @@ static String userKey(String user) { } static String buildCertPath(String user, String extension) { - String certsPath = Paths.get(System.getProperty("user.dir"), "..", "certs").toAbsolutePath().toString(); + String certsPath = Paths.get(System.getProperty("user.dir"), "certs").toAbsolutePath().toString(); return String.format("%s/user-%s/user-%s.%s", certsPath, user, user, extension); } }