From e0b619ea659c9961628be185b4155878a3caacc1 Mon Sep 17 00:00:00 2001 From: Mukesh SB Date: Tue, 27 Feb 2024 10:15:36 +0530 Subject: [PATCH 01/29] reds_reverting_changes (#817) --- .../event/db/astyanax/AstyanaxEventReaderDAO.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java index 1bc4fa7d04..81da25eabd 100644 --- a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java +++ b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java @@ -340,19 +340,13 @@ public void readNewer(String channel, EventSink sink) { */ private Iterator> readManifestForChannel(final String channel, final boolean weak) { final ByteBuffer oldestSlab = weak ? _oldestSlab.getIfPresent(channel) : null; - ConsistencyLevel consistency = ConsistencyLevel.CL_LOCAL_ONE ;//CL_LOCAL_QUORUM;; - + final ConsistencyLevel consistency; RangeBuilder range = new RangeBuilder().setLimit(50); if (oldestSlab != null) { range.setStart(oldestSlab); + consistency = ConsistencyLevel.CL_LOCAL_ONE; } else { - - try{ - String _sysConsistency = System.getProperty("read-consistency"); - consistency = ConsistencyLevel.valueOf(_sysConsistency); - } catch(Exception e){ - _log.debug("encountered exception while parsing ", e); - } + consistency = ConsistencyLevel.CL_LOCAL_QUORUM; } final Iterator> manifestColumns = executePaginated( @@ -405,7 +399,7 @@ private boolean readSlab(String channel, ByteBuffer slabId, SlabCursor cursor, b // Using a lower consistency level could result in (a) duplicate events because we miss deletes and (b) // incorrectly closing or deleting slabs when slabs look empty if we miss adds. ColumnList eventColumns = execute( - _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_LOCAL_ONE) + _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_LOCAL_QUORUM) .getKey(slabId) .withColumnRange(start, Constants.OPEN_SLAB_MARKER, false, Integer.MAX_VALUE)); From fa5d3c99a8704752c2e84c3eb1605d0a5cb45bb3 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 27 Feb 2024 05:11:25 +0000 Subject: [PATCH 02/29] branch admin -prepare release emodb-6.5.83 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index cd25b938d9..c7b5552479 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 00dc2daf90..9512e373ef 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index b77a35ce64..bb5f7bbca0 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 0006f8b9ee..934b19533b 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.73-SNAPSHOT + 6.5.83 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 1cc4ba5c60..503c77c282 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index d48e6d13e9..8ed016ec03 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 6144b4afe2..961683774e 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index ce4b3c3ded..aa93e54fd0 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index f209cea25a..43093b8bb6 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index cda67495df..ff0bc3996d 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index b34ae5d090..6ab253b4b9 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index cbd8ebeed1..64485595e7 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 98d071a55b..e26a9afbcd 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 511827d5a5..10fa95cb50 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 311a93bcd3..5751a9569b 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 8c1aee83ce..d405c73f7e 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 5dd6c2a262..5c30029d94 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 109abc0e57..a7f4e90cb5 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 7cfbd99770..ef0efdd011 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index fa181420d0..a677aea68d 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index f602070217..90c7c4b25f 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index d120f55377..5a9e4efd3b 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index c10392f64a..bcae9b8ebc 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index ad86d5d999..da5a365ffa 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 7d48461885..146c2f2d97 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 3a9a4d5bc1..97ceab83a7 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index ac1f44f601..c492a082a6 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index d374885974..d312bb1162 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index c9cab6ae8c..532427da22 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index fc61fdca9a..e3d10f2254 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index bdfde87aef..526d0c12d8 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index cbc20654d0..f13a560b56 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 4fabed7981..e33c501d42 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.70 + emodb-6.5.83 diff --git a/plugins/pom.xml b/plugins/pom.xml index ab19fa8d8a..a362bcee48 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 2d1a7478de..6d7d044a1f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.70 + emodb-6.5.83 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index f532161691..8f2df50f05 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 8a14ebd8ee..0bbf403c99 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 5e08630328..6d01482732 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 638880549d..0267bfa0ea 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 1cadc9d8e0..024815e46c 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index f3b01d71e5..72cd4b63c2 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index c2d47e855b..a83b3db630 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index d646097d3b..0d00d9f8f5 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 7888699c32..cdf4c211d7 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 30389fd75f..60004f51f5 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 406e66feed..3e8fa1f68f 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 8e2ce4803e..f197ffde45 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 18b6158eab..f4f173c414 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 3179fd7ab6..c4c290cedd 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 70fe6fade6..4185e6ec21 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index a718815649..6abfc26a28 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 936a2ee1dc..2a6d18ee67 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 5b20530fd1..01f82d2dc8 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 150e019232..816b65e53d 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 9a16eee509..f6ab5abb50 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.73-SNAPSHOT + 6.5.83 ../parent/pom.xml From 240a93db8154035e33ae2a8689572815386e5640 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 27 Feb 2024 05:11:26 +0000 Subject: [PATCH 03/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index c7b5552479..9d344949af 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 9512e373ef..972794bb5a 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index bb5f7bbca0..7fa3cd8711 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 934b19533b..c12051a550 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.83 + 6.5.84-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 503c77c282..39c25ee68c 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 8ed016ec03..fee2cff963 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 961683774e..90b4f93c2a 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index aa93e54fd0..05c432d583 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 43093b8bb6..e32cd25908 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index ff0bc3996d..722d465930 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 6ab253b4b9..8927e09c84 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 64485595e7..781d7d0f2c 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index e26a9afbcd..84c3e1d04e 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 10fa95cb50..b9758d2007 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 5751a9569b..6041ba40c9 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index d405c73f7e..e92da97102 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 5c30029d94..edfa323779 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index a7f4e90cb5..102dcd1742 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index ef0efdd011..423702b54e 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index a677aea68d..69ea6a7a8d 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 90c7c4b25f..947858b8ba 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 5a9e4efd3b..8b46311066 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index bcae9b8ebc..a7b8f650fc 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index da5a365ffa..7a796058f7 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 146c2f2d97..a8e60d6db0 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 97ceab83a7..c5cd4679d2 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index c492a082a6..46aea96877 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index d312bb1162..ae4d8c1e5e 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 532427da22..624418cbb5 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index e3d10f2254..b76cb2d6a0 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 526d0c12d8..00b2784e79 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index f13a560b56..969387ab5a 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index e33c501d42..2880adacae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.83 + emodb-6.5.70 diff --git a/plugins/pom.xml b/plugins/pom.xml index a362bcee48..b914be9fdb 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 6d7d044a1f..c1050fb0f4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.83 + emodb-6.5.70 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 8f2df50f05..0e9eafad60 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 0bbf403c99..e19239288d 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 6d01482732..a81ddec761 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 0267bfa0ea..948e7d669b 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 024815e46c..b13c146570 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 72cd4b63c2..a11aa8d7b4 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index a83b3db630..95e7d27a3d 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 0d00d9f8f5..436d0e627d 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index cdf4c211d7..e805413fcb 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 60004f51f5..c1d910f199 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 3e8fa1f68f..79c34b245e 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index f197ffde45..e54e1de99c 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index f4f173c414..5499b04202 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index c4c290cedd..9c42dfd21e 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 4185e6ec21..7966663fe0 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 6abfc26a28..162b42c53f 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 2a6d18ee67..150342fd8d 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 01f82d2dc8..d138a96e92 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 816b65e53d..cbe776b28a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index f6ab5abb50..e55f289e73 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.83 + 6.5.84-SNAPSHOT ../parent/pom.xml From 3a178789c71659b2de9b12a3c338a86d65130817 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 4 Mar 2024 07:33:25 +0000 Subject: [PATCH 04/29] branch admin -prepare release emodb-6.5.84 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 9d344949af..9738113f10 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 972794bb5a..99b706d0aa 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 7fa3cd8711..4e1649c239 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index c12051a550..0ed6cef63e 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.84-SNAPSHOT + 6.5.84 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 39c25ee68c..2c67b37be9 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index fee2cff963..6e50fe5c8f 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 90b4f93c2a..50515f4be9 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 05c432d583..3e34b56155 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index e32cd25908..b738dcedcd 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 722d465930..d84335865f 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 8927e09c84..5a8372b42c 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 781d7d0f2c..27931a342c 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 84c3e1d04e..edb8a755a5 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index b9758d2007..8d116dc137 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 6041ba40c9..32410ab92a 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index e92da97102..97064b4aa5 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index edfa323779..27953c95ab 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 102dcd1742..c9ca80edb2 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 423702b54e..d71fb596e7 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 69ea6a7a8d..a596d54d4d 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 947858b8ba..44b8bceb1e 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 8b46311066..2150a167ac 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index a7b8f650fc..abea8c4d02 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 7a796058f7..7ce6610765 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index a8e60d6db0..87b540812e 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index c5cd4679d2..40614a4167 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 46aea96877..c993c71bbb 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index ae4d8c1e5e..d2df675fe2 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 624418cbb5..3cb4aad405 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index b76cb2d6a0..d31998ebe2 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 00b2784e79..8cdec940a5 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 969387ab5a..595dc2ec3f 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 2880adacae..e5b88db850 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.70 + emodb-6.5.84 diff --git a/plugins/pom.xml b/plugins/pom.xml index b914be9fdb..d027e86d1b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index c1050fb0f4..20658c2838 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.70 + emodb-6.5.84 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 0e9eafad60..1d80de351c 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index e19239288d..150aa80f09 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index a81ddec761..a45657b3e9 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 948e7d669b..c5feb41e5e 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index b13c146570..900f316ad8 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index a11aa8d7b4..108435e96c 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 95e7d27a3d..c7d3f22e12 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 436d0e627d..dd3f0d5ea4 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index e805413fcb..d32aca24bf 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index c1d910f199..d1e41fcaf5 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 79c34b245e..2271281b41 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index e54e1de99c..bf7cc9a5d6 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 5499b04202..840082e9a0 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 9c42dfd21e..1429985d03 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 7966663fe0..5d53c836d0 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 162b42c53f..167b17f2fb 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 150342fd8d..868d6098e2 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index d138a96e92..ea15a9b63b 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index cbe776b28a..dc08d0e51a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index e55f289e73..dc19ab108c 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84-SNAPSHOT + 6.5.84 ../parent/pom.xml From e59d42b64a66c657a2937d712069c3ad7950305a Mon Sep 17 00:00:00 2001 From: mukeshsbbv Date: Tue, 5 Mar 2024 10:35:38 +0530 Subject: [PATCH 05/29] updated to CLTWO --- .../emodb/event/db/astyanax/AstyanaxEventReaderDAO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java index 81da25eabd..b66a46d413 100644 --- a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java +++ b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java @@ -346,7 +346,7 @@ private Iterator> readManifestForChannel(final String channel range.setStart(oldestSlab); consistency = ConsistencyLevel.CL_LOCAL_ONE; } else { - consistency = ConsistencyLevel.CL_LOCAL_QUORUM; + consistency = ConsistencyLevel.CL_TWO; } final Iterator> manifestColumns = executePaginated( @@ -399,7 +399,7 @@ private boolean readSlab(String channel, ByteBuffer slabId, SlabCursor cursor, b // Using a lower consistency level could result in (a) duplicate events because we miss deletes and (b) // incorrectly closing or deleting slabs when slabs look empty if we miss adds. ColumnList eventColumns = execute( - _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_LOCAL_QUORUM) + _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_TWO) .getKey(slabId) .withColumnRange(start, Constants.OPEN_SLAB_MARKER, false, Integer.MAX_VALUE)); From 9ba296c5730dbac5b469feb7525e33360b83a836 Mon Sep 17 00:00:00 2001 From: Mukesh SB Date: Tue, 5 Mar 2024 11:00:43 +0530 Subject: [PATCH 06/29] 5xx Exceptions: Updating CL_LOCAL_QUORUM to CL_TWO (#820) * updatedcltwo_final * updatedcltwo_final_consistency --- .../event/db/astyanax/AstyanaxEventReaderDAO.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java index b66a46d413..0304af2ded 100644 --- a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java +++ b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java @@ -341,12 +341,14 @@ public void readNewer(String channel, EventSink sink) { private Iterator> readManifestForChannel(final String channel, final boolean weak) { final ByteBuffer oldestSlab = weak ? _oldestSlab.getIfPresent(channel) : null; final ConsistencyLevel consistency; + RangeBuilder range = new RangeBuilder().setLimit(50); + if (oldestSlab != null) { range.setStart(oldestSlab); - consistency = ConsistencyLevel.CL_LOCAL_ONE; + consistency = ConsistencyLevel.CL_LOCAL_ONE; } else { - consistency = ConsistencyLevel.CL_TWO; + consistency = ConsistencyLevel.CL_TWO; } final Iterator> manifestColumns = executePaginated( @@ -398,8 +400,11 @@ private boolean readSlab(String channel, ByteBuffer slabId, SlabCursor cursor, b // Event add and delete write with local quorum, so read with local quorum to get a consistent view of things. // Using a lower consistency level could result in (a) duplicate events because we miss deletes and (b) // incorrectly closing or deleting slabs when slabs look empty if we miss adds. + + ColumnList eventColumns = execute( - _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_TWO) + + _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_TWO) .getKey(slabId) .withColumnRange(start, Constants.OPEN_SLAB_MARKER, false, Integer.MAX_VALUE)); From ed01731654bc3c4e9b0d234dd6de208030005c81 Mon Sep 17 00:00:00 2001 From: Mukesh SB Date: Tue, 5 Mar 2024 12:16:39 +0530 Subject: [PATCH 07/29] Update Snapshot Version for Read Consistency Changes (#821) * updatedcltwo_final * updatedcltwo_final_consistency * snapshot_update --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 9738113f10..c8714922ef 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 99b706d0aa..ac5abf33ce 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 4e1649c239..967420d25a 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 0ed6cef63e..fdbd2eb28e 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.84 + 6.5.98-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 2c67b37be9..a3efcd1b02 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 6e50fe5c8f..6f0659f610 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 50515f4be9..61c92db661 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 3e34b56155..a9de6dc3df 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index b738dcedcd..c727ea2c35 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index d84335865f..f5ac2d7a90 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 5a8372b42c..967be31159 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 27931a342c..f27c217b9f 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index edb8a755a5..4c62244e2b 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 8d116dc137..989981742f 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 32410ab92a..f000bac17a 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 97064b4aa5..9f542b3140 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 27953c95ab..9ca99fff82 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index c9ca80edb2..9828bd338e 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index d71fb596e7..d8f552c9ad 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index a596d54d4d..8da5b649a6 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 44b8bceb1e..662595eb6d 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 2150a167ac..e2c76d257d 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index abea8c4d02..19a247ef96 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 7ce6610765..6965853b43 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 87b540812e..13c375f4cd 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 40614a4167..ac52bfcdee 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index c993c71bbb..81299fa5b2 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index d2df675fe2..d2e860d71d 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 3cb4aad405..3d52f0b615 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index d31998ebe2..49c2a387e1 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 8cdec940a5..c95d66223a 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 595dc2ec3f..c8aa2049fa 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index e5b88db850..849fae964f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.84 + emodb-6.5.98 diff --git a/plugins/pom.xml b/plugins/pom.xml index d027e86d1b..c66a7263bf 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 20658c2838..843912ec02 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.84 + emodb-6.5.98 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 1d80de351c..4b9cde65d3 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 150aa80f09..1ab8ad8fdb 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index a45657b3e9..c094cd0b90 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index c5feb41e5e..5ba434749f 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 900f316ad8..2a78eb79cb 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 108435e96c..30f7a24248 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index c7d3f22e12..e455b18085 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index dd3f0d5ea4..6c5549e12f 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index d32aca24bf..5d446fa14a 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index d1e41fcaf5..26cd328507 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 2271281b41..4ba1a8ca8f 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index bf7cc9a5d6..fc6ecdb2c4 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 840082e9a0..50d1f306e9 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 1429985d03..00f813dbc8 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 5d53c836d0..dc79466f5d 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 167b17f2fb..0b2163b414 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 868d6098e2..a8c88e4686 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index ea15a9b63b..fb4b28c872 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index dc08d0e51a..ae797446c7 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index dc19ab108c..d91432805a 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.84 + 6.5.98-SNAPSHOT ../parent/pom.xml From d8ca339284eab6a18701e929a572e75e7df17db2 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 5 Mar 2024 07:02:40 +0000 Subject: [PATCH 08/29] branch admin -prepare release emodb-6.5.98 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index c8714922ef..5a6d6df6bc 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index ac5abf33ce..73bc669d15 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 967420d25a..fd06e2a04f 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index fdbd2eb28e..a26af24049 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.98-SNAPSHOT + 6.5.98 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index a3efcd1b02..61228f735e 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 6f0659f610..e607bf0e99 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 61c92db661..f9e3627794 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index a9de6dc3df..d6695d3ff0 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index c727ea2c35..b69f5987e1 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index f5ac2d7a90..18f2563d2f 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 967be31159..5a8bdb3d8c 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index f27c217b9f..5c05048609 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 4c62244e2b..94c2cc2db2 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 989981742f..d0b971504e 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index f000bac17a..c25b2842c7 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 9f542b3140..d74f79a72e 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 9ca99fff82..5338098182 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 9828bd338e..e1a4f32a15 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index d8f552c9ad..d8d9dfb112 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 8da5b649a6..37d2d06d1e 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 662595eb6d..e7082c73cf 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index e2c76d257d..dc1598eafb 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 19a247ef96..e6f7d31979 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 6965853b43..38defa0469 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 13c375f4cd..381a8c01ec 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index ac52bfcdee..1add2f8658 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 81299fa5b2..b92bdb436b 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index d2e860d71d..0f078d1846 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 3d52f0b615..25f77e20e5 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 49c2a387e1..fb505b7c5a 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index c95d66223a..80d3fbe21e 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index c8aa2049fa..8f44934ad0 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 849fae964f..1c95c3fa71 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index c66a7263bf..6d15a254b2 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 843912ec02..6cef7a0109 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 4b9cde65d3..04878b22cb 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 1ab8ad8fdb..eff121b1cf 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index c094cd0b90..09bd829372 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 5ba434749f..7687c5b878 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 2a78eb79cb..030d702484 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 30f7a24248..69e06c030f 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index e455b18085..8d744e5d36 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 6c5549e12f..ff2e68448c 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 5d446fa14a..f11f699376 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 26cd328507..4d47343694 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 4ba1a8ca8f..f330d54db2 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index fc6ecdb2c4..2b85886589 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 50d1f306e9..4ed9e49418 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 00f813dbc8..58d65f01b8 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index dc79466f5d..05c74f0cbc 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 0b2163b414..9bef8105ce 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index a8c88e4686..2e0cb62c77 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index fb4b28c872..160b4cf608 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index ae797446c7..67d7c11975 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index d91432805a..1cca1f735e 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98-SNAPSHOT + 6.5.98 ../parent/pom.xml From e8a81109144c80b965a148599619e47faa7697bb Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 5 Mar 2024 07:02:42 +0000 Subject: [PATCH 09/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 5a6d6df6bc..d1fe1d628b 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 73bc669d15..488c18d3fc 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index fd06e2a04f..f0db9a0069 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index a26af24049..606770549b 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.98 + 6.5.99-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 61228f735e..4dba421be4 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index e607bf0e99..1a80943204 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index f9e3627794..3b8ee62c45 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index d6695d3ff0..31b5bc4172 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index b69f5987e1..d170f72972 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 18f2563d2f..8a23a9bd93 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 5a8bdb3d8c..b34fcbda9e 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 5c05048609..cf2c203bf7 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 94c2cc2db2..60f12f9493 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index d0b971504e..b80bf0d9a4 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index c25b2842c7..fdb94ee382 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index d74f79a72e..e803b89b3e 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 5338098182..feed782f29 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index e1a4f32a15..bbcaba2d59 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index d8d9dfb112..b07407d584 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 37d2d06d1e..d87d3c81d1 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index e7082c73cf..7b1a69441a 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index dc1598eafb..260030726a 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index e6f7d31979..6604937db9 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 38defa0469..25785cf40e 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 381a8c01ec..adce0604cb 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 1add2f8658..903e4dd1e0 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index b92bdb436b..14fb94daa4 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 0f078d1846..1bc2b760f2 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 25f77e20e5..23f86bf374 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index fb505b7c5a..3a081d964e 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 80d3fbe21e..74a199dcc8 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 8f44934ad0..d374fbcfaa 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 1c95c3fa71..c7b1717674 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 6d15a254b2..56e67aa0f8 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 6cef7a0109..8a3b239c5c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 04878b22cb..a1257fbb22 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index eff121b1cf..0ff7939ba4 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 09bd829372..cff524d9ea 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 7687c5b878..9c135b2abc 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 030d702484..ffe34e870a 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 69e06c030f..b35de1c0b9 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 8d744e5d36..f5ccd39a9c 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index ff2e68448c..ddf82fa093 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index f11f699376..477a3aaf46 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 4d47343694..786f96dfd9 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index f330d54db2..512f3a6638 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 2b85886589..449b21e2f6 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 4ed9e49418..3db802454d 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 58d65f01b8..10e83d5606 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 05c74f0cbc..230ca6581e 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 9bef8105ce..4c8572f216 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 2e0cb62c77..44bf7e7195 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 160b4cf608..e36a026c32 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 67d7c11975..a0ac0a3ace 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 1cca1f735e..3c4044ea11 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.98 + 6.5.99-SNAPSHOT ../parent/pom.xml From d3bacb985df6b110c22c0e719b27331d07fc26b0 Mon Sep 17 00:00:00 2001 From: Ravi Verma Date: Wed, 13 Mar 2024 16:22:56 +0530 Subject: [PATCH 10/29] Reverted CL_Local_quorum changes (#822) --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- .../emodb/event/db/astyanax/AstyanaxEventReaderDAO.java | 4 ++-- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 56 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index d1fe1d628b..bcc5a250e6 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 488c18d3fc..6212316477 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index f0db9a0069..44f4add52f 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 606770549b..c91aaae0da 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 4dba421be4..0fcf9fd3c6 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 1a80943204..67068f6df4 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 3b8ee62c45..8644738081 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 31b5bc4172..e0563b2391 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index d170f72972..aca98b9b3a 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 8a23a9bd93..3079cdd4eb 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index b34fcbda9e..389dc95c1a 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index cf2c203bf7..9c2a5b81f1 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 60f12f9493..ccc6949e07 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index b80bf0d9a4..3a9f37619f 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index fdb94ee382..4ab7e8862a 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index e803b89b3e..185d321577 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index feed782f29..57744b0437 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index bbcaba2d59..89dfbdd139 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index b07407d584..71b5eabcf5 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index d87d3c81d1..d7a3ecec4e 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 7b1a69441a..8ab3d14989 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 260030726a..45087dcb3e 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 6604937db9..6caa548ffb 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 25785cf40e..31d04f9fc9 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index adce0604cb..ad20532140 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 903e4dd1e0..a6940ec28d 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 14fb94daa4..edf7e39519 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 1bc2b760f2..6ce2674601 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java index 0304af2ded..78eca8e7ea 100644 --- a/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java +++ b/event/src/main/java/com/bazaarvoice/emodb/event/db/astyanax/AstyanaxEventReaderDAO.java @@ -348,7 +348,7 @@ private Iterator> readManifestForChannel(final String channel range.setStart(oldestSlab); consistency = ConsistencyLevel.CL_LOCAL_ONE; } else { - consistency = ConsistencyLevel.CL_TWO; + consistency = ConsistencyLevel.CL_LOCAL_QUORUM; } final Iterator> manifestColumns = executePaginated( @@ -404,7 +404,7 @@ private boolean readSlab(String channel, ByteBuffer slabId, SlabCursor cursor, b ColumnList eventColumns = execute( - _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_TWO) + _keyspace.prepareQuery(ColumnFamilies.SLAB, ConsistencyLevel.CL_LOCAL_QUORUM) .getKey(slabId) .withColumnRange(start, Constants.OPEN_SLAB_MARKER, false, Integer.MAX_VALUE)); diff --git a/job-api/pom.xml b/job-api/pom.xml index 23f86bf374..4a8e28ec75 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 3a081d964e..3fc0278b59 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 74a199dcc8..79b050d326 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index d374fbcfaa..f846fbec1e 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index c7b1717674..415d9b308c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 56e67aa0f8..6014dbe1c5 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 8a3b239c5c..fb4df1a11f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index a1257fbb22..10fa15c77e 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 0ff7939ba4..baaf396eff 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index cff524d9ea..c13c8fa4c1 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 9c135b2abc..2f5508e8fa 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index ffe34e870a..2e38f3e4bb 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index b35de1c0b9..e148fc91e0 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index f5ccd39a9c..5cb1362617 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index ddf82fa093..b7492b0208 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 477a3aaf46..c6e756a445 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 786f96dfd9..2dd58f993c 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 512f3a6638..ce2bc89563 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 449b21e2f6..ce94b95990 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 3db802454d..1cbe758085 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 10e83d5606..300c1313c5 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 230ca6581e..7604dfb6e5 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 4c8572f216..566ca56209 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 44bf7e7195..22605cd226 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index e36a026c32..f71053a297 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index a0ac0a3ace..5a55e6f06d 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 3c4044ea11..1a2f115a84 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.99-SNAPSHOT + 6.5.109-SNAPSHOT ../parent/pom.xml From 68545a1a32417644bce217b8f6c201046b8e60fd Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 13 Mar 2024 11:07:52 +0000 Subject: [PATCH 11/29] branch admin -prepare release emodb-6.5.109 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index bcc5a250e6..1e25f20514 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 6212316477..839c20457e 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 44f4add52f..4cf56ff39f 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index c91aaae0da..8ece07fdce 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.109-SNAPSHOT + 6.5.109 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 0fcf9fd3c6..73f8b78778 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 67068f6df4..1e0c48f81c 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 8644738081..be90e44d8f 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index e0563b2391..e2bdc74abc 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index aca98b9b3a..20f4d601f0 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 3079cdd4eb..b4cc8b5b79 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 389dc95c1a..5d97af4043 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 9c2a5b81f1..e048f3318c 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index ccc6949e07..aeb46c8699 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 3a9f37619f..1c45bcbbb4 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 4ab7e8862a..16eeb8a02e 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 185d321577..1773d0a340 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 57744b0437..fa5e383610 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 89dfbdd139..134b470621 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 71b5eabcf5..97042d02d9 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index d7a3ecec4e..1e52c1f684 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 8ab3d14989..38247fb7e1 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 45087dcb3e..50c5e1dd0b 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 6caa548ffb..67c47998b3 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 31d04f9fc9..4e183d761a 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index ad20532140..a36f2321dc 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index a6940ec28d..105d24f6c5 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index edf7e39519..4a6c0a6191 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 6ce2674601..081892f3e2 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 4a8e28ec75..8f58d25508 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 3fc0278b59..5095eab87b 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 79b050d326..90744fe2f1 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index f846fbec1e..6c7db8e46b 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 415d9b308c..abe78ca7ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.109 diff --git a/plugins/pom.xml b/plugins/pom.xml index 6014dbe1c5..8b078bfbea 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index fb4df1a11f..3bc8eaab48 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.109 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 10fa15c77e..edfbe5861a 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index baaf396eff..8959d7dbae 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index c13c8fa4c1..4c3f7b4ffe 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 2f5508e8fa..d4898d540f 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 2e38f3e4bb..1e75f59b4b 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index e148fc91e0..c57da1409c 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 5cb1362617..bbd4c9458a 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index b7492b0208..fdf32d24a9 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index c6e756a445..1cc589d99f 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 2dd58f993c..e92319979d 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index ce2bc89563..d3d9b51c81 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index ce94b95990..c80c23def4 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 1cbe758085..4cae59c877 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 300c1313c5..76bb24a6f4 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 7604dfb6e5..50464b1266 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 566ca56209..001b94c521 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 22605cd226..36e36abba7 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index f71053a297..834e82a8df 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 5a55e6f06d..d1ebce5195 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 1a2f115a84..f16531a3a5 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109-SNAPSHOT + 6.5.109 ../parent/pom.xml From 421fb2023f02dda5b6751132b58adc6c9484ac4e Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 13 Mar 2024 11:07:54 +0000 Subject: [PATCH 12/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 1e25f20514..f2b323b697 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 839c20457e..8057a67f3a 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 4cf56ff39f..a1523d1c62 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 8ece07fdce..8b08f7af59 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.109 + 6.5.110-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 73f8b78778..dbd3d08216 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 1e0c48f81c..d5439d1747 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index be90e44d8f..ea09223f9a 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index e2bdc74abc..4daf28a0d6 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 20f4d601f0..cffc9f00d9 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index b4cc8b5b79..1ecc42fbd6 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 5d97af4043..e0ede1d806 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index e048f3318c..49ab900172 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index aeb46c8699..2d686859a0 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 1c45bcbbb4..6c952f4d56 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 16eeb8a02e..7384f2a7ee 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 1773d0a340..a0d05a0dcd 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index fa5e383610..1fa344f877 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 134b470621..89dee9187f 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 97042d02d9..e54f87ea40 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 1e52c1f684..8b6746cd1e 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 38247fb7e1..31ec3efeb2 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 50c5e1dd0b..692ace6aa2 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 67c47998b3..0a296a1e21 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 4e183d761a..d0cdab5622 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index a36f2321dc..14c46eab89 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 105d24f6c5..445060f51b 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 4a6c0a6191..6cc8658412 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 081892f3e2..b7de478848 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 8f58d25508..cf87204dff 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 5095eab87b..72cba2eedc 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 90744fe2f1..3c3a38c27a 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 6c7db8e46b..e3bd653055 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index abe78ca7ae..4ba9ffb772 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.109 + emodb-6.5.98 diff --git a/plugins/pom.xml b/plugins/pom.xml index 8b078bfbea..842935a045 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 3bc8eaab48..fdaefbce86 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.109 + emodb-6.5.98 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index edfbe5861a..a9f8ca49c0 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 8959d7dbae..8588d4cc20 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 4c3f7b4ffe..9751a33307 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index d4898d540f..f5aefd2bdd 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 1e75f59b4b..d3c6bb1993 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index c57da1409c..5ff2b434f9 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index bbd4c9458a..3b2fe72552 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index fdf32d24a9..224ec7bb5e 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 1cc589d99f..0f815c4d47 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index e92319979d..613d71f9ce 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index d3d9b51c81..3d344f537d 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index c80c23def4..8c7456d12e 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 4cae59c877..8b6c416bd8 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 76bb24a6f4..7e56c09888 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 50464b1266..0feca08aee 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 001b94c521..a20cfeb82c 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 36e36abba7..297fa05a04 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 834e82a8df..a44a629f2f 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index d1ebce5195..14070b58e1 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index f16531a3a5..998c684d61 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.109 + 6.5.110-SNAPSHOT ../parent/pom.xml From c5895a742bdafb955a5fddd52a72cbfb097c59cd Mon Sep 17 00:00:00 2001 From: anandujayan Date: Wed, 22 May 2024 17:12:15 +0530 Subject: [PATCH 13/29] Pd 241513 (#824) * Added document_id as env variable * Test changes * branch admin -prepare release emodb-6.5.134 * branch admin -prepare for next development iteration --------- Co-authored-by: abhyudaya-mohanty_bveng Co-authored-by: jenkins --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- .../emodb_tests_databus_get_claimcount.postman_collection.json | 3 +++ queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 56 files changed, 58 insertions(+), 55 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index f2b323b697..a7ead9a43f 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 8057a67f3a..5e846d17bc 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index a1523d1c62..d7877e8230 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 8b08f7af59..80956c1221 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index dbd3d08216..faec92cb0a 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index d5439d1747..aa21f72dbe 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index ea09223f9a..62a3c2eb22 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 4daf28a0d6..b8e5c96cd0 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index cffc9f00d9..acf9c63dd7 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 1ecc42fbd6..4a8612361c 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index e0ede1d806..73b05b3f66 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 49ab900172..5ea878c225 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 2d686859a0..c5ef3204eb 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 6c952f4d56..d881532de7 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 7384f2a7ee..49a71cdffe 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index a0d05a0dcd..da82378413 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 1fa344f877..354756df5c 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 89dee9187f..8cbda04d1d 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index e54f87ea40..76d7cc3f02 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 8b6746cd1e..c73e794054 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 31ec3efeb2..9c0229a04d 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 692ace6aa2..a9ce5e6033 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 0a296a1e21..33ecd23b5d 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index d0cdab5622..b55f5f8560 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 14c46eab89..145f680cc4 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 445060f51b..31c9619436 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 6cc8658412..82e1b0d6d5 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index b7de478848..71c38cebcc 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index cf87204dff..e802d1d21b 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 72cba2eedc..6b7ec65385 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 3c3a38c27a..d69beace47 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index e3bd653055..ed01f27694 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 4ba9ffb772..8b5be72528 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 842935a045..090e86919e 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index fdaefbce86..5493c5f3c0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index a9f8ca49c0..295c3e2715 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 8588d4cc20..ed9abe8a0d 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/quality/postman/emodb_tests_databus_get_claimcount.postman_collection.json b/quality/postman/emodb_tests_databus_get_claimcount.postman_collection.json index adb4a55a63..17f2da4423 100644 --- a/quality/postman/emodb_tests_databus_get_claimcount.postman_collection.json +++ b/quality/postman/emodb_tests_databus_get_claimcount.postman_collection.json @@ -302,6 +302,9 @@ "listen": "prerequest", "script": { "exec": [ + "var uuid = require('uuid');", + "pm.environment.set('document_id', uuid.v4());", + "", "pm.environment.set(\"audit\", \"comment:'update+data'\");", "pm.environment.set(\"consistency\", \"GLOBAL\");", "pm.environment.set(\"tag\", \"test_tag\");", diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 9751a33307..7ec48b99fa 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index f5aefd2bdd..31cd6b9721 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index d3c6bb1993..346255effc 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 5ff2b434f9..d1165de259 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 3b2fe72552..392e564dee 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 224ec7bb5e..f0f03fcef4 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 0f815c4d47..4bef0a1e33 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 613d71f9ce..604f20fe79 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 3d344f537d..3db6dc5563 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 8c7456d12e..168dde5f27 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 8b6c416bd8..3a90f712ce 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 7e56c09888..c118fe044a 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 0feca08aee..ee51361045 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index a20cfeb82c..742800b67a 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 297fa05a04..2afe2b3cd0 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index a44a629f2f..bb11402e2f 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 14070b58e1..fe5a648b64 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 998c684d61..519907399a 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.110-SNAPSHOT + 6.5.135-SNAPSHOT ../parent/pom.xml From f10a29b58dbdb8a31258534ac57bdea8cc412483 Mon Sep 17 00:00:00 2001 From: anandujayan Date: Wed, 22 May 2024 21:09:22 +0530 Subject: [PATCH 14/29] Snapshot version updated to 136 (#825) --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index a7ead9a43f..0e5501b36e 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 5e846d17bc..689b188694 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index d7877e8230..aca0ce73e0 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 80956c1221..301fbd5782 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index faec92cb0a..65c84a86f3 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index aa21f72dbe..cef44ce029 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 62a3c2eb22..e77fa96834 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index b8e5c96cd0..279be861c5 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index acf9c63dd7..4757c40ed4 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 4a8612361c..6de15cff1f 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 73b05b3f66..2daaed4d39 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 5ea878c225..a67c6a6314 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index c5ef3204eb..a82b584407 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index d881532de7..3e22f20e97 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 49a71cdffe..6494725bf4 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index da82378413..3626ed1797 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 354756df5c..3f46bdaa9d 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 8cbda04d1d..3fcf95f29b 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 76d7cc3f02..3dd9bdef54 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index c73e794054..fddbf32dfa 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 9c0229a04d..15baa181d7 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index a9ce5e6033..64631d84d6 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 33ecd23b5d..48a6deec2a 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index b55f5f8560..ccb455eeae 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 145f680cc4..0d83c71fed 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 31c9619436..bb0124a68d 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 82e1b0d6d5..4d91ada6a7 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 71c38cebcc..eba737663f 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index e802d1d21b..e4c5112fd6 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 6b7ec65385..7e9ca32bd3 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index d69beace47..265e1b7068 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index ed01f27694..4ffb42b915 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 8b5be72528..5d5c8b60fe 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 090e86919e..f467fe9ae8 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 5493c5f3c0..35b8649cc6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 295c3e2715..c5f238aa75 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index ed9abe8a0d..701f06bf8d 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 7ec48b99fa..989faea6b6 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 31cd6b9721..384f8e716c 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 346255effc..2953fc81ed 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index d1165de259..a134dd7d7b 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 392e564dee..edffab2ec9 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index f0f03fcef4..af278c4676 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 4bef0a1e33..5a82ef6139 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 604f20fe79..a70cf12103 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 3db6dc5563..ba8b952266 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 168dde5f27..4f003ae7e6 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 3a90f712ce..999b623c60 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index c118fe044a..2e11948732 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index ee51361045..952bc3ff8a 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 742800b67a..f05e84e84f 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 2afe2b3cd0..98a6a5ad2f 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index bb11402e2f..3e53eb9415 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index fe5a648b64..fd751bc3cc 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 519907399a..3dce2b57bb 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.135-SNAPSHOT + 6.5.136-SNAPSHOT ../parent/pom.xml From 71f294ac25577a13a89aae0f8d7a9644c5d72b26 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 22 May 2024 15:59:14 +0000 Subject: [PATCH 15/29] branch admin -prepare release emodb-6.5.136 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 0e5501b36e..79a4944263 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 689b188694..1728c4b456 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index aca0ce73e0..35d46df1b4 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 301fbd5782..f2f67ec29b 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.136-SNAPSHOT + 6.5.136 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 65c84a86f3..20f401e995 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index cef44ce029..af0ce11da9 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index e77fa96834..b9aeff4c4a 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 279be861c5..51361cfa38 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 4757c40ed4..64f2e28b99 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 6de15cff1f..792757e429 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 2daaed4d39..aac866b72b 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index a67c6a6314..d6ce5ea1cc 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index a82b584407..45e72fca1a 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 3e22f20e97..1a16c8e93e 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 6494725bf4..b1a70830e6 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 3626ed1797..68c086a378 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 3f46bdaa9d..a006034478 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 3fcf95f29b..67bf10135c 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 3dd9bdef54..85b9f4fed5 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index fddbf32dfa..dbef535742 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 15baa181d7..ecb0d5775c 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 64631d84d6..66373d200d 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 48a6deec2a..12d6cef09c 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index ccb455eeae..38ad9bcde5 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 0d83c71fed..252956293c 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index bb0124a68d..5d03bd1b50 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 4d91ada6a7..97b37cef50 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index eba737663f..6a9b50af21 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index e4c5112fd6..3e7e50711b 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 7e9ca32bd3..ed79f00e1b 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 265e1b7068..b45d004593 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 4ffb42b915..0b0082f87b 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 5d5c8b60fe..1a0416d53e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.136 diff --git a/plugins/pom.xml b/plugins/pom.xml index f467fe9ae8..e050d58852 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 35b8649cc6..02264de96b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.136 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index c5f238aa75..cf5a6b0d73 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 701f06bf8d..cd35993785 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 989faea6b6..355865c554 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 384f8e716c..6468661af7 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 2953fc81ed..eb2002b836 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index a134dd7d7b..9f00537b8d 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index edffab2ec9..cbbcb88655 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index af278c4676..e921a5db5a 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 5a82ef6139..e9aba94f96 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index a70cf12103..3b3fa057ae 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index ba8b952266..8bb3a42234 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 4f003ae7e6..f1d3d017a5 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 999b623c60..0d5d8e1782 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 2e11948732..ff3e712a85 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 952bc3ff8a..7e79c03c6f 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index f05e84e84f..fbe129d7a8 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 98a6a5ad2f..419c5ff6d6 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 3e53eb9415..2752be33a1 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index fd751bc3cc..03a86bcfb3 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 3dce2b57bb..3c608e038d 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136-SNAPSHOT + 6.5.136 ../parent/pom.xml From 16992bedc9d508c629dd925c9c619cca2ced78e3 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 22 May 2024 15:59:16 +0000 Subject: [PATCH 16/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 79a4944263..6f3a06071b 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 1728c4b456..c08f2f6720 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 35d46df1b4..81142319a2 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index f2f67ec29b..279a50d398 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.136 + 6.5.137-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 20f401e995..35a35c0aeb 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index af0ce11da9..c1ec96d2dc 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index b9aeff4c4a..b0c1ea3708 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 51361cfa38..1cdfb57fe4 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 64f2e28b99..a1708a21d8 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 792757e429..9babe4ec42 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index aac866b72b..f53395a0c6 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index d6ce5ea1cc..8777312a9d 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 45e72fca1a..3d23a1f6ae 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 1a16c8e93e..418864320d 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index b1a70830e6..02b055e05e 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 68c086a378..da60284420 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index a006034478..383c34fc7c 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 67bf10135c..bc81b37b44 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 85b9f4fed5..f5156109f6 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index dbef535742..5be8c0e596 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index ecb0d5775c..a384f1c439 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 66373d200d..e4787a9ee5 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 12d6cef09c..c7a059ac80 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 38ad9bcde5..9684eb3e6b 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 252956293c..a0135f23dd 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 5d03bd1b50..967f294a7d 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 97b37cef50..c035f2acea 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 6a9b50af21..4022240bd7 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 3e7e50711b..0b1b68a59b 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index ed79f00e1b..d338802efb 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index b45d004593..f4d5659b20 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 0b0082f87b..fab92da47f 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 1a0416d53e..883de31746 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.136 + emodb-6.5.98 diff --git a/plugins/pom.xml b/plugins/pom.xml index e050d58852..e7d926868c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 02264de96b..e8113c23bc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.136 + emodb-6.5.98 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index cf5a6b0d73..20a3679268 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index cd35993785..1d32827010 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 355865c554..1fde08c1ee 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 6468661af7..e4aa043ad4 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index eb2002b836..13179a0946 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 9f00537b8d..5588dfdfb3 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index cbbcb88655..1c7cc1c529 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index e921a5db5a..78c41677e6 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index e9aba94f96..fcfc6f047d 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 3b3fa057ae..037f125c61 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 8bb3a42234..9644da29a2 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index f1d3d017a5..ac59970c76 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 0d5d8e1782..9fe17c5c41 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index ff3e712a85..02564d6929 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 7e79c03c6f..71f0a81c69 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index fbe129d7a8..1a2505d827 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 419c5ff6d6..5a05f632b4 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 2752be33a1..c49edf5432 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 03a86bcfb3..01d608fdcc 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 3c608e038d..865aa886a5 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.136 + 6.5.137-SNAPSHOT ../parent/pom.xml From 3538bbf2e892d68772a6626a306deed3b7ea4754 Mon Sep 17 00:00:00 2001 From: Rishu Yadav Date: Mon, 19 Aug 2024 14:04:31 +0530 Subject: [PATCH 17/29] SQS integration in blob and metrics for queue service migration prerequisite (#829) * feat: integrate sqs to blob service * Create an sqs service to send messages to sqs * Send all the incoming PUT and DELETE request to sqs * feat: inlcude functionality to store encoded blob in sqs * Convert the incoming blob to bytearray, encode it and send it to sqs * Handle the incoming api request of PUT blob object * Send the attributes and object to sqs * feat: restructure the queue intialization following better architecture * Create interface for queue, so can include multiple implementations * Follow lose coupling * Use a factory method for sqs initialization * PD-239427 fix: fix logging and simplified factory * feat: include params required for iss, send to sqs and update queue name * Include queue url param to be sent to sqs * Update the queue name * Update the factory as per the required changes * update: update tags for deployment * branch admin -prepare release emodb-6.5.135 * branch admin -prepare for next development iteration * update: add fifo queue for blobstore migration and tag changes * branch admin -prepare release emodb-6.5.144 * branch admin -prepare for next development iteration * fix: remove sending of bytecode to sqs * For large files , bytecode is too huge to be sent to sqs * Send request url instead of bytecode * feat: add custom exceptions * handle exceptions in a robust way * add digestbytes to sqs * chore: add tags skip sonatype for deployment * branch admin -prepare release emodb-6.5.159 * branch admin -prepare for next development iteration * fix: add back sonatype dependency * branch admin -prepare release emodb-6.5.160 * branch admin -prepare for next development iteration * Removed bytearray in sqs put * Update MessagingService.java for removing byte * Update SQSService.java * branch admin -prepare release emodb-6.5.161 * branch admin -prepare for next development iteration * skipping nexus plugin for testing --parent.pom * branch admin -prepare release emodb-6.5.162 * branch admin -prepare for next development iteration * add metrics to Queue poll * branch admin -prepare release emodb-6.5.163 * branch admin -prepare for next development iteration * update pom version * branch admin -prepare release emodb-6.5.165 * branch admin -prepare for next development iteration * branch admin -prepare release emodb-6.5.166 * branch admin -prepare for next development iteration * feat: add poll metrics for dedupq * feat: add send count metrics * fix: add metrics for sendBatch * udate: update tags from 167 to 168 * fix: fix the compilation issue remove metricregistry from constructor * branch admin -prepare release emodb-6.5.168 * branch admin -prepare for next development iteration * chore: update tags from 168 to 169 * branch admin -prepare release emodb-6.5.169 * branch admin -prepare for next development iteration * fix: fix the metric tag name issue * branch admin -prepare release emodb-6.5.170 * branch admin -prepare for next development iteration --------- Co-authored-by: jenkins Co-authored-by: anandujayan Co-authored-by: ReddyAnand-BV Co-authored-by: Nabajyoti Dash --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 8 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- .../queue/DedupQueueJerseyTest.java | 3 +- .../integration/queue/QueueJerseyTest.java | 3 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- .../queue/core/AbstractQueueService.java | 30 +++- .../queue/core/DefaultDedupQueueService.java | 5 +- .../emodb/queue/core/DefaultQueueService.java | 5 +- .../emodb/queue/core/SizeQueueCacheTest.java | 3 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- .../com/bazaarvoice/emodb/web/EmoService.java | 4 +- .../resources/blob/BlobStoreResource1.java | 124 +++++++++++----- .../blob/messageQueue/MessagingService.java | 21 +++ .../messageQueue/SQSMessageException.java | 7 + .../blob/messageQueue/SQSService.java | 136 ++++++++++++++++++ .../blob/messageQueue/SQSServiceFactory.java | 12 ++ .../resources/queue/DedupQueueResource1.java | 37 ++++- .../web/resources/queue/QueueResource1.java | 47 +++++- yum/pom.xml | 2 +- 69 files changed, 440 insertions(+), 113 deletions(-) create mode 100644 web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/MessagingService.java create mode 100644 web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSMessageException.java create mode 100644 web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSService.java create mode 100644 web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSServiceFactory.java diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 6f3a06071b..14e80f2c35 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index c08f2f6720..257be185db 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 81142319a2..3b9531494e 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 279a50d398..fe30721176 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 35a35c0aeb..85123d5a42 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index c1ec96d2dc..2551dd9b1f 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index b0c1ea3708..1469a20558 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 1cdfb57fe4..8eb86f2ce1 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index a1708a21d8..e4396c74cf 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 9babe4ec42..c05b60ea79 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index f53395a0c6..b8892b6428 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 8777312a9d..b6eff20acf 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 3d23a1f6ae..1f2e6db668 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 418864320d..1a6fe97c68 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 02b055e05e..640eeb51a0 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index da60284420..8bb610aba2 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 383c34fc7c..aa9d419736 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index bc81b37b44..917adb1936 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index f5156109f6..bb9f0e5b7b 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 5be8c0e596..69c7151265 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index a384f1c439..02e713b07c 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index e4787a9ee5..27ef872a85 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index c7a059ac80..5af9b9d379 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 9684eb3e6b..7c2794e645 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index a0135f23dd..46b1d8c25d 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 967f294a7d..e966f653bb 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index c035f2acea..d0582217b8 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 4022240bd7..8e3cd03e8b 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 0b1b68a59b..8ac8b8687e 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index d338802efb..e4a44a41d2 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index f4d5659b20..b553098418 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index fab92da47f..2c91fd1561 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 883de31746..27d58c9133 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT pom EmoDB Parent @@ -882,7 +882,7 @@ - + org.apache.maven.plugins maven-dependency-plugin @@ -904,7 +904,7 @@ analyze-only - true + false true com.fasterxml.jackson.datatype:jackson-datatype-joda diff --git a/plugins/pom.xml b/plugins/pom.xml index e7d926868c..e67d3d650d 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index e8113c23bc..5f048e3d7b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 20a3679268..f2fca66aa4 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../../parent/pom.xml diff --git a/quality/integration/src/test/java/test/integration/queue/DedupQueueJerseyTest.java b/quality/integration/src/test/java/test/integration/queue/DedupQueueJerseyTest.java index 294f0e75da..0bb6adce72 100644 --- a/quality/integration/src/test/java/test/integration/queue/DedupQueueJerseyTest.java +++ b/quality/integration/src/test/java/test/integration/queue/DedupQueueJerseyTest.java @@ -16,6 +16,7 @@ import com.bazaarvoice.ostrich.PartitionContextBuilder; import com.bazaarvoice.ostrich.pool.OstrichAccessors; import com.bazaarvoice.ostrich.pool.PartitionContextValidator; +import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; @@ -56,7 +57,7 @@ public class DedupQueueJerseyTest extends ResourceTest { @Rule public ResourceTestRule _resourceTestRule = setupResourceTestRule( - Collections.singletonList(new DedupQueueResource1(_server, DedupQueueServiceAuthenticator.proxied(_proxy))), + Collections.singletonList(new DedupQueueResource1(_server, DedupQueueServiceAuthenticator.proxied(_proxy), new MetricRegistry())), ImmutableMap.of( APIKEY_QUEUE, new ApiKey("queue", ImmutableSet.of("queue-role")), APIKEY_UNAUTHORIZED, new ApiKey("unauth", ImmutableSet.of("unauthorized-role"))), diff --git a/quality/integration/src/test/java/test/integration/queue/QueueJerseyTest.java b/quality/integration/src/test/java/test/integration/queue/QueueJerseyTest.java index 82a6f1108d..d7e344ca44 100644 --- a/quality/integration/src/test/java/test/integration/queue/QueueJerseyTest.java +++ b/quality/integration/src/test/java/test/integration/queue/QueueJerseyTest.java @@ -16,6 +16,7 @@ import com.bazaarvoice.ostrich.PartitionContextBuilder; import com.bazaarvoice.ostrich.pool.OstrichAccessors; import com.bazaarvoice.ostrich.pool.PartitionContextValidator; +import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; @@ -56,7 +57,7 @@ public class QueueJerseyTest extends ResourceTest { @Rule public ResourceTestRule _resourceTestRule = setupResourceTestRule( - Collections.singletonList(new QueueResource1(_server, QueueServiceAuthenticator.proxied(_proxy))), + Collections.singletonList(new QueueResource1(_server, QueueServiceAuthenticator.proxied(_proxy), new MetricRegistry())), ImmutableMap.of( APIKEY_QUEUE, new ApiKey("queue", ImmutableSet.of("queue-role")), APIKEY_UNAUTHORIZED, new ApiKey("unauth", ImmutableSet.of("unauthorized-role"))), diff --git a/quality/pom.xml b/quality/pom.xml index 1d32827010..ffbd280391 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 1fde08c1ee..b7b7eb2b33 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index e4aa043ad4..d71aae5218 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 13179a0946..2eb7d7ceef 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 5588dfdfb3..53a53dc625 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 1c7cc1c529..c38a0b5332 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java index 40ff4bf508..f07083616d 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java @@ -18,6 +18,8 @@ import com.bazaarvoice.emodb.queue.api.Names; import com.bazaarvoice.emodb.queue.api.UnknownMoveException; import com.bazaarvoice.emodb.sortedq.core.ReadOnlyQueueException; +import com.codahale.metrics.Meter; +import com.codahale.metrics.MetricRegistry; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.cache.CacheBuilder; @@ -46,18 +48,24 @@ abstract class AbstractQueueService implements BaseQueueService { private final JobService _jobService; private final JobType _moveQueueJobType; private final LoadingCache> _queueSizeCache; + private final Meter _sendAllMeterAQS; + private final Meter _sendAllMeterNullAQS; + + private final Meter _pollAQS; + private final Meter _pollNullAQS; public static final int MAX_MESSAGE_SIZE_IN_BYTES = 30 * 1024; protected AbstractQueueService(BaseEventStore eventStore, JobService jobService, JobHandlerRegistry jobHandlerRegistry, JobType moveQueueJobType, - Clock clock) { + Clock clock, MetricRegistry metricRegistry) { _eventStore = eventStore; _jobService = jobService; _moveQueueJobType = moveQueueJobType; registerMoveQueueJobHandler(jobHandlerRegistry); + _queueSizeCache = CacheBuilder.newBuilder() .expireAfterWrite(15, TimeUnit.SECONDS) .maximumSize(2000) @@ -69,6 +77,11 @@ public Map.Entry load(SizeCacheKey key) return Maps.immutableEntry(internalMessageCountUpTo(key.channelName, key.limitAsked), key.limitAsked); } }); + _sendAllMeterAQS = metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class, "sendAllAQS")); + _sendAllMeterNullAQS = metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class, "sendAllNullAQS")); + _pollAQS= metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class,"pollAQS")); + _pollNullAQS= metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class,"pollNullAQS")); + } private void registerMoveQueueJobHandler(JobHandlerRegistry jobHandlerRegistry) { @@ -109,6 +122,11 @@ public void sendAll(String queue, Collection messages) { @Override public void sendAll(Map> messagesByQueue) { requireNonNull(messagesByQueue, "messagesByQueue"); + if(messagesByQueue.keySet().isEmpty()){ + _sendAllMeterNullAQS.mark(); + } else { + _sendAllMeterAQS.mark(messagesByQueue.keySet().size()); + } ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); for (Map.Entry> entry : messagesByQueue.entrySet()) { @@ -178,8 +196,14 @@ public List poll(String queue, Duration claimTtl, int limit) { checkLegalQueueName(queue); checkArgument(claimTtl.toMillis() >= 0, "ClaimTtl must be >=0"); checkArgument(limit > 0, "Limit must be >0"); - - return toMessages(_eventStore.poll(queue, claimTtl, limit)); + List response = toMessages(_eventStore.poll(queue, claimTtl, limit)); + if(response.isEmpty()){ + _pollNullAQS.mark(); + } + else{ + _pollAQS.mark(response.size()); + } + return response; } @Override diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java index 85ef29c4fc..0955166218 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java @@ -4,6 +4,7 @@ import com.bazaarvoice.emodb.job.api.JobHandlerRegistry; import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.queue.api.DedupQueueService; +import com.codahale.metrics.MetricRegistry; import com.google.inject.Inject; import java.time.Clock; @@ -11,7 +12,7 @@ public class DefaultDedupQueueService extends AbstractQueueService implements DedupQueueService { @Inject public DefaultDedupQueueService(DedupEventStore eventStore, JobService jobService, JobHandlerRegistry jobHandlerRegistry, - Clock clock) { - super(eventStore, jobService, jobHandlerRegistry, MoveDedupQueueJob.INSTANCE, clock); + Clock clock, MetricRegistry metricRegistry) { + super(eventStore, jobService, jobHandlerRegistry, MoveDedupQueueJob.INSTANCE, clock, metricRegistry); } } diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java index 71f9a61ed3..947572208d 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java @@ -4,6 +4,7 @@ import com.bazaarvoice.emodb.job.api.JobHandlerRegistry; import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.queue.api.QueueService; +import com.codahale.metrics.MetricRegistry; import com.google.inject.Inject; import java.time.Clock; @@ -11,7 +12,7 @@ public class DefaultQueueService extends AbstractQueueService implements QueueService { @Inject public DefaultQueueService(EventStore eventStore, JobService jobService, JobHandlerRegistry jobHandlerRegistry, - Clock clock) { - super(eventStore, jobService, jobHandlerRegistry, MoveQueueJob.INSTANCE, clock); + Clock clock, MetricRegistry metricRegistry) { + super(eventStore, jobService, jobHandlerRegistry, MoveQueueJob.INSTANCE, clock, metricRegistry); } } diff --git a/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java b/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java index e6f66a5c0f..90a0ea837d 100644 --- a/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java +++ b/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java @@ -4,6 +4,7 @@ import com.bazaarvoice.emodb.job.api.JobHandlerRegistry; import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.job.api.JobType; +import com.codahale.metrics.MetricRegistry; import org.testng.annotations.Test; import java.time.Clock; @@ -37,7 +38,7 @@ public void testSizeCache() { BaseEventStore mockEventStore = mock(BaseEventStore.class); AbstractQueueService queueService = new AbstractQueueService(mockEventStore, mock(JobService.class), - mock(JobHandlerRegistry.class), mock(JobType.class), clock){}; + mock(JobHandlerRegistry.class), mock(JobType.class), clock, new MetricRegistry()){}; // At limit=500, size estimate should be at 4800 // At limit=50, size estimate should be at 5000 diff --git a/sdk/pom.xml b/sdk/pom.xml index 78c41677e6..e8f8b7eb5b 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index fcfc6f047d..d7bc799c60 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 037f125c61..8028d79623 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 9644da29a2..4141cd9d99 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index ac59970c76..100d90210e 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 9fe17c5c41..d2a61758ef 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 02564d6929..e4592dd6b0 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 71f0a81c69..b9ba2a6008 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 1a2505d827..38984d2abd 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 5a05f632b4..55aae7fdb8 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index c49edf5432..4535e14494 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 01d608fdcc..eadb8ccbf7 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/EmoService.java b/web/src/main/java/com/bazaarvoice/emodb/web/EmoService.java index 8a15f6c970..48a6059960 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/EmoService.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/EmoService.java @@ -304,9 +304,9 @@ private void evaluateQueue() // Start the Queue service ResourceRegistry resources = _injector.getInstance(ResourceRegistry.class); // Start the Queue service - resources.addResource(_cluster, "emodb-queue-1", new QueueResource1(queueService, queueClient)); + resources.addResource(_cluster, "emodb-queue-1", new QueueResource1(queueService, queueClient, _environment.metrics())); // Start the Dedup Queue service - resources.addResource(_cluster, "emodb-dedupq-1", new DedupQueueResource1(dedupQueueService, dedupQueueClient)); + resources.addResource(_cluster, "emodb-dedupq-1", new DedupQueueResource1(dedupQueueService, dedupQueueClient, _environment.metrics())); } private void evaluateScanner() diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java index a3869e8214..00c380af6a 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java @@ -1,13 +1,9 @@ package com.bazaarvoice.emodb.web.resources.blob; +import com.amazonaws.AmazonClientException; import com.bazaarvoice.emodb.auth.jersey.Authenticated; import com.bazaarvoice.emodb.auth.jersey.Subject; -import com.bazaarvoice.emodb.blob.api.Blob; -import com.bazaarvoice.emodb.blob.api.BlobMetadata; -import com.bazaarvoice.emodb.blob.api.BlobStore; -import com.bazaarvoice.emodb.blob.api.Range; -import com.bazaarvoice.emodb.blob.api.RangeSpecification; -import com.bazaarvoice.emodb.blob.api.Table; +import com.bazaarvoice.emodb.blob.api.*; import com.bazaarvoice.emodb.common.api.UnauthorizedException; import com.bazaarvoice.emodb.common.json.LoggingIterator; import com.bazaarvoice.emodb.sor.api.Audit; @@ -17,6 +13,9 @@ import com.bazaarvoice.emodb.web.auth.resource.NamedResource; import com.bazaarvoice.emodb.web.jersey.params.SecondsParam; import com.bazaarvoice.emodb.web.resources.SuccessResponse; +import com.bazaarvoice.emodb.web.resources.blob.messageQueue.MessagingService; +import com.bazaarvoice.emodb.web.resources.blob.messageQueue.SQSMessageException; +import com.bazaarvoice.emodb.web.resources.blob.messageQueue.SQSServiceFactory; import com.bazaarvoice.emodb.web.resources.sor.AuditParam; import com.bazaarvoice.emodb.web.resources.sor.TableOptionsParam; import com.codahale.metrics.Meter; @@ -37,44 +36,24 @@ import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; +import org.apache.commons.compress.utils.IOUtils; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.coursera.metrics.datadog.TaggedName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.core.UriInfo; +import javax.ws.rs.*; +import javax.ws.rs.core.*; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.time.Duration; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Spliterators; +import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.StreamSupport; - import static java.lang.String.format; @Path("/blob/1") @@ -84,6 +63,8 @@ public class BlobStoreResource1 { private static final Logger _log = LoggerFactory.getLogger(BlobStoreResource1.class); + private final MessagingService _messagingService; + private static final String X_BV_PREFIX = "X-BV-"; // HTTP header prefix for BlobMetadata other than attributes private static final String X_BVA_PREFIX = "X-BVA-"; // HTTP header prefix for BlobMetadata attributes private static final Pattern CONTENT_ENCODING = Pattern.compile("content[-_]?encoding", Pattern.CASE_INSENSITIVE); @@ -110,11 +91,11 @@ public class BlobStoreResource1 { private final LoadingCache _putObjectRequestsByApiKey; private final LoadingCache _deleteObjectRequestsByApiKey; + public BlobStoreResource1(BlobStore blobStore, Set approvedContentTypes, MetricRegistry metricRegistry) { _blobStore = blobStore; _approvedContentTypes = approvedContentTypes; _metricRegistry = metricRegistry; - _listTableRequestsByApiKey = createMetricCache("listTablesByApiKey"); _createTableRequestsByApiKey = createMetricCache("createTableByApiKey"); _dropTableRequestsByApiKey = createMetricCache("dropTableByApiKey"); @@ -130,7 +111,7 @@ public BlobStoreResource1(BlobStore blobStore, Set approvedContentTypes, _getObjectRequestsByApiKey = createMetricCache("getByApiKey"); _putObjectRequestsByApiKey = createMetricCache("putByApiKey"); _deleteObjectRequestsByApiKey = createMetricCache("deleteByApiKey"); - + _messagingService= new SQSServiceFactory().createSQSService(); } private LoadingCache createMetricCache(String metricName) { @@ -160,10 +141,10 @@ public Iterator listTables(@QueryParam("from") final String fromKeyExclus @Authenticated Subject subject) { _listTableRequestsByApiKey.getUnchecked(subject.getId()).mark(); return streamingIterator( - StreamSupport.stream(Spliterators.spliteratorUnknownSize(_blobStore.listTables(Strings.emptyToNull(fromKeyExclusive), Long.MAX_VALUE), 0), false) - .filter(input -> subject.hasPermission(Permissions.readBlobTable(new NamedResource(input.getName())))) - .limit(limit.get()) - .iterator() + StreamSupport.stream(Spliterators.spliteratorUnknownSize(_blobStore.listTables(Strings.emptyToNull(fromKeyExclusive), Long.MAX_VALUE), 0), false) + .filter(input -> subject.hasPermission(Permissions.readBlobTable(new NamedResource(input.getName())))) + .limit(limit.get()) + .iterator() ); } @@ -191,8 +172,16 @@ public SuccessResponse createTable(@PathParam("table") String table, if (!subject.hasPermission(Permissions.createBlobTable(resource))) { throw new UnauthorizedException(); } - _blobStore.createTable(table, options, attributes, audit); + try { + _messagingService.sendCreateTableSQS(table,options,attributes,audit); + } catch (IOException | AmazonClientException e) { + _log.error("Failed to send create table message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Failed to send create table message to SQS", e); + } catch (RuntimeException e) { + _log.error("Unexpected error occurred while sending create table message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Unexpected error occurred while sending create table message to SQS", e); + } return SuccessResponse.instance(); } @@ -211,6 +200,15 @@ public SuccessResponse dropTable(@PathParam("table") String table, _dropTableRequestsByApiKey.getUnchecked(subject.getId()).mark(); Audit audit = getRequired(auditParam, "audit"); _blobStore.dropTable(table, audit); + try { + _messagingService.sendDeleteTableSQS(table, audit); + } catch (IOException | AmazonClientException e) { + _log.error("Failed to send delete table message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Failed to send delete table message to SQS", e); + } catch (RuntimeException e) { + _log.error("Unexpected error occurred while sending delete table message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Unexpected error occurred while sending delete table message to SQS", e); + } return SuccessResponse.instance(); } @@ -228,6 +226,15 @@ public SuccessResponse purgeTable(@PathParam("table") String table, _purgeTableRequestsByApiKey.getUnchecked(subject.getId()).mark(); Audit audit = getRequired(auditParam, "audit"); _blobStore.purgeTableUnsafe(table, audit); + try { + _messagingService.purgeTableSQS(table,audit); + } catch (IOException | AmazonClientException| UnsupportedOperationException e) { + _log.error("Failed to send purge table message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Failed to send purge table message to SQS", e); + } catch (RuntimeException e) { + _log.error("Unexpected error occurred while sending purge table message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Unexpected error occurred while sending purge table message to SQS", e); + } return SuccessResponse.instance(); } @@ -262,6 +269,18 @@ public SuccessResponse setTableAttributes(@PathParam("table") String table, _setTableAttributesRequestsByApiKey.getUnchecked(subject.getId()).mark(); Audit audit = getRequired(auditParam, "audit"); _blobStore.setTableAttributes(table, attributes, audit); + try { + //send table attributes to sqs queue + _messagingService.putTableAttributesSQS(table,attributes,audit); + + } catch (IOException | AmazonClientException e) { + _log.error("Failed to send put table attributes message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Failed to send put table attributes message to SQS", e); + } catch (RuntimeException e) { + _log.error("Unexpected error occurred while sending put table attributes message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Unexpected error occurred while sending put table attributes message to SQS", e); + } + return SuccessResponse.instance(); } @@ -467,6 +486,7 @@ public SuccessResponse put(@PathParam("table") String table, InputStream in, @QueryParam("ttl") SecondsParam ttlParam, @Context HttpHeaders headers, + @Context UriInfo uriInfo, @Authenticated Subject subject) throws IOException { _putObjectRequestsByApiKey.getUnchecked(subject.getId()).mark(); @@ -492,8 +512,25 @@ public SuccessResponse put(@PathParam("table") String table, throw new IllegalArgumentException(String.format("Ttl:%s is specified for blobId:%s", ttl, blobId)); } + byte[] byteArray = IOUtils.toByteArray(in); + + String requestUrl= uriInfo.getRequestUri().toString(); + // Perform the put - _blobStore.put(table, blobId, onceOnlySupplier(in), attributes); + InputStream inputStream = new ByteArrayInputStream(byteArray); + _blobStore.put(table, blobId, onceOnlySupplier(inputStream), attributes); + + // Send the buffer bytes to SQS + try { + _messagingService.sendPutRequestSQS(table, blobId, attributes, requestUrl); + } catch (IOException | AmazonClientException e) { + _log.error("Failed to send put blob message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Failed to send put blob message to SQS", e); + } catch (RuntimeException e) { + _log.error("Unexpected error occurred while sending put blob message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Unexpected error occurred while sending put blob message to SQS", e); + } + return SuccessResponse.instance(); } @@ -510,6 +547,15 @@ public SuccessResponse delete(@PathParam("table") String table, @PathParam("blobId") String blobId, @Authenticated Subject subject) { _deleteObjectRequestsByApiKey.getUnchecked(subject.getId()).mark(); + try { + _messagingService.sendDeleteRequestSQS(table, blobId); + } catch (IOException | AmazonClientException e) { + _log.error("Failed to send delete blob message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Failed to send delete blob message to SQS", e); + } catch (RuntimeException e) { + _log.error("Unexpected error occurred while sending delete blob message to SQS for table {}: {}", table, e.getMessage()); + throw new SQSMessageException("Unexpected error occurred while sending delete blob message to SQS", e); + } _blobStore.delete(table, blobId); return SuccessResponse.instance(); } diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/MessagingService.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/MessagingService.java new file mode 100644 index 0000000000..d6caaded9a --- /dev/null +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/MessagingService.java @@ -0,0 +1,21 @@ +package com.bazaarvoice.emodb.web.resources.blob.messageQueue; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.bazaarvoice.emodb.sor.api.Audit; +import com.bazaarvoice.emodb.sor.api.TableOptions; + +import java.io.IOException; +import java.util.Map; + +/** + * Interface for interacting with a messaging service. + */ +public interface MessagingService { + void sendPutRequestSQS(String table, String blobId, Map attributes, String requestUrl) throws IOException; + void sendDeleteRequestSQS(String table, String blobId) throws IOException; + void sendCreateTableSQS(String table, TableOptions options, Map attributes, Audit audit) throws JsonProcessingException; + void sendDeleteTableSQS(String table, Audit audit) throws IOException; + void purgeTableSQS(String table, Audit audit) throws IOException; + void putTableAttributesSQS(String table, Map attributes, Audit audit) throws JsonProcessingException; +} + + diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSMessageException.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSMessageException.java new file mode 100644 index 0000000000..edc35e6acc --- /dev/null +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSMessageException.java @@ -0,0 +1,7 @@ +package com.bazaarvoice.emodb.web.resources.blob.messageQueue; + +public class SQSMessageException extends RuntimeException { + public SQSMessageException(String message, Throwable cause) { + super(message, cause); + } +} \ No newline at end of file diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSService.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSService.java new file mode 100644 index 0000000000..08487fdaee --- /dev/null +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSService.java @@ -0,0 +1,136 @@ +package com.bazaarvoice.emodb.web.resources.blob.messageQueue; + +import com.amazonaws.AmazonClientException; +import com.amazonaws.AmazonServiceException; +import com.amazonaws.services.sqs.AmazonSQS; +import com.amazonaws.services.sqs.model.SendMessageRequest; +import com.amazonaws.services.sqs.model.SendMessageResult; +import com.bazaarvoice.emodb.sor.api.Audit; +import com.bazaarvoice.emodb.sor.api.TableOptions; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.xml.bind.DatatypeConverter; +import java.util.HashMap; +import java.util.Map; + +/** + * Service class for interacting with Amazon SQS (Simple Queue Service). + */ +public class SQSService implements MessagingService { + private static final Logger _log = LoggerFactory.getLogger(SQSService.class); + + private final AmazonSQS sqs; + private final String queueUrl; + private final ObjectMapper objectMapper; + + /** + * Constructor for SQSService. + * + * @param queueName The name of the SQS queue to send messages to. + * @param objectMapper ObjectMapper for converting messages to JSON format. + * @param sqs AmazonSQS for sending messages + */ + public SQSService(String queueName, ObjectMapper objectMapper, AmazonSQS sqs) { + this.objectMapper = objectMapper; + this.sqs = sqs; + this.queueUrl = sqs.getQueueUrl(queueName).getQueueUrl(); + } + + @Override + public void sendPutRequestSQS(String table, String blobId, Map attributes, String requestUrl) { + Map messageMap = new HashMap<>(); + messageMap.put("method", "PUT_TABLE_BLOBID"); + messageMap.put("tenantName", "datastorage"); + messageMap.put("requestUrl", requestUrl); + messageMap.put("table", table); + messageMap.put("blobId", blobId); + messageMap.put("attributes", attributes); + + // Logging the length of the byte array + // _log.debug("Byte array length: {}", byteArray.length); + + // Convert byte array to base64 string + // String base64Data = DatatypeConverter.printBase64Binary(byteArray); + // messageMap.put("data", base64Data); + _log.debug("Sending PUT request to SQS. Table: {}, BlobId: {}, RequestUrl: {}", table, blobId, requestUrl); + sendMessageSQS(messageMap); + } + + @Override + public void sendDeleteRequestSQS(String table, String blobId) { + Map messageMap = new HashMap<>(); + messageMap.put("method", "DELETE_BLOB"); + messageMap.put("table", table); + messageMap.put("blobId", blobId); + sendMessageSQS(messageMap); + } + + @Override + public void sendCreateTableSQS(String table, TableOptions options, Map attributes, Audit audit) { + Map messageMap = new HashMap<>(); + messageMap.put("method", "CREATE_TABLE"); + messageMap.put("table", table); + messageMap.put("options", options); + messageMap.put("attributes", attributes); + messageMap.put("audit", audit); + sendMessageSQS(messageMap); + } + + @Override + public void sendDeleteTableSQS(String table, Audit audit) { + Map messageMap = new HashMap<>(); + messageMap.put("method", "DELETE_TABLE"); + messageMap.put("table", table); + messageMap.put("audit", audit); + sendMessageSQS(messageMap); + } + + @Override + public void purgeTableSQS(String table, Audit audit) { + Map messageMap = new HashMap<>(); + messageMap.put("method", "PURGE_TABLE"); + messageMap.put("table", table); + messageMap.put("audit", audit); + sendMessageSQS(messageMap); + } + + @Override + public void putTableAttributesSQS(String table, Map attributes, Audit audit) { + Map messageMap = new HashMap<>(); + messageMap.put("method", "SET_TABLE_ATTRIBUTE"); + messageMap.put("table", table); + messageMap.put("attributes", attributes); + messageMap.put("audit", audit); + sendMessageSQS(messageMap); + } + + private void sendMessageSQS(Map messageMap) { + try { + String messageBody = objectMapper.writeValueAsString(messageMap); + String messageGroupId = "blob"; + SendMessageRequest sendMessageRequest = new SendMessageRequest() + .withQueueUrl(queueUrl) + .withMessageBody(messageBody) + .withMessageGroupId(messageGroupId); + SendMessageResult result = sqs.sendMessage(sendMessageRequest); + _log.info("Message sent successfully to SQS. Message ID: {}", result.getMessageId()); + } catch (JsonProcessingException e) { + _log.error("Error converting message to JSON: {}", e.getMessage()); + throw new SQSMessageException("Failed to convert message to JSON", e); + } catch (AmazonServiceException e) { + _log.error("AmazonServiceException: {}", e.getMessage()); + throw new SQSMessageException("AWS service error occurred while sending message to SQS", e); + } catch (AmazonClientException e) { + _log.error("AmazonClientException: {}", e.getMessage()); + throw new SQSMessageException("Client error occurred while sending message to SQS", e); + } catch (Exception e) { + _log.error("Unexpected error occurred: {}", e.getMessage(), e); + throw new SQSMessageException("Unexpected error occurred while sending message to SQS", e); + } + } +} + + diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSServiceFactory.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSServiceFactory.java new file mode 100644 index 0000000000..9638a8bb1d --- /dev/null +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/messageQueue/SQSServiceFactory.java @@ -0,0 +1,12 @@ +package com.bazaarvoice.emodb.web.resources.blob.messageQueue; + +import com.amazonaws.services.sqs.AmazonSQS; +import com.amazonaws.services.sqs.AmazonSQSClientBuilder; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class SQSServiceFactory { + public MessagingService createSQSService() { + return new SQSService("blobMigrationQueue.fifo", new ObjectMapper(), AmazonSQSClientBuilder.standard().build()); + } +} + diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java index 0f24879873..c6dcd408fc 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java @@ -10,6 +10,8 @@ import com.bazaarvoice.emodb.web.auth.resource.NamedResource; import com.bazaarvoice.emodb.web.jersey.params.SecondsParam; import com.bazaarvoice.emodb.web.resources.SuccessResponse; +import com.codahale.metrics.Meter; +import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.annotation.Timed; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; @@ -48,10 +50,23 @@ public class DedupQueueResource1 { private final DedupQueueService _queueService; private final DedupQueueServiceAuthenticator _queueClient; + private final Meter _nullPollDedupCount; + private final Meter _messageDedupCount; + private final Meter _sendDedupCount; + private final Meter _sendNullDedupCount; + private final Meter _sendBatchNullDedupCount; + private final Meter _sendBatchDedupCount; - public DedupQueueResource1(DedupQueueService queueService, DedupQueueServiceAuthenticator queueClient) { + + public DedupQueueResource1(DedupQueueService queueService, DedupQueueServiceAuthenticator queueClient, MetricRegistry metricRegistry) { _queueService = requireNonNull(queueService, "queueService"); _queueClient = requireNonNull(queueClient, "queueClient"); + _nullPollDedupCount = metricRegistry.meter(MetricRegistry.name(DedupQueueResource1.class, "nullPollsDedupCount")); + _messageDedupCount = metricRegistry.meter(MetricRegistry.name(DedupQueueResource1.class, "polledMessageDedupCount")); + _sendDedupCount= metricRegistry.meter(MetricRegistry.name(DedupQueueResource1.class,"sendDedupCount")); + _sendNullDedupCount= metricRegistry.meter(MetricRegistry.name(DedupQueueResource1.class,"sendNullDedupCount")); + _sendBatchDedupCount= metricRegistry.meter(MetricRegistry.name(DedupQueueResource1.class,"sendBatchDedupCount")); + _sendBatchNullDedupCount= metricRegistry.meter(MetricRegistry.name(DedupQueueResource1.class,"sendBatchNullDedupCount")); } @POST @@ -65,6 +80,12 @@ public DedupQueueResource1(DedupQueueService queueService, DedupQueueServiceAuth ) public SuccessResponse send(@PathParam("queue") String queue, Object message) { // Not partitioned--any server can write messages to Cassandra. + if (message == null) { + _sendNullDedupCount.mark(); + } + else{ + _sendDedupCount.mark(); + } _queueService.send(queue, message); return SuccessResponse.instance(); } @@ -80,6 +101,12 @@ public SuccessResponse send(@PathParam("queue") String queue, Object message) { ) public SuccessResponse sendBatch(@PathParam("queue") String queue, Collection messages) { // Not partitioned--any server can write messages to Cassandra. + if (messages == null || messages.isEmpty()) { + _sendBatchNullDedupCount.mark(); // Increment the sendnull meter + } + else { + _sendBatchDedupCount.mark(messages.size()); + } _queueService.sendAll(queue, messages); return SuccessResponse.instance(); } @@ -171,7 +198,13 @@ public List poll(@QueryParam("partitioned") BooleanParam partitioned, @QueryParam("ttl") @DefaultValue("30") SecondsParam claimTtl, @QueryParam("limit") @DefaultValue("10") IntParam limit, @Authenticated Subject subject) { - return getService(partitioned, subject.getAuthenticationId()).poll(queue, claimTtl.get(), limit.get()); + + List polledMessages = getService(partitioned, subject.getAuthenticationId()).poll(queue, claimTtl.get(), limit.get()); + _messageDedupCount.mark(polledMessages.size()); + if(polledMessages.isEmpty()){ + _nullPollDedupCount.mark(); + } + return polledMessages; } @POST diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java index a0be8a9eb9..ff6334db05 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java @@ -10,6 +10,8 @@ import com.bazaarvoice.emodb.web.auth.resource.NamedResource; import com.bazaarvoice.emodb.web.jersey.params.SecondsParam; import com.bazaarvoice.emodb.web.resources.SuccessResponse; +import com.codahale.metrics.Meter; +import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.annotation.Timed; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; @@ -36,6 +38,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Queue; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; @@ -46,12 +49,31 @@ @Api (value="Queue: " , description = "All Queue operations") public class QueueResource1 { + //private final MetricRegistry _metricRegistry; private final QueueService _queueService; private final QueueServiceAuthenticator _queueClient; + private final Meter _messageCount_qr1; + private final Meter _nullPollsCount_qr1; + + private final Meter _sendCount_qr1; + private final Meter _sendNullCount_qr1; + + private final Meter _sendBatch_qr1; + + private final Meter _sendBatchNull_qr1; + + public QueueResource1(QueueService queueService, QueueServiceAuthenticator queueClient, MetricRegistry metricRegistry) { + //this._metricRegistry = metricRegistry; - public QueueResource1(QueueService queueService, QueueServiceAuthenticator queueClient) { _queueService = requireNonNull(queueService, "queueService"); _queueClient = requireNonNull(queueClient, "queueClient"); + _messageCount_qr1 = metricRegistry.meter(MetricRegistry.name(QueueResource1.class, "polledMessageCount_qr1")); + _nullPollsCount_qr1 = metricRegistry.meter(MetricRegistry.name(QueueResource1.class, "nullPollsCount_qr1")); + _sendCount_qr1= metricRegistry.meter(MetricRegistry.name(QueueResource1.class,"sendCount_qr1")); + _sendNullCount_qr1= metricRegistry.meter(MetricRegistry.name(QueueResource1.class,"sendNullCount_qr1")); + _sendBatch_qr1= metricRegistry.meter(MetricRegistry.name(QueueResource1.class,"sendBatch_qr1")); + _sendBatchNull_qr1= metricRegistry.meter(MetricRegistry.name(QueueResource1.class,"sendBatchNull_qr1")); + } @POST @@ -65,6 +87,13 @@ public QueueResource1(QueueService queueService, QueueServiceAuthenticator queue ) public SuccessResponse send(@PathParam("queue") String queue, Object message) { // Not partitioned--any server can write messages to Cassandra. + + if (message == null) { + _sendNullCount_qr1.mark(); + } + else{ + _sendCount_qr1.mark(); + } _queueService.send(queue, message); return SuccessResponse.instance(); } @@ -79,6 +108,13 @@ public SuccessResponse send(@PathParam("queue") String queue, Object message) { response = SuccessResponse.class ) public SuccessResponse sendBatch(@PathParam("queue") String queue, Collection messages) { + + if (messages == null || messages.isEmpty()) { + _sendBatchNull_qr1.mark(); // Increment the sendnull meter + } + else { + _sendBatch_qr1.mark(messages.size()); + } // Not partitioned--any server can write messages to Cassandra. _queueService.sendAll(queue, messages); return SuccessResponse.instance(); @@ -168,7 +204,14 @@ public List poll(@QueryParam("partitioned") BooleanParam partitioned, @QueryParam("ttl") @DefaultValue("30") SecondsParam claimTtl, @QueryParam("limit") @DefaultValue("10") IntParam limit, @Authenticated Subject subject) { - return getService(partitioned, subject.getAuthenticationId()).poll(queue, claimTtl.get(), limit.get()); + List polledMessages = getService(partitioned, subject.getAuthenticationId()).poll(queue, claimTtl.get(), limit.get()); + if(polledMessages.isEmpty()){ + _nullPollsCount_qr1.mark(); + } + else{ + _messageCount_qr1.mark(polledMessages.size()); + } + return polledMessages; } @POST diff --git a/yum/pom.xml b/yum/pom.xml index 865aa886a5..adee7cf547 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.137-SNAPSHOT + 6.5.171-SNAPSHOT ../parent/pom.xml From 032af2b5b3638e3a14f4e276bcdcff8f894c6d6d Mon Sep 17 00:00:00 2001 From: Rishu Yadav Date: Mon, 28 Oct 2024 20:43:39 +0530 Subject: [PATCH 18/29] PD-257019 Changes for emodb stabilization, kafka integration and stepfunction firing (#844) * PD-257019 Stabilization emodb queue service changes (#831) * PD-249429: integrated emodb with datastorage-media-service for getting the metadata from s3. * PD-249429: refactored code. * PD-249428: DELETE blob with blob id. * PD-249428: Implemented upload blob from byte array. * PD-249428: Implemented upload blob from byte array. * PD-249428: Fixed failing ITs. * PD-249428: Fixed failing ITs. * PD-249428: Changed the snapshot version. * PD-249428: Refactored code. * PD-249428: changed the version to 172. * PD-249428: commented tests. * branch admin -prepare release emodb-6.5.172 * PD-249428: changed snapshot versions. * PD-249428: changed snapshot versions. * branch admin -prepare release emodb-6.5.173 * branch admin -prepare for next development iteration * changed the BASE_URL * PD-256742: fixed all bugs. * PD-256742: changed snapshot version. * PD-256742: changed snapshot version. * branch admin -prepare release emodb-6.5.176 * branch admin -prepare for next development iteration * for testing * feat: integrate kafka to emodb * Create kafka producer and admin service * Overload the sendAll method to reroute messages to kafka * Make the required changes in Clients like jersey2 * feat: include logic for separation of queue and dedupq * feat: include guava dependency injection for emodb * fix: seperation of producer and admin service and proper injection * fix: fix DI wiring issue * feat: integrate triggering step function execution on creation of new topic * feat: merge changes for stepfunction * branch admin -prepare release emodb-6.5.175 * branch admin -prepare for next development iteration * feat: add parameter store * fix:add aws core dependency * fix:remove credentialProvider * fix: changes for ci deployment * fix: pom changes for blob * chore: update tags to 177 for deployment * branch admin -prepare release emodb-6.5.177 * branch admin -prepare for next development iteration * chore: update msk servers * fix: include msk server url * chore: snapshot update to 181 * branch admin -prepare release emodb-6.5.181 * branch admin -prepare for next development iteration * feat: include working parameter store and stepfn changes * add proper exception handling in parameter store and stepfn * make abstractqueue service code modular and organized * branch admin -prepare release emodb-6.5.182 * branch admin -prepare for next development iteration * feat: fetch kafka configs from ssm and dependency injection for stepfn * fetch aws configs from ssm parameter store * introduce dependency injection for stepfunction service * branch admin -prepare release emodb-6.5.183 * branch admin -prepare for next development iteration * feat: feature flag implementation for queue migrations * include the proper naming for each stepfn execution * include all required contracts for stepfn * include the feature flag logic, fetch params from parameter store and based on the allowed queues migrate * fix: fix param for allowedQueues * branch admin -prepare release emodb-6.5.184 * branch admin -prepare for next development iteration * fix: remove blob changes * chore: add comments and fix start.sh * fix: changed logic for feature flag * add changed logic for feature flag implementation * wrap the payload for stepfn around a executionInput parameter * fix: fixed exception handling and code refactoring * throw back exceptions after logging * include create topic and checktopic in one function * add comments for better description --------- Co-authored-by: vikram-vikram_bveng Co-authored-by: jenkins Co-authored-by: nabajyotiDash-hub * update pom version * branch admin -prepare release emodb-6.5.192 * branch admin -prepare for next development iteration * modify producer properties (#834) * PD-257019 Add universe fetching and bug fixes (#835) * feat: add universe fetching and bug fixes * fix: remove debug logs * branch admin -prepare release emodb-6.5.193 * branch admin -prepare for next development iteration * uncached_size for dedupq (#837) * PD-257019 Producer send and logging changes (#838) * fix: fix send logic and exception handling changes * added exception handling * changed producer send logic to be synchronous * removed redundant logs * uncached_size for dedupq (#837) * chore: rename queuetype as per convention * chore: fix naming issue --------- Co-authored-by: nabajyotiDash-hub <80683084+nabajyotiDash-hub@users.noreply.github.com> * branch admin -prepare release emodb-6.5.194 * branch admin -prepare for next development iteration * branch admin -prepare release emodb-6.5.195 * branch admin -prepare for next development iteration * branch admin -prepare release emodb-6.5.196 * branch admin -prepare for next development iteration * chore: snapshot updates * branch admin -prepare release emodb-6.5.194 * branch admin -prepare for next development iteration * [PD-258160] added dd metrics for queue name and queue size (#836) * branch admin -prepare release emodb-6.5.195 * alter pom version for bvengineering deployment * branch admin -prepare release emodb-6.5.196 * update pom to 6.5.197-SNAPSHOT * branch admin -prepare release emodb-6.5.197 * branch admin -prepare for next development iteration * branch admin -prepare release emodb-6.5.198 * branch admin -prepare for next development iteration * add cache * add allowedQueues cache * feat: producer future logic and caching changes * chore: clear out unused code * PD-257019 Producer send and logging changes (#838) * fix: fix send logic and exception handling changes * added exception handling * changed producer send logic to be synchronous * removed redundant logs * uncached_size for dedupq (#837) * chore: rename queuetype as per convention * chore: fix naming issue --------- Co-authored-by: nabajyotiDash-hub <80683084+nabajyotiDash-hub@users.noreply.github.com> * fix: fix the config changes * Revert "Merge branch 'master' into PD-257019-producer-async-fixes" This reverts commit 93f5a76d6106f7f6646b83d28610c6b05ff19c42, reversing changes made to 15ce863bb26f68abba54ce403ef74b2cb7e7b252. * chore: snapshot updates for deployement * chore: clear up testing logs * fix: remove default servers * branch admin -prepare release emodb-6.5.202 * branch admin -prepare for next development iteration * chore: caching logs refactoring * branch admin -prepare release emodb-6.5.203 * branch admin -prepare for next development iteration --------- Co-authored-by: vikram-vikram_bveng Co-authored-by: jenkins Co-authored-by: nabajyotiDash-hub Co-authored-by: nabajyotiDash-hub <80683084+nabajyotiDash-hub@users.noreply.github.com> Co-authored-by: Anurag Dubey --- abc.txt | 0 auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- .../emodb/blob/core/DefaultBlobStore.java | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 13 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- .../queue/api/AuthDedupQueueService.java | 2 + .../emodb/queue/api/AuthQueueService.java | 3 + .../emodb/queue/api/BaseQueueService.java | 9 +- .../emodb/queue/api/DedupQueueService.java | 2 + .../emodb/queue/api/QueueService.java | 4 + queue-client-common/pom.xml | 2 +- .../queue/client/AbstractQueueClient.java | 19 ++ .../DedupQueueServiceAuthenticatorProxy.java | 5 + .../emodb/queue/client/QueueClient.java | 1 + .../QueueServiceAuthenticatorProxy.java | 5 + queue-client-jersey2/pom.xml | 2 +- .../queue/client/AbstractQueueClient.java | 17 + .../DedupQueueServiceAuthenticatorProxy.java | 5 + .../QueueServiceAuthenticatorProxy.java | 5 + queue-client/pom.xml | 2 +- queue/pom.xml | 47 ++- .../bazaarvoice/emodb/queue/QueueModule.java | 11 + .../queue/core/AbstractQueueService.java | 312 +++++++++++++++--- .../queue/core/DefaultDedupQueueService.java | 8 +- .../emodb/queue/core/DefaultQueueService.java | 8 +- .../queue/core/TrustedDedupQueueService.java | 5 + .../emodb/queue/core/TrustedQueueService.java | 5 + .../queue/core/kafka/KafkaAdminService.java | 120 +++++++ .../emodb/queue/core/kafka/KafkaConfig.java | 157 +++++++++ .../core/kafka/KafkaProducerService.java | 66 ++++ .../queue/core/ssm/ParameterStoreUtil.java | 107 ++++++ .../core/stepfn/StepFunctionService.java | 62 ++++ .../emodb/queue/core/SizeQueueCacheTest.java | 7 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- .../resources/blob/BlobStoreResource1.java | 4 +- .../resources/queue/DedupQueueResource1.java | 26 ++ .../web/resources/queue/QueueResource1.java | 30 ++ yum/pom.xml | 2 +- 84 files changed, 1051 insertions(+), 122 deletions(-) create mode 100644 abc.txt create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaAdminService.java create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java diff --git a/abc.txt b/abc.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 14e80f2c35..ab46219a7b 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 257be185db..47d5f4efaf 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 3b9531494e..d26ad49c09 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index fe30721176..eb0a847c96 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 85123d5a42..afd6ecd6ac 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 2551dd9b1f..6a0eee4600 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 1469a20558..ec09f2ce5b 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 8eb86f2ce1..5468bebabd 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index e4396c74cf..4fb2a01b7e 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/blob/src/main/java/com/bazaarvoice/emodb/blob/core/DefaultBlobStore.java b/blob/src/main/java/com/bazaarvoice/emodb/blob/core/DefaultBlobStore.java index 8eba374154..6ab72adaa1 100644 --- a/blob/src/main/java/com/bazaarvoice/emodb/blob/core/DefaultBlobStore.java +++ b/blob/src/main/java/com/bazaarvoice/emodb/blob/core/DefaultBlobStore.java @@ -474,4 +474,4 @@ private static void checkLegalBlobId(String blobId) { "Blob IDs must be ASCII strings between 1 and 255 characters in length. " + "Whitespace, ISO control characters and certain punctuation characters that aren't generally allowed in file names are excluded."); } -} +} \ No newline at end of file diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index c05b60ea79..0db4d08c7f 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index b8892b6428..d62a8bed9e 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index b6eff20acf..4223f7b9e8 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 1f2e6db668..9e9c6703aa 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 1a6fe97c68..6cab40d632 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 640eeb51a0..31d3091f1f 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 8bb610aba2..dfc1de40a8 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index aa9d419736..f20cab0356 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 917adb1936..ba557a73be 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index bb9f0e5b7b..79b959eedd 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 69c7151265..31f76da7c4 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 02e713b07c..29937806ae 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 27ef872a85..c38ed11a39 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 5af9b9d379..4329e99b6f 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 7c2794e645..cb01c070d3 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 46b1d8c25d..37e78784d4 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index e966f653bb..5089064103 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index d0582217b8..3f432b89bd 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 8e3cd03e8b..cf7c210112 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 8ac8b8687e..c622d59922 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index e4a44a41d2..d78652fb72 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index b553098418..c070b6444b 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 2c91fd1561..1c579e5c28 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 27d58c9133..99ec131913 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT pom EmoDB Parent @@ -635,11 +635,22 @@ aws-java-sdk-sns ${aws-sdk.version} + + com.amazonaws + aws-java-sdk-stepfunctions + ${aws-sdk.version} + com.amazonaws aws-java-sdk-sqs ${aws-sdk.version} + + + com.amazonaws + aws-java-sdk-ssm + ${aws-sdk.version} + com.amazonaws aws-java-sdk-sts diff --git a/plugins/pom.xml b/plugins/pom.xml index e67d3d650d..e540c2d93b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 5f048e3d7b..f2dddf3f53 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index f2fca66aa4..8246c931bb 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index ffbd280391..8d6e028d0e 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index b7b7eb2b33..54c0c33595 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthDedupQueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthDedupQueueService.java index 41991d5b95..3b1fd2ffde 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthDedupQueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthDedupQueueService.java @@ -64,4 +64,6 @@ public interface AuthDedupQueueService { /** Delete all messages in the queue, for debugging/testing. */ void purge(@Credential String apiKey, String queue); + + void sendAll(String apiKey, String queue, Collection messages, boolean isFlush); } diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthQueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthQueueService.java index a077eb2062..1bae1893f1 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthQueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/AuthQueueService.java @@ -18,6 +18,7 @@ public interface AuthQueueService { void sendAll(@Credential String apiKey, String queue, Collection messages); void sendAll(@Credential String apiKey, Map> messagesByQueue); + void sendAll(@Credential String apiKey, String queue, Collection messages, boolean isFlush); /** * Counts pending messages for the specified queue. The count will include messages that are currently claimed @@ -64,4 +65,6 @@ public interface AuthQueueService { /** Delete all messages in the queue, for debugging/testing. */ void purge(@Credential String apiKey, String queue); + + } diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java index 3fcd38b5a4..3f5fd99950 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java @@ -1,5 +1,6 @@ package com.bazaarvoice.emodb.queue.api; +import java.nio.ByteBuffer; import java.time.Duration; import java.util.Collection; import java.util.List; @@ -15,6 +16,8 @@ public interface BaseQueueService { void sendAll(Map> messagesByQueue); + void sendAll(String queue, Collection messages, boolean isFlush); + /** * Counts pending messages for the specified queue. The count will include messages that are currently claimed * and not returned by the {@link #poll} method. @@ -24,6 +27,10 @@ public interface BaseQueueService { */ long getMessageCount(String queue); + default long getUncachedSize(String queue){ + return 0; + } + /** * Counts the total number of messages for the specified queue, accurate up to the specified limit. Beyond the * specified limit the message count will be a rough estimate, allowing the caller to make the trade-off between @@ -60,4 +67,4 @@ public interface BaseQueueService { /** Delete all messages in the queue, for debugging/testing. */ void purge(String queue); -} +} \ No newline at end of file diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java index 12ab97a45a..a6dc77515b 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java @@ -15,6 +15,8 @@ public interface DedupQueueService extends BaseQueueService { void sendAll(Map> messagesByQueue); + void sendAll(String queue, Collectionmessages, boolean isFlush); + /** * Counts pending messages for the specified queue. The count will include messages that are currently claimed * and not returned by the {@link #poll} method. diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java index c87740330c..4d533c755e 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java @@ -13,8 +13,12 @@ public interface QueueService extends BaseQueueService { void sendAll(String queue, Collection messages); + void sendAll(Map> messagesByQueue); + //Overloaded sendAll method to send to cassandra + void sendAll(String queue, Collection messages, boolean isFlush); + /** * Counts pending messages for the specified queue. The count will include messages that are currently claimed * and not returned by the {@link #poll} method. diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index d71aae5218..d61cd7eb60 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java index b8aaa83667..7e01cd8b91 100644 --- a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java +++ b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java @@ -75,6 +75,25 @@ public void sendAll(String apiKey, String queue, Collection messages) { } } + public void sendAll(String apiKey, String queue, Collection messages, boolean isFlush) { + requireNonNull(queue, "queue"); + requireNonNull(messages, "messages"); + if (messages.isEmpty()) { + return; + } + try { + URI uri = _queueService.clone() + .segment(queue, "sendbatch") + .build(); + _client.resource(uri) + .type(MediaType.APPLICATION_JSON_TYPE) + .header(ApiKeyRequest.AUTHENTICATION_HEADER, apiKey) + .post(messages); + } catch (EmoClientException e) { + throw convertException(e); + } + } + // Any server can handle sending messages, no need for @PartitionKey public void sendAll(String apiKey, Map> messagesByQueue) { requireNonNull(messagesByQueue, "messagesByQueue"); diff --git a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java index 49d4c240f2..01fa7830eb 100644 --- a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java +++ b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java @@ -38,6 +38,11 @@ public void sendAll(Map> messagesByQueue) { _authDedupQueueService.sendAll(_apiKey, messagesByQueue); } + @Override + public void sendAll(String queue, Collection messages, boolean isFlush) { + _authDedupQueueService.sendAll(_apiKey, queue, messages, isFlush); + } + @Override public MoveQueueStatus getMoveStatus(String reference) { return _authDedupQueueService.getMoveStatus(_apiKey, reference); diff --git a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueClient.java b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueClient.java index 683af2162d..92769441dd 100644 --- a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueClient.java +++ b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueClient.java @@ -32,6 +32,7 @@ public QueueClient(URI endPoint, boolean partitionSafe, EmoClient client) { super(endPoint, partitionSafe, client); } + @Override public long getMessageCount(String apiKey, String queue) { // Any server can handle this request, no need for @PartitionKey diff --git a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java index 29f8fd4ae6..714897a36e 100644 --- a/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java +++ b/queue-client-common/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java @@ -38,6 +38,11 @@ public void sendAll(Map> messagesByQueue) { _authQueueService.sendAll(_apiKey, messagesByQueue); } + @Override + public void sendAll(String queue, Collection messages, boolean isFlush) { + _authQueueService.sendAll(_apiKey, queue, messages, isFlush); + } + @Override public MoveQueueStatus getMoveStatus(String reference) { return _authQueueService.getMoveStatus(_apiKey, reference); diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 2eb7d7ceef..b1de7085d4 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java b/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java index bd4859d58f..7e315932b7 100644 --- a/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java +++ b/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/AbstractQueueClient.java @@ -67,6 +67,23 @@ public void sendAll(String apiKey, String queue, Collection messages) { .post(messages)); } + public void sendAll(String apiKey, String queue, Collection messages, boolean isFlush) { + requireNonNull(queue, "queue"); + requireNonNull(messages, "messages"); + if (messages.isEmpty()) { + return; + } + URI uri = _queueService.clone() + .segment(queue, "sendbatch") + .build(); + + Failsafe.with(_retryPolicy) + .run(() -> _client.resource(uri) + .type(MediaType.APPLICATION_JSON_TYPE) + .header(ApiKeyRequest.AUTHENTICATION_HEADER, apiKey) + .post(messages)); + } + public void sendAll(String apiKey, Map> messagesByQueue) { requireNonNull(messagesByQueue, "messagesByQueue"); if (messagesByQueue.isEmpty()) { diff --git a/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java b/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java index f37405182b..19df050f64 100644 --- a/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java +++ b/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/DedupQueueServiceAuthenticatorProxy.java @@ -36,6 +36,11 @@ public void sendAll(Map> messagesByQueue) { _authDedupQueueService.sendAll(_apiKey, messagesByQueue); } + @Override + public void sendAll(String queue, Collection messages, boolean isFlush) { + _authDedupQueueService.sendAll(_apiKey, queue, messages, isFlush); + } + @Override public MoveQueueStatus getMoveStatus(String reference) { return _authDedupQueueService.getMoveStatus(_apiKey, reference); diff --git a/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java b/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java index 144b991f32..fef04a42e1 100644 --- a/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java +++ b/queue-client-jersey2/src/main/java/com/bazaarvoice/emodb/queue/client/QueueServiceAuthenticatorProxy.java @@ -35,6 +35,11 @@ public void sendAll(Map> messagesByQueue) { _authQueueService.sendAll(_apiKey, messagesByQueue); } + @Override + public void sendAll(String queue, Collection messages, boolean isFlush) { + _authQueueService.sendAll(_apiKey, queue, messages, isFlush); + } + @Override public MoveQueueStatus getMoveStatus(String reference) { return _authQueueService.getMoveStatus(_apiKey, reference); diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 53a53dc625..e4c065cc3a 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index c38a0b5332..67a621be8b 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml @@ -75,20 +75,24 @@ com.fasterxml.jackson.core jackson-annotations + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.core jackson-databind ${jackson.databind.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - + + + + + + + + + + javax.validation @@ -98,6 +102,11 @@ org.apache.curator curator-framework + + org.slf4j + slf4j-api + + @@ -110,5 +119,21 @@ testng test + + org.apache.kafka + kafka-clients + + + com.amazonaws + aws-java-sdk-core + + + com.amazonaws + aws-java-sdk-stepfunctions + + + com.amazonaws + aws-java-sdk-ssm + diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java index 20ff816a5c..b42d33b02c 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java @@ -21,6 +21,9 @@ import com.bazaarvoice.emodb.queue.core.DefaultDedupQueueService; import com.bazaarvoice.emodb.queue.core.DefaultQueueService; import com.bazaarvoice.emodb.queue.core.QueueChannelConfiguration; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaAdminService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaProducerService; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; import com.bazaarvoice.ostrich.HostDiscovery; import com.codahale.metrics.MetricRegistry; import com.google.common.base.Supplier; @@ -82,6 +85,14 @@ protected void configure() { bind(new TypeLiteral>() {}).annotatedWith(DedupEnabled.class).toInstance(Suppliers.ofInstance(true)); install(new EventStoreModule("bv.emodb.queue", _metricRegistry)); + // Bind Kafka services + bind (KafkaAdminService.class).asEagerSingleton(); + bind(KafkaProducerService.class).asEagerSingleton(); + + // Bind Step Function Service + bind(StepFunctionService.class).asEagerSingleton(); + + // Bind the Queue instance that the rest of the application will consume bind(QueueService.class).to(DefaultQueueService.class).asEagerSingleton(); expose(QueueService.class); diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java index f07083616d..0793a08b2a 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java @@ -17,11 +17,17 @@ import com.bazaarvoice.emodb.queue.api.MoveQueueStatus; import com.bazaarvoice.emodb.queue.api.Names; import com.bazaarvoice.emodb.queue.api.UnknownMoveException; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaAdminService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaConfig; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaProducerService; +import com.bazaarvoice.emodb.queue.core.ssm.ParameterStoreUtil; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; import com.bazaarvoice.emodb.sortedq.core.ReadOnlyQueueException; -import com.codahale.metrics.Meter; -import com.codahale.metrics.MetricRegistry; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.base.Supplier; +import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -33,39 +39,58 @@ import java.nio.ByteBuffer; import java.time.Clock; import java.time.Duration; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + abstract class AbstractQueueService implements BaseQueueService { + private final Logger _log = LoggerFactory.getLogger(AbstractQueueService.class); private final BaseEventStore _eventStore; private final JobService _jobService; private final JobType _moveQueueJobType; private final LoadingCache> _queueSizeCache; - private final Meter _sendAllMeterAQS; - private final Meter _sendAllMeterNullAQS; - - private final Meter _pollAQS; - private final Meter _pollNullAQS; + private final KafkaAdminService adminService; + private final KafkaProducerService producerService; + // Configuration keys for Kafka topic settings + private static final Integer TOPIC_PARTITION_COUNT = 3; + private static final Short TOPIC_REPLICATION_FACTOR = 3; public static final int MAX_MESSAGE_SIZE_IN_BYTES = 30 * 1024; + private final StepFunctionService stepFunctionService; + private final ParameterStoreUtil parameterStoreUtil; + + // Cache for the isExperiment value with a TTL of 5 minutes + private final Cache experimentCache = CacheBuilder.newBuilder() + .expireAfterWrite(1, TimeUnit.MINUTES) + .build(); + private static final String IS_EXPERIMENT = "isExperiment"; + + private final Cache> allowedQueuesCache = CacheBuilder.newBuilder() + .expireAfterWrite(1, TimeUnit.MINUTES) + .build(); + private static final String ALLOWED_QUEUES = "allowedQueues"; + + private static final String UNIVERSE = KafkaConfig.getUniverseFromEnv(); protected AbstractQueueService(BaseEventStore eventStore, JobService jobService, JobHandlerRegistry jobHandlerRegistry, JobType moveQueueJobType, - Clock clock, MetricRegistry metricRegistry) { + Clock clock, KafkaAdminService adminService, KafkaProducerService producerService, StepFunctionService stepFunctionService) { _eventStore = eventStore; _jobService = jobService; _moveQueueJobType = moveQueueJobType; + this.adminService = adminService; + this.producerService = producerService; + this.stepFunctionService = stepFunctionService; + this.parameterStoreUtil = new ParameterStoreUtil(); - registerMoveQueueJobHandler(jobHandlerRegistry); + registerMoveQueueJobHandler(jobHandlerRegistry); _queueSizeCache = CacheBuilder.newBuilder() .expireAfterWrite(15, TimeUnit.SECONDS) .maximumSize(2000) @@ -77,11 +102,6 @@ public Map.Entry load(SizeCacheKey key) return Maps.immutableEntry(internalMessageCountUpTo(key.channelName, key.limitAsked), key.limitAsked); } }); - _sendAllMeterAQS = metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class, "sendAllAQS")); - _sendAllMeterNullAQS = metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class, "sendAllNullAQS")); - _pollAQS= metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class,"pollAQS")); - _pollNullAQS= metricRegistry.meter(MetricRegistry.name(AbstractQueueService.class,"pollNullAQS")); - } private void registerMoveQueueJobHandler(JobHandlerRegistry jobHandlerRegistry) { @@ -109,42 +129,148 @@ public MoveQueueResult run(MoveQueueRequest request) }); } + /** + * Retrieves the value of the "isExperiment" flag from the cache if available. + * If the value is not present in the cache or the cache has expired, it fetches the value + * from AWS Parameter Store and stores it in the cache. + *

+ * The cached value has a TTL (Time-To-Live) of 5 minutes, after which it will be refreshed + * from the Parameter Store on the next access. + *

+ * + * @return {@code true} if the experiment is still running, otherwise {@code false}. + * @throws RuntimeException if there is an error fetching the value from the cache or Parameter Store. + */ + private boolean getIsExperimentValue() { + try { + // Attempt to retrieve from cache + return experimentCache.get(IS_EXPERIMENT, () -> { + + Boolean checkExperiment = Boolean.parseBoolean(parameterStoreUtil.getParameter("/" + UNIVERSE + "/emodb/experiment/isExperiment")); + _log.info("IS_EXPERIMENT is refreshed {}", checkExperiment); + // If absent or expired, fetch from Parameter Store and cache the result + return checkExperiment; + }); + } catch (Exception e) { + // Handle any errors that might occur while accessing the cache or Parameter Store + throw new RuntimeException("Error fetching experiment flag", e); + } + } + @Override public void send(String queue, Object message) { - sendAll(Collections.singletonMap(queue, Collections.singleton(message))); + //boolean isExperiment = Boolean.parseBoolean(parameterStoreUtil.getParameter("/" + UNIVERSE + "/emodb/experiment/isExperiment")); + boolean isExperiment = getIsExperimentValue(); + if (!isExperiment) { + // Experiment is over now, send everything to Kafka + sendAll(Collections.singletonMap(queue, Collections.singleton(message))); + } else { + List allowedQueues = fetchAllowedQueues(); + // Experiment is still running, check if the queue is allowed + if (allowedQueues.contains(queue)) { + // Send to Kafka, only if it's an allowed queue + sendAll(Collections.singletonMap(queue, Collections.singleton(message))); + } else { + // Send to Cassandra (rollback plan) + sendAll(queue, Collections.singleton(message), false); + } + } } @Override public void sendAll(String queue, Collection messages) { - sendAll(Collections.singletonMap(queue, messages)); + List allowedQueues = fetchAllowedQueues(); + boolean isExperiment = getIsExperimentValue(); + if (!isExperiment) { + // experiment is over now, send everything to kafka + sendAll(Collections.singletonMap(queue, messages)); + } else { + // Experiment is still running, check if the queue is allowed + if(allowedQueues.contains(queue)){ + //send kafka , only if its allowed queue + sendAll(Collections.singletonMap(queue, messages)); + } + else { + //send to cassandra, (rollback plan) + sendAll(queue, messages, false); + } + } + } + + + private void validateMessage(Object message) { + // Check if the message is valid using JsonValidator + ByteBuffer messageByteBuffer = MessageSerializer.toByteBuffer(JsonValidator.checkValid(message)); + + // Check if the message size exceeds the allowed limit + checkArgument(messageByteBuffer.limit() <= MAX_MESSAGE_SIZE_IN_BYTES, + "Message size (" + messageByteBuffer.limit() + ") is greater than the maximum allowed (" + MAX_MESSAGE_SIZE_IN_BYTES + ") message size"); + + } + + private void validateQueue(String queue, Collection messages) { + requireNonNull(queue, "Queue name cannot be null"); + requireNonNull(messages, "Messages collection cannot be null"); + + // Check if the queue name is legal + checkLegalQueueName(queue); } @Override public void sendAll(Map> messagesByQueue) { requireNonNull(messagesByQueue, "messagesByQueue"); - if(messagesByQueue.keySet().isEmpty()){ - _sendAllMeterNullAQS.mark(); - } else { - _sendAllMeterAQS.mark(messagesByQueue.keySet().size()); - } - ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); for (Map.Entry> entry : messagesByQueue.entrySet()) { String queue = entry.getKey(); Collection messages = entry.getValue(); - checkLegalQueueName(queue); - requireNonNull(messages, "messages"); + validateQueue(queue, messages); - List events = Lists.newArrayListWithCapacity(messages.size()); - for (Object message : messages) { - ByteBuffer messageByteBuffer = MessageSerializer.toByteBuffer(JsonValidator.checkValid(message)); - checkArgument(messageByteBuffer.limit() <= MAX_MESSAGE_SIZE_IN_BYTES, "Message size (" + messageByteBuffer.limit() + ") is greater than the maximum allowed (" + MAX_MESSAGE_SIZE_IN_BYTES + ") message size"); + List events = Lists.newArrayListWithCapacity(messages.size()); - events.add(messageByteBuffer); + // Validate each message + for (Object message : messages) { + validateMessage(message); + events.add(message.toString()); } builder.putAll(queue, events); } + + Multimap eventsByChannel = builder.build(); + + String queueType = determineQueueType(); + for (Map.Entry> topicEntry : eventsByChannel.asMap().entrySet()) { + String queueName= topicEntry.getKey(); + String topic = "dsq-" + (("dedupq".equals(queueType)) ? "dedup-" + queueName : queueName); + // Check if the topic exists, if not create it and execute Step Function + if (!adminService.createTopicIfNotExists(topic, TOPIC_PARTITION_COUNT, TOPIC_REPLICATION_FACTOR, queueType)) { + Map parameters = fetchStepFunctionParameters(); + // Execute Step Function after topic creation + startStepFunctionExecution(parameters, queueType,queueName, topic); + } + producerService.sendMessages(topic, topicEntry.getValue(), queueType); + _log.info("Messages sent to topic: {}", topic); + } + } + + @Override + public void sendAll(String queue, Collection messages, boolean fromKafka) { + //incoming message from kafka consume, save to cassandra + if(!fromKafka){ + validateQueue(queue, messages); + } + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + List events = Lists.newArrayListWithCapacity(messages.size()); + + + for (Object message : messages) { + ByteBuffer messageByteBuffer = MessageSerializer.toByteBuffer(JsonValidator.checkValid(message)); + checkArgument(messageByteBuffer.limit() <= MAX_MESSAGE_SIZE_IN_BYTES, + "Message size (" + messageByteBuffer.limit() + ") is greater than the maximum allowed (" + MAX_MESSAGE_SIZE_IN_BYTES + ") message size"); + events.add(messageByteBuffer); + } + builder.putAll(queue, events); Multimap eventsByChannel = builder.build(); _eventStore.addAll(eventsByChannel); @@ -155,6 +281,11 @@ public long getMessageCount(String queue) { return getMessageCountUpTo(queue, Long.MAX_VALUE); } + @Override + public long getUncachedSize(String queue){ + return internalMessageCountUpTo(queue, Long.MAX_VALUE); + } + @Override public long getMessageCountUpTo(String queue, long limit) { // We get the size from cache as a tuple of size, and the limit used to estimate that size @@ -196,14 +327,8 @@ public List poll(String queue, Duration claimTtl, int limit) { checkLegalQueueName(queue); checkArgument(claimTtl.toMillis() >= 0, "ClaimTtl must be >=0"); checkArgument(limit > 0, "Limit must be >0"); - List response = toMessages(_eventStore.poll(queue, claimTtl, limit)); - if(response.isEmpty()){ - _pollNullAQS.mark(); - } - else{ - _pollAQS.mark(response.size()); - } - return response; + + return toMessages(_eventStore.poll(queue, claimTtl, limit)); } @Override @@ -219,7 +344,6 @@ public void renew(String queue, Collection messageIds, Duration claimTtl public void acknowledge(String queue, Collection messageIds) { checkLegalQueueName(queue); requireNonNull(messageIds, "messageIds"); - _eventStore.delete(queue, messageIds, true); } @@ -298,4 +422,104 @@ private void checkLegalQueueName(String queue) { "Allowed punctuation characters are -.:@_ and the queue name may not start with a single underscore character. " + "An example of a valid table name would be 'polloi:provision'."); } -} + /** + * Fetches the necessary Step Function parameters from AWS Parameter Store. + */ + private Map fetchStepFunctionParameters() { + List parameterNames = Arrays.asList( + "/"+ UNIVERSE+ "/emodb/stepfn/stateMachineArn", + "/"+ UNIVERSE+ "/emodb/stepfn/queueThreshold", + "/"+ UNIVERSE+ "/emodb/stepfn/batchSize", + "/"+ UNIVERSE+ "/emodb/stepfn/interval" + ); + + try { + return parameterStoreUtil.getParameters(parameterNames); + } catch (Exception e) { + _log.error("Failed to fetch Step Function parameters from Parameter Store", e); + throw new RuntimeException("Error fetching Step Function parameters", e); + } + } + + /** + * Executes the Step Function for a given topic after it has been created. + */ + + private void startStepFunctionExecution(Map parameters, String queueType, String queueName, String topic) { + try { + String stateMachineArn = parameters.get( "/"+ UNIVERSE+ "/emodb/stepfn/stateMachineArn"); + int queueThreshold = Integer.parseInt(parameters.get( "/"+ UNIVERSE+"/emodb/stepfn/queueThreshold")); + int batchSize = Integer.parseInt(parameters.get ("/"+ UNIVERSE+ "/emodb/stepfn/batchSize")); + int interval = Integer.parseInt(parameters.get( "/"+ UNIVERSE+"/emodb/stepfn/interval")); + + String inputPayload = createInputPayload(queueThreshold, batchSize, queueType, queueName, topic, interval); + + // Create the timestamp + String timestamp = String.valueOf(System.currentTimeMillis()); // Current time in milliseconds + + // Check if queueType is "dedupq" and prepend "D" to execution name if true + String executionName = (queueType.equalsIgnoreCase("dedupq") ? "D_" : "") + queueName + "_" + timestamp; + + // Start the Step Function execution + stepFunctionService.startExecution(stateMachineArn, inputPayload, executionName); + + _log.info("Step Function executed for topic: {} with executionName: {}", topic, executionName); + } catch (Exception e) { + _log.error("Error executing Step Function for topic: {}", topic, e); + throw new RuntimeException("Error executing Step Function for topic: " + topic, e); + } + } + + /** + * Determines the queue type based on the event store. + */ + private String determineQueueType() { + if (_eventStore.getClass().getName().equals("com.bazaarvoice.emodb.event.dedup.DefaultDedupEventStore")) { + return "dedupq"; + } + return "queue"; + } + + private List fetchAllowedQueues() { + try { + return new ArrayList<>(allowedQueuesCache.get(ALLOWED_QUEUES, this::fetchAllowedQueuesFromParamStore)); + } catch (Exception e) { + // Handle the case when the parameter is not found or fetching fails + _log.error("Error fetching allowedQueues in fetchAllowedQueues: " + e.getMessage()); + return Collections.singletonList(""); // Default to an empty list if the parameter is missing + } + + } + + private Set fetchAllowedQueuesFromParamStore() { + try { + // Fetch the 'allowedQueues' parameter using ParameterStoreUtil + String allowedQueuesStr = parameterStoreUtil.getParameter("/" + UNIVERSE + "/emodb/experiment/allowedQueues"); + _log.info("ALLOWED_QUEUES is refreshed"); + return new HashSet<>(Arrays.asList(allowedQueuesStr.split(","))); + } catch (Exception e) { + // Handle the case when the parameter is not found or fetching fails + _log.error("Error fetching allowedQueues: " + e.getMessage()); + return new HashSet<>(Collections.singletonList("")); // Default to an empty list if the parameter is missing + } + } + + private String createInputPayload(int queueThreshold, int batchSize, String queueType, String queueName, String topicName, int interval) { + Map payloadData = new HashMap<>(); + payloadData.put("queueThreshold", queueThreshold); + payloadData.put("batchSize", batchSize); + payloadData.put("queueType", queueType); + payloadData.put("queueName", queueName); + payloadData.put("topicName", topicName); + payloadData.put("interval", interval); + Map wrappedData = new HashMap<>(); + wrappedData.put("executionInput", payloadData); // Wrap the data + try { + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.writeValueAsString(wrappedData); // Convert wrapped data to JSON + } catch (JsonProcessingException e) { + _log.error("Error while converting map to JSON", e); + return "{}"; // Return empty JSON object on error + } + } +} \ No newline at end of file diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java index 0955166218..9ec8d36606 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultDedupQueueService.java @@ -4,7 +4,9 @@ import com.bazaarvoice.emodb.job.api.JobHandlerRegistry; import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.queue.api.DedupQueueService; -import com.codahale.metrics.MetricRegistry; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaAdminService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaProducerService; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; import com.google.inject.Inject; import java.time.Clock; @@ -12,7 +14,7 @@ public class DefaultDedupQueueService extends AbstractQueueService implements DedupQueueService { @Inject public DefaultDedupQueueService(DedupEventStore eventStore, JobService jobService, JobHandlerRegistry jobHandlerRegistry, - Clock clock, MetricRegistry metricRegistry) { - super(eventStore, jobService, jobHandlerRegistry, MoveDedupQueueJob.INSTANCE, clock, metricRegistry); + Clock clock, KafkaAdminService adminService, KafkaProducerService producerService, StepFunctionService stepFunctionService) { + super(eventStore, jobService, jobHandlerRegistry, MoveDedupQueueJob.INSTANCE, clock,adminService,producerService,stepFunctionService ); } } diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java index 947572208d..524ca50033 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/DefaultQueueService.java @@ -4,7 +4,9 @@ import com.bazaarvoice.emodb.job.api.JobHandlerRegistry; import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.queue.api.QueueService; -import com.codahale.metrics.MetricRegistry; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaAdminService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaProducerService; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; import com.google.inject.Inject; import java.time.Clock; @@ -12,7 +14,7 @@ public class DefaultQueueService extends AbstractQueueService implements QueueService { @Inject public DefaultQueueService(EventStore eventStore, JobService jobService, JobHandlerRegistry jobHandlerRegistry, - Clock clock, MetricRegistry metricRegistry) { - super(eventStore, jobService, jobHandlerRegistry, MoveQueueJob.INSTANCE, clock, metricRegistry); + Clock clock, KafkaAdminService adminService, KafkaProducerService producerService, StepFunctionService stepFunctionService) { + super(eventStore, jobService, jobHandlerRegistry, MoveQueueJob.INSTANCE, clock,adminService, producerService,stepFunctionService); } } diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedDedupQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedDedupQueueService.java index 47e24ccf38..b349b19298 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedDedupQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedDedupQueueService.java @@ -91,6 +91,11 @@ public void purge(String apiKey, String queue) { _dedupQueueService.purge(queue); } + @Override + public void sendAll(String apiKey, String queue, Collection messages, boolean isFlush) { + _dedupQueueService.sendAll(queue, messages, isFlush); + } + @Override public void sendAll(String apiKey, Map> messagesByQueue) { _dedupQueueService.sendAll(messagesByQueue); diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedQueueService.java index 5ceea10a8e..cdafc8935e 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/TrustedQueueService.java @@ -95,4 +95,9 @@ public void purge(String apiKey, String queue) { public void sendAll(String apiKey, Map> messagesByQueue) { _queueService.sendAll(messagesByQueue); } + + @Override + public void sendAll(String apiKey, String queue, Collection messages, boolean isFlush) { + + } } diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaAdminService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaAdminService.java new file mode 100644 index 0000000000..9621617ba3 --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaAdminService.java @@ -0,0 +1,120 @@ +package com.bazaarvoice.emodb.queue.core.kafka; + +import org.apache.kafka.clients.admin.AdminClient; +import org.apache.kafka.clients.admin.NewTopic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; + +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import java.util.Collections; + +public class KafkaAdminService { + private static final Logger _log = LoggerFactory.getLogger(KafkaAdminService.class); + private final AdminClient adminClient; + // Cache for the list of all topics with a TTL of 10 minutes + private final Cache> topicListCache = CacheBuilder.newBuilder() + .expireAfterWrite(1, TimeUnit.MINUTES) + .build(); + + private static final String TOPIC_LIST_KEY = "allTopics"; + + + public KafkaAdminService() { + this.adminClient = AdminClient.create(KafkaConfig.getAdminProps()); + } + + /** + * Creates a new Kafka topic with the specified configurations. + * + * @param topic The name of the topic. + * @param numPartitions Number of partitions. + * @param replicationFactor Replication factor. + */ + public Boolean createTopicIfNotExists(String topic, int numPartitions, short replicationFactor, String queueType) { + Boolean isExisting =isTopicExists(topic); + if (! isExisting) { + //create the topic now + NewTopic newTopic = new NewTopic(topic, numPartitions, replicationFactor); + try { + adminClient.createTopics(Collections.singleton(newTopic)).all().get(); + addToCache(topic); + _log.info("Created topic: {} with numPartitions: {} and replication factor {} ", topic, numPartitions, replicationFactor); + } catch (Exception e) { + _log.error("Error creating topic {}: ", topic, e); + throw new RuntimeException(e); + } + } + return isExisting; + } + public void addToCache(String topic){ + Set topics = topicListCache.getIfPresent(TOPIC_LIST_KEY); + if (topics == null) { + topics = new HashSet<>(); + } else { + // Create a new mutable Set if the existing one is unmodifiable + topics = new HashSet<>(topics); + } + topics.add(topic); + topicListCache.put(TOPIC_LIST_KEY, topics); + _log.info("Added newly created topic to cache: {}", topic); + } + + + /** + * Checks if a Kafka topic exists by using a cache to store the list of all topics. + * If the cache entry has expired or the cache is empty, it queries the Kafka AdminClient for the topic list. + *

+ * The cached list has a TTL (Time-To-Live) of 10 minutes, after which it will be refreshed + * from Kafka on the next access. + *

+ * + * @param topic the name of the Kafka topic to check + * @return {@code true} if the topic exists, otherwise {@code false}. + * @throws RuntimeException if there is an error fetching the topic list or checking if the topic exists. + */ + public boolean isTopicExists(String topic) { + try { + // Retrieve the list of topics from the cache + Set topics = topicListCache.get(TOPIC_LIST_KEY, this::fetchTopicListFromKafka); + + // Check if the given topic is in the cached list + return topics.contains(topic); + } catch (ExecutionException e) { + _log.error("Failed to check if topic exists: {}", topic, e); + throw new RuntimeException("Error checking if topic exists", e); + } + } + + /** + * Fetches the list of all topic names from Kafka AdminClient. + * This method is called only when the cache is expired or empty. + * + * @return a Set containing all topic names. + * @throws ExecutionException if there is an error fetching the topic list from Kafka. + */ + private Set fetchTopicListFromKafka() throws ExecutionException { + try { + _log.info("Fetching topic list from Kafka"); + return adminClient.listTopics().names().get(); + } catch (Exception e) { + _log.error("Error fetching topic list from Kafka", e); + throw new ExecutionException(e); + } + } + + /** + * Closes the AdminClient to release resources. + */ + public void close() { + if (adminClient != null) { + adminClient.close(); + } + } +} \ No newline at end of file diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java new file mode 100644 index 0000000000..13011e8bcc --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java @@ -0,0 +1,157 @@ +package com.bazaarvoice.emodb.queue.core.kafka; + +import com.amazonaws.AmazonServiceException; +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement; +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder; +import com.amazonaws.services.simplesystemsmanagement.model.AWSSimpleSystemsManagementException; +import com.amazonaws.services.simplesystemsmanagement.model.GetParametersRequest; +import com.amazonaws.services.simplesystemsmanagement.model.GetParametersResult; +import com.amazonaws.services.simplesystemsmanagement.model.Parameter; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.serialization.StringSerializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +public class KafkaConfig { + private static String bootstrapServersConfig; + private static String batchSizeConfig; + private static String retriesConfig; + private static String lingerMsConfig; + private static final Logger logger = LoggerFactory.getLogger(KafkaConfig.class); + // Static SSM Client and configuration using AWS SDK v1 + private static final AWSSimpleSystemsManagement ssmClient = AWSSimpleSystemsManagementClientBuilder + .standard() + .build(); + + + static { + try { + final String UNIVERSE = getUniverseFromEnv(); + // Load configurations from SSM during static initialization + Map parameterValues = getParameterValues( + Arrays.asList( + "/" + UNIVERSE + "/emodb/kafka/batchSize", + "/" + UNIVERSE + "/emodb/kafka/retries", + "/" + UNIVERSE + "/emodb/kafka/lingerMs", + "/" + UNIVERSE + "/emodb/kafka/bootstrapServers" + ) + ); + + // Set configurations with fallback to defaults if not present + // Sets the batch size for Kafka producer, which controls the amount of data to batch before sending. + batchSizeConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/batchSize", "16384"); + + // Sets the number of retry attempts for failed Kafka message sends. + retriesConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/retries", "3"); + + // Sets the number of milliseconds a producer is willing to wait before sending a batch out + lingerMsConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/lingerMs", "1"); + + // Configures the Kafka broker addresses for producer connections. + bootstrapServersConfig = parameterValues.get("/" + UNIVERSE + "/emodb/kafka/bootstrapServers"); + + logger.info("Kafka configurations loaded successfully from SSM."); + } catch (AmazonServiceException e) { + logger.error("Failed to load configurations from SSM. Using default values.", e); + throw e; + } + catch (Exception e) { + logger.error("Unexpected error occurred while loading configurations from SSM. Using default values.", e); + throw e; + } + } + + public static String getUniverseFromEnv() { + String filePath = "/etc/environment"; + logger.info("Reading environment file: " + filePath); + Properties environmentProps = new Properties(); + + try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) { + String line; + while ((line = reader.readLine()) != null) { + // Skip empty lines or comments + if (line.trim().isEmpty() || line.trim().startsWith("#")) { + continue; + } + // Split the line into key-value pair + String[] parts = line.split("=", 2); + logger.info("parts: " + Arrays.toString(parts)); + if (parts.length == 2) { + String key = parts[0].trim(); + String value = parts[1].trim(); + // Remove any surrounding quotes from value + value = value.replace("\"", ""); + environmentProps.put(key, value); + } + } + // Access the environment variables + return environmentProps.getProperty("UNIVERSE"); + } catch (IOException e) { + logger.error("Error reading environment file: " + e.getMessage()); + throw new RuntimeException("Error reading environment file: " + e.getMessage()); + } + } + // Fetch parameters from AWS SSM using AWS SDK v1 + private static Map getParameterValues(List parameterNames) { + try { + GetParametersRequest request = new GetParametersRequest() + .withNames(parameterNames) + .withWithDecryption(true); + + GetParametersResult response = ssmClient.getParameters(request); + + return response.getParameters().stream() + .collect(Collectors.toMap(Parameter::getName, Parameter::getValue)); + } catch (AWSSimpleSystemsManagementException e) { + logger.error("Error fetching parameters from SSM.", e); + throw e; // Rethrow or handle the exception if necessary + } + } + + // Kafka Producer properties + public static Properties getProducerProps() { + Properties producerProps = new Properties(); + + producerProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServersConfig); + producerProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); + producerProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); + producerProps.put(ProducerConfig.ACKS_CONFIG, "all"); + producerProps.put(ProducerConfig.RETRIES_CONFIG, Integer.parseInt(retriesConfig)); + producerProps.put(ProducerConfig.LINGER_MS_CONFIG, Integer.parseInt(lingerMsConfig)); + producerProps.put(ProducerConfig.BATCH_SIZE_CONFIG, Integer.parseInt(batchSizeConfig)); + producerProps.put(ProducerConfig.BUFFER_MEMORY_CONFIG, 33554432); // Default buffer memory setting + logger.info("Kafka Producer properties initialized."); + return producerProps; + } + + // Kafka Admin properties + public static Properties getAdminProps() { + Properties adminProps = new Properties(); + + adminProps.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServersConfig); + logger.info("Kafka Admin properties initialized."); + return adminProps; + } + + // Ensure the SSM client is closed when the application shuts down + public static void shutdown() { + if (ssmClient != null) { + try { + ssmClient.shutdown(); + logger.info("SSM client closed successfully."); + } catch (Exception e) { + logger.error("Error while closing SSM client.", e); + } + } + } +} \ No newline at end of file diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java new file mode 100644 index 0000000000..1a7cc72eee --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java @@ -0,0 +1,66 @@ +package com.bazaarvoice.emodb.queue.core.kafka; + +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Future; + +public class KafkaProducerService { + private static final Logger _log = LoggerFactory.getLogger(KafkaProducerService.class); + private final KafkaProducer producer; // Changed to String + + public KafkaProducerService() { + this.producer = new KafkaProducer<>(KafkaConfig.getProducerProps()); + _log.info("KafkaProducerService initialized with producer properties: {}", KafkaConfig.getProducerProps()); + } + + /** + * Sends each message from the collection to the specified Kafka topic separately. + * + * @param topic The Kafka topic. + * @param events The collection of messages to be sent. + */ + public void sendMessages(String topic, Collection events, String queueType) { + LocalDateTime startTime = LocalDateTime.now(); + _log.info("Sending {} messages to topic '{}'", events.size(), topic); + List> futures = new ArrayList<>(); + // Use async sendMessage and collect futures + for (String event : events) { + futures.add(producer.send(new ProducerRecord<>(topic, event))); + } + + // Wait for all futures to complete + for (Future future : futures) { + try { + future.get(); // Only blocks if a future is not yet complete + } catch (Exception e) { + _log.error("Error while sending message to Kafka: {}", e.getMessage()); + throw new RuntimeException("Error sending messages to Kafka", e); + } + } + _log.info("Finished sending messages to topic '{}' time taken : {} milliseconds", topic, Duration.between(startTime,LocalDateTime.now()).toMillis()); + } + + + /** + * Closes the producer to release resources. + */ + public void close() { + _log.info("Closing Kafka producer."); + try { + producer.flush(); + producer.close(); + } catch (Exception e) { + _log.error("Error while closing Kafka producer: ", e); + throw e; + } + } +} \ No newline at end of file diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java new file mode 100644 index 0000000000..d2d65c144f --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java @@ -0,0 +1,107 @@ +package com.bazaarvoice.emodb.queue.core.ssm; + +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement; +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder; +import com.amazonaws.services.simplesystemsmanagement.model.GetParameterRequest; +import com.amazonaws.services.simplesystemsmanagement.model.GetParameterResult; +import com.amazonaws.services.simplesystemsmanagement.model.GetParametersRequest; +import com.amazonaws.services.simplesystemsmanagement.model.GetParametersResult; +import com.amazonaws.services.simplesystemsmanagement.model.ParameterNotFoundException; +import com.amazonaws.services.simplesystemsmanagement.model.AWSSimpleSystemsManagementException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Utility class for interacting with AWS Parameter Store using AWS SDK v1. + */ +public class ParameterStoreUtil { + + private static final Logger logger = LoggerFactory.getLogger(ParameterStoreUtil.class); + private final AWSSimpleSystemsManagement ssmClient; + + /** + * Constructor to initialize the SSM client + */ + public ParameterStoreUtil() { + // Create SSM client with default credentials and region + ssmClient = AWSSimpleSystemsManagementClientBuilder.standard() + .build(); + } + + /** + * Fetches a parameter from AWS Parameter Store. + * + * @param parameterName The name of the parameter to fetch + * @return The value of the parameter + * @throws IllegalArgumentException If the parameterName is null or empty + */ + public String getParameter(String parameterName) { + if (parameterName == null || parameterName.isEmpty()) { + logger.error("Parameter name cannot be null or empty"); + throw new IllegalArgumentException("Parameter name cannot be null or empty"); + } + + try { + + GetParameterRequest request = new GetParameterRequest().withName(parameterName); + GetParameterResult result = ssmClient.getParameter(request); + return result.getParameter().getValue(); + + } catch (ParameterNotFoundException e) { + logger.error("Parameter not found: {}", parameterName, e); + throw new RuntimeException("Parameter not found: " + parameterName, e); + + } catch (AWSSimpleSystemsManagementException e) { + logger.error("Error fetching parameter from AWS SSM: {}", e.getMessage(), e); + throw new RuntimeException("Error fetching parameter from AWS SSM: " + parameterName, e); + + } catch (Exception e) { + logger.error("Unexpected error while fetching parameter: {}", parameterName, e); + throw new RuntimeException("Unexpected error fetching parameter: " + parameterName, e); + } + } + + /** + * Fetches multiple parameters from AWS Parameter Store in a batch. + * + * @param parameterNames The list of parameter names to fetch + * @return A map of parameter names to their values + * @throws IllegalArgumentException If the parameterNames list is null or empty + */ + public Map getParameters(List parameterNames) { + if (parameterNames == null || parameterNames.isEmpty()) { + logger.error("Parameter names list cannot be null or empty"); + throw new IllegalArgumentException("Parameter names list cannot be null or empty"); + } + + try { + + GetParametersRequest request = new GetParametersRequest().withNames(parameterNames); + GetParametersResult result = ssmClient.getParameters(request); + + // Map the result to a Map of parameter names and values + Map parameters = new HashMap<>(); + result.getParameters().forEach(param -> parameters.put(param.getName(), param.getValue())); + + // Log any parameters that were not found + if (!result.getInvalidParameters().isEmpty()) { + logger.warn("The following parameters were not found: {}", result.getInvalidParameters()); + } + + return parameters; + + } catch (AWSSimpleSystemsManagementException e) { + logger.error("Error fetching parameters from AWS SSM: {}", e.getMessage(), e); + throw new RuntimeException("Error fetching parameters from AWS SSM: " + parameterNames, e); + + } catch (Exception e) { + logger.error("Unexpected error while fetching parameters: {}", parameterNames, e); + throw new RuntimeException("Unexpected error fetching parameters: " + parameterNames, e); + } + } + +} diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java new file mode 100644 index 0000000000..ec4165d03f --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java @@ -0,0 +1,62 @@ +package com.bazaarvoice.emodb.queue.core.stepfn; + + +import com.amazonaws.services.stepfunctions.AWSStepFunctions; +import com.amazonaws.services.stepfunctions.AWSStepFunctionsClientBuilder; +import com.amazonaws.services.stepfunctions.model.StartExecutionRequest; +import com.amazonaws.services.stepfunctions.model.StartExecutionResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Service to interact with AWS Step Functions using AWS SDK v1. + */ +public class StepFunctionService { + + private static final Logger logger = LoggerFactory.getLogger(StepFunctionService.class); + + private final AWSStepFunctions stepFunctionsClient; + + /** + * Constructor to initialize Step Function Client with AWS region and credentials. + */ + public StepFunctionService() { + this.stepFunctionsClient = AWSStepFunctionsClientBuilder.standard() + .build(); + } + + /** + * Starts the execution of a Step Function with the given state machine ARN and input payload. + * + * @param stateMachineArn ARN of the state machine + * @param inputPayload Input for the state machine execution + * @throws IllegalArgumentException If the stateMachineArn is invalid + */ + public void startExecution(String stateMachineArn, String inputPayload, String executionName) { + if (stateMachineArn == null || stateMachineArn.isEmpty()) { + logger.error("State Machine ARN cannot be null or empty"); + throw new IllegalArgumentException("State Machine ARN cannot be null or empty"); + } + + if (inputPayload == null) { + logger.warn("Input payload is null; using empty JSON object"); + inputPayload = "{}"; // Default to empty payload if null + } + + try { + StartExecutionRequest startExecutionRequest = new StartExecutionRequest() + .withStateMachineArn(stateMachineArn) + .withInput(inputPayload) + .withName(executionName); + + StartExecutionResult startExecutionResult = stepFunctionsClient.startExecution(startExecutionRequest); + + logger.info("Successfully started execution for state machine ARN: {}", stateMachineArn); + logger.debug("Execution ARN: {}", startExecutionResult.getExecutionArn()); + + } catch (Exception e) { + logger.error("Unexpected error occurred during Step Function execution: {}", e.getMessage(), e); + throw e; + } + } +} \ No newline at end of file diff --git a/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java b/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java index 90a0ea837d..0ac9a0ed89 100644 --- a/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java +++ b/queue/src/test/java/com/bazaarvoice/emodb/queue/core/SizeQueueCacheTest.java @@ -4,7 +4,10 @@ import com.bazaarvoice.emodb.job.api.JobHandlerRegistry; import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.job.api.JobType; -import com.codahale.metrics.MetricRegistry; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaAdminService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaProducerService; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; +import org.apache.kafka.clients.consumer.KafkaConsumer; import org.testng.annotations.Test; import java.time.Clock; @@ -38,7 +41,7 @@ public void testSizeCache() { BaseEventStore mockEventStore = mock(BaseEventStore.class); AbstractQueueService queueService = new AbstractQueueService(mockEventStore, mock(JobService.class), - mock(JobHandlerRegistry.class), mock(JobType.class), clock, new MetricRegistry()){}; + mock(JobHandlerRegistry.class), mock(JobType.class), clock, mock(KafkaAdminService.class), mock(KafkaProducerService.class), mock(StepFunctionService.class)){}; // At limit=500, size estimate should be at 4800 // At limit=50, size estimate should be at 5000 diff --git a/sdk/pom.xml b/sdk/pom.xml index e8f8b7eb5b..e264ab8e53 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index d7bc799c60..058e8c28ba 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 8028d79623..f345505763 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 4141cd9d99..dafa84a916 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 100d90210e..1496ad9d31 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index d2a61758ef..7112bfafe4 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index e4592dd6b0..7d962487cf 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index b9ba2a6008..7b15c45c05 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 38984d2abd..a422db8bd9 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 55aae7fdb8..82bfb686b4 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 4535e14494..6692d548cc 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index eadb8ccbf7..a8a2619eae 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java index 00c380af6a..b86b38943d 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/blob/BlobStoreResource1.java @@ -381,8 +381,6 @@ public Collection getTablePlacements(@Authenticated Subject subject) { _getTablePlacementsRequestsByApiKey.getUnchecked(subject.getId()).mark(); return _blobStore.getTablePlacements(); } - - /** * Retrieves the current version of a piece of content from the data store. */ @@ -600,4 +598,4 @@ private Supplier onceOnlySupplier(final InputStream in) { return in; }; } -} +} \ No newline at end of file diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java index c6dcd408fc..88e0a04dbc 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/DedupQueueResource1.java @@ -110,6 +110,20 @@ public SuccessResponse sendBatch(@PathParam("queue") String queue, Collection messages) { + // Not partitioned--any server can write messages to Cassandra. + _queueService.sendAll(queue, messages,true); + return SuccessResponse.instance(); + } @POST @Path("_sendbatch") @@ -154,6 +168,18 @@ public long getMessageCount(@QueryParam("partitioned") BooleanParam partitioned, } } + @GET + @Path("{queue}/uncached_size") + @RequiresPermissions("queue|get_status|{queue}") + @Timed(name = "bv.emodb.dedupq.DedupQueueResource1.getUncachedMessageCount", absolute = true) + @ApiOperation (value = "gets the uncached Message count.", + notes = "Returns a long.", + response = long.class + ) + public long getUncachedMessageCount(@PathParam("queue") String queue) { + return _queueService.getUncachedSize(queue); + } + @GET @Path("{queue}/claimcount") diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java index ff6334db05..e0a312c623 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java @@ -35,6 +35,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import java.nio.ByteBuffer; import java.util.Collection; import java.util.List; import java.util.Map; @@ -120,6 +121,24 @@ public SuccessResponse sendBatch(@PathParam("queue") String queue, Collection events) { + //TODO change query param name / type + // Not partitioned--any server can write messages to Cassandra. + _queueService.sendAll(queue, events, true); + return SuccessResponse.instance(); + } + @POST @Path("_sendbatch") @Consumes(MediaType.APPLICATION_JSON) @@ -162,6 +181,17 @@ public long getMessageCount(@PathParam("queue") String queue, @QueryParam("limit } } + @GET + @Path("{queue}/uncached_size") + @RequiresPermissions("queue|get_status|{queue}") + @Timed(name = "bv.emodb.queue.QueueResource1.getUncachedMessageCount", absolute = true) + @ApiOperation (value = "gets the uncached Message count.", + notes = "Returns a long.", + response = long.class + ) + public long getUncachedMessageCount(@PathParam("queue") String queue) { + return _queueService.getUncachedSize(queue); + } @GET @Path("{queue}/claimcount") diff --git a/yum/pom.xml b/yum/pom.xml index adee7cf547..6ae9e54f04 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.171-SNAPSHOT + 6.5.204-SNAPSHOT ../parent/pom.xml From ecda251cb241516e2f810d91cb1ec1e2a1d97b1c Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 28 Oct 2024 15:29:44 +0000 Subject: [PATCH 19/29] branch admin -prepare release emodb-6.5.204 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index ab46219a7b..c96d8708cb 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 47d5f4efaf..0a2bee7b47 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index d26ad49c09..0e2bf926da 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index eb0a847c96..245506e4c8 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.204-SNAPSHOT + 6.5.204 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index afd6ecd6ac..50096c8d15 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 6a0eee4600..fab02b97f1 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index ec09f2ce5b..84867f0625 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 5468bebabd..408fc39353 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 4fb2a01b7e..92fc54d627 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 0db4d08c7f..f94e050b9b 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index d62a8bed9e..ec2f5ee723 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 4223f7b9e8..3313ac74cd 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 9e9c6703aa..d632ef36d6 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 6cab40d632..cd901e67be 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 31d3091f1f..568043138b 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index dfc1de40a8..5ce0273a67 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index f20cab0356..98c7733a19 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index ba557a73be..7a8fb3fe43 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 79b959eedd..35162c83e1 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 31f76da7c4..0c879da510 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 29937806ae..9d6838ec8f 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index c38ed11a39..d6d1bbc88f 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 4329e99b6f..33fd1a7395 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index cb01c070d3..fb9ac15c59 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 37e78784d4..8b3f0f15c1 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 5089064103..05b32a839f 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 3f432b89bd..02a3610fdd 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index cf7c210112..4a9b24d731 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index c622d59922..bee403251f 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index d78652fb72..245ce52356 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index c070b6444b..d7d8ef4a75 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 1c579e5c28..562ba6baf2 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 99ec131913..a3a7e0bf05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.204 diff --git a/plugins/pom.xml b/plugins/pom.xml index e540c2d93b..92bbbe4b02 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index f2dddf3f53..d8c4c9876e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.204 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 8246c931bb..0b7aec33d4 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 8d6e028d0e..7eec5df2ee 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 54c0c33595..50ec4fcaf4 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index d61cd7eb60..53ffb1e34b 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index b1de7085d4..c642e65a2e 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index e4c065cc3a..8c662e07d3 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 67a621be8b..62d369dad3 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index e264ab8e53..1b05a1d7e0 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 058e8c28ba..65dcb778c2 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index f345505763..4a8d1160da 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index dafa84a916..8afb698c96 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 1496ad9d31..4d3b61e0a7 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 7112bfafe4..29deae2080 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 7d962487cf..69766118ce 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 7b15c45c05..97e7a1468a 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index a422db8bd9..8ca0313f6b 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 82bfb686b4..2adcc41568 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 6692d548cc..e40c2d661f 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index a8a2619eae..fa04324999 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 6ae9e54f04..713b342172 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204-SNAPSHOT + 6.5.204 ../parent/pom.xml From a34455719bdf49be978016df8e586359faf70a8b Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 28 Oct 2024 15:29:45 +0000 Subject: [PATCH 20/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index c96d8708cb..796cf6ba45 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 0a2bee7b47..c92569720a 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 0e2bf926da..b376c46858 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 245506e4c8..4b364c87cd 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.204 + 6.5.205-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 50096c8d15..a2ca881d88 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index fab02b97f1..7eb85bd767 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 84867f0625..9acc0a03b6 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 408fc39353..2f2dd1dfb4 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 92fc54d627..39598e29bb 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index f94e050b9b..f28a4d0361 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index ec2f5ee723..91ad32bf80 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 3313ac74cd..f9d2f9b184 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index d632ef36d6..386fe77543 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index cd901e67be..98c0636af8 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 568043138b..b061d2593a 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 5ce0273a67..7497d6f5e8 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 98c7733a19..28f181ade5 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 7a8fb3fe43..4677765c64 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 35162c83e1..37c652b0eb 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 0c879da510..6a70e7ca21 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 9d6838ec8f..61919516b8 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index d6d1bbc88f..a06b547200 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 33fd1a7395..8a0ed365f9 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index fb9ac15c59..be936e3ae6 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 8b3f0f15c1..7c9dab8850 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 05b32a839f..7efe1fb644 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 02a3610fdd..f2e61457c4 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 4a9b24d731..17c5654cd6 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index bee403251f..d245afbd9a 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 245ce52356..e8d993d42f 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index d7d8ef4a75..01cd9ac276 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 562ba6baf2..0da2ca4e4e 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index a3a7e0bf05..4982822cf1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.204 + emodb-6.5.98 diff --git a/plugins/pom.xml b/plugins/pom.xml index 92bbbe4b02..bcdc8c9433 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index d8c4c9876e..ad99f57870 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.204 + emodb-6.5.98 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 0b7aec33d4..f577ab1224 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 7eec5df2ee..24ba2fc7a9 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 50ec4fcaf4..284f187d45 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 53ffb1e34b..6ce174aa59 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index c642e65a2e..062f708470 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 8c662e07d3..f233b22dbd 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 62d369dad3..0ec14488a6 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 1b05a1d7e0..c38a76529d 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 65dcb778c2..92a51e19b4 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 4a8d1160da..eeda20a7da 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 8afb698c96..b596c8954e 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 4d3b61e0a7..0b1a8c727d 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 29deae2080..4adf86fdc3 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 69766118ce..c0c8d86ce2 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 97e7a1468a..1298413f2b 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 8ca0313f6b..392bbb0d28 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 2adcc41568..e583ba615c 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index e40c2d661f..33013ccfd8 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index fa04324999..8bc7cd02ef 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 713b342172..b4c6f8e3a5 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.204 + 6.5.205-SNAPSHOT ../parent/pom.xml From 387db36febfbbc424077619426518910b8717cac Mon Sep 17 00:00:00 2001 From: nabajyotiDash-hub <80683084+nabajyotiDash-hub@users.noreply.github.com> Date: Wed, 6 Nov 2024 23:10:32 +0530 Subject: [PATCH 21/29] Databus Throttling Changes (#847) * feat: execution name sanitization and unit test for stepfn * master_size api changes * Admin API changes (#845) 1. /UpdateParameterStore 2. /QueueExecutionAttributes// * PD-257044-changes-for-databus (#846) * added datadog metrics changes * [PD-257044] databus changes rebase (#848) * PD-257044-changes-for-databus * duplicated kafka and ssm util packages in emo sor module * removed redundant dependencies * admin api and queue name split * Pd 257044 databus changes rebase (#849) * PD-257044-changes-for-databus * duplicated kafka and ssm util packages in emo sor module * removed redundant dependencies * additional changes * additional changes * additional changes * removed unneccessary dependencies * Revert "added datadog metrics changes" This reverts commit 62dc31e1908cb049549a206ed53853f34473d2f5. * build fix * endpoint change and databus changes * updated updateRefInDatabus method * address review commnets * branch admin -prepare release emodb-6.5.205 * branch admin -prepare for next development iteration --------- Co-authored-by: Rishu Yadav Co-authored-by: shanmohammed-bv Co-authored-by: Anurag Dubey Co-authored-by: Anandu Jayan Co-authored-by: jenkins --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- .../emodb/databus/api/Databus.java | 4 + databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- .../emodb/databus/core/DatabusFactory.java | 5 + .../emodb/databus/core/DefaultDatabus.java | 12 + .../emodb/databus/core/OwnerAwareDatabus.java | 3 + datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 +- plugins/pom.xml | 2 +- pom.xml | 4 +- quality/integration/pom.xml | 2 +- .../auth/TableAuthIdentityManagerDAOTest.java | 8 +- .../auth/TableRoleManagerDAOTest.java | 8 +- .../integration/sor/CasStashTableTest.java | 3 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- .../emodb/queue/api/BaseQueueService.java | 5 + .../emodb/queue/api/DedupQueueService.java | 5 + .../emodb/queue/api/QueueService.java | 10 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- .../bazaarvoice/emodb/queue/QueueModule.java | 5 +- .../queue/core/AbstractQueueService.java | 7 +- .../core/Entities/ExecutionInputWrapper.java | 14 + .../Entities/QueueExecutionAttributes.java | 109 +++++ .../emodb/queue/core/kafka/KafkaConfig.java | 2 +- .../core/kafka/KafkaProducerService.java | 2 +- .../queue/core/ssm/ParameterStoreUtil.java | 20 + .../core/stepfn/StepFunctionService.java | 374 +++++++++++++++++- .../emodb/queue/QueueModuleTest.java | 3 + .../core/stepfn/StepFunctionServiceTest.java | 199 ++++++++++ sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- .../bazaarvoice/emodb/sor/api/DataStore.java | 6 + .../com/bazaarvoice/emodb/sor/api/Names.java | 2 + .../emodb/sor/api/UpdateRefModel.java | 63 +++ sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 10 +- .../emodb/sor/DataStoreModule.java | 2 + .../emodb/sor/core/DefaultDataStore.java | 114 ++++-- .../sor/core/test/InMemoryDataStore.java | 14 +- .../emodb/sor/kafka/KafkaConfig.java | 148 +++++++ .../emodb/sor/kafka/KafkaProducerService.java | 66 ++++ .../emodb/sor/ssm/ParameterStoreUtil.java | 120 ++++++ .../emodb/sor/core/CompactorTest.java | 5 +- .../emodb/sor/core/DataStoreTest.java | 8 +- .../emodb/sor/core/MinSplitSizeTest.java | 3 +- .../emodb/sor/core/RedundantDeltaTest.java | 15 +- .../emodb/sor/core/SorUpdateTest.java | 4 +- .../emodb/sor/test/MultiDCDataStores.java | 7 +- .../table/db/astyanax/TableLifeCycleTest.java | 3 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- .../databus/AbstractSubjectDatabus.java | 5 + .../resources/databus/DatabusResource1.java | 12 + .../web/resources/databus/SubjectDatabus.java | 2 + .../web/resources/queue/QueueResource1.java | 40 ++ .../web/resources/sor/DataStoreResource1.java | 67 +++- .../emodb/web/purge/PurgeTest.java | 3 +- .../emodb/web/scanner/ScanUploaderTest.java | 6 +- .../DataStoreScanStatusDAOTest.java | 4 +- .../DataStoreStashRequestDAOTest.java | 4 +- .../web/settings/SettingsManagerTest.java | 3 +- yum/pom.xml | 2 +- 101 files changed, 1489 insertions(+), 157 deletions(-) create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/ExecutionInputWrapper.java create mode 100644 queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/QueueExecutionAttributes.java create mode 100644 queue/src/test/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionServiceTest.java create mode 100644 sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java create mode 100644 sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaConfig.java create mode 100644 sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaProducerService.java create mode 100644 sor/src/main/java/com/bazaarvoice/emodb/sor/ssm/ParameterStoreUtil.java diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 796cf6ba45..1890a704a5 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index c92569720a..523af72412 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index b376c46858..b611c249b5 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 4b364c87cd..59a7d10563 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index a2ca881d88..5d7b92e667 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 7eb85bd767..a3590ed25f 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 9acc0a03b6..771fdf0354 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 2f2dd1dfb4..d7e1c2fcef 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 39598e29bb..0e243280df 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index f28a4d0361..874dca3e62 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 91ad32bf80..51fff44d63 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index f9d2f9b184..4675d2f463 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 386fe77543..d4b2e57e73 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 98c0636af8..7cb8297b46 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index b061d2593a..2003d93270 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 7497d6f5e8..b19cb6b489 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 28f181ade5..6eaf3310ee 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 4677765c64..83dc90371a 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 37c652b0eb..af7efbd3b8 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 6a70e7ca21..4cf563bb24 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 61919516b8..7e07c275bc 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index a06b547200..826efd6eac 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/databus-api/src/main/java/com/bazaarvoice/emodb/databus/api/Databus.java b/databus-api/src/main/java/com/bazaarvoice/emodb/databus/api/Databus.java index 1a106eedc8..45206ee902 100644 --- a/databus-api/src/main/java/com/bazaarvoice/emodb/databus/api/Databus.java +++ b/databus-api/src/main/java/com/bazaarvoice/emodb/databus/api/Databus.java @@ -52,6 +52,10 @@ Subscription getSubscription(String subscription) */ long getEventCountUpTo(String subscription, long limit); + default long getMasterCount(){ + return 0; + }; + /** Counts the number of events with outstanding claims that cause the events to be skipped by {@link #poll}. */ long getClaimCount(String subscription); diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 8a0ed365f9..739a9e4916 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index be936e3ae6..3d9abfe14f 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 7c9dab8850..6adb088d7e 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 7efe1fb644..810134724e 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DatabusFactory.java b/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DatabusFactory.java index b0f72adc7e..3c2cc1b3c0 100644 --- a/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DatabusFactory.java +++ b/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DatabusFactory.java @@ -78,6 +78,11 @@ public long getEventCountUpTo(String subscription, long limit) { return _ownerAwareDatabus.getEventCountUpTo(ownerId, subscription, limit); } + @Override + public long getMasterCount() { + return _ownerAwareDatabus.getMasterEventCountUncached(ownerId); + } + @Override public long getClaimCount(String subscription) { return _ownerAwareDatabus.getClaimCount(ownerId, subscription); diff --git a/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DefaultDatabus.java b/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DefaultDatabus.java index d9a761d562..128a835d90 100644 --- a/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DefaultDatabus.java +++ b/databus/src/main/java/com/bazaarvoice/emodb/databus/core/DefaultDatabus.java @@ -411,6 +411,18 @@ public long getEventCount(String ownerId, String subscription) { return getEventCountUpTo(ownerId, subscription, Long.MAX_VALUE); } + @Override + public long getMasterEventCountUncached(String ownerId) { + _log.info("Inside getMasterEventCountUncached with _masterFanoutChannels length {}", _masterFanoutChannels.size()); + long size = 0; + for(String channel : _masterFanoutChannels) { + size += _eventStore.getSizeEstimate(channel, Long.MAX_VALUE); + _log.info("From channel size {} {}:", channel, size); + } + return size; + } + + @Override public long getEventCountUpTo(String ownerId, String subscription, long limit) { checkSubscriptionOwner(ownerId, subscription); diff --git a/databus/src/main/java/com/bazaarvoice/emodb/databus/core/OwnerAwareDatabus.java b/databus/src/main/java/com/bazaarvoice/emodb/databus/core/OwnerAwareDatabus.java index d6ee266fb8..8c3117693b 100644 --- a/databus/src/main/java/com/bazaarvoice/emodb/databus/core/OwnerAwareDatabus.java +++ b/databus/src/main/java/com/bazaarvoice/emodb/databus/core/OwnerAwareDatabus.java @@ -41,6 +41,9 @@ Subscription getSubscription(String ownerId, String subscription) long getEventCount(String ownerId, String subscription) throws UnauthorizedSubscriptionException; + public long getMasterEventCountUncached(String ownerId) + throws UnauthorizedSubscriptionException; + long getEventCountUpTo(String ownerId, String subscription, long limit) throws UnauthorizedSubscriptionException; diff --git a/datacenter/pom.xml b/datacenter/pom.xml index f2e61457c4..016d15560d 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 17c5654cd6..5112994bcf 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index d245afbd9a..2cbd6ef1b4 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index e8d993d42f..394a0a1d3f 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 01cd9ac276..d2e6de7ccf 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 0da2ca4e4e..c2e44a8941 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 4982822cf1..3c38e1aa12 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.208-SNAPSHOT diff --git a/plugins/pom.xml b/plugins/pom.xml index bcdc8c9433..0adfbc7572 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index ad99f57870..3c51863038 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.98 + emodb-6.5.208-SNAPSHOT diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index f577ab1224..4deee0ebee 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../../parent/pom.xml diff --git a/quality/integration/src/test/java/test/integration/auth/TableAuthIdentityManagerDAOTest.java b/quality/integration/src/test/java/test/integration/auth/TableAuthIdentityManagerDAOTest.java index c09cceaa38..541c385863 100644 --- a/quality/integration/src/test/java/test/integration/auth/TableAuthIdentityManagerDAOTest.java +++ b/quality/integration/src/test/java/test/integration/auth/TableAuthIdentityManagerDAOTest.java @@ -8,6 +8,7 @@ import com.bazaarvoice.emodb.sor.api.Intrinsic; import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.uuid.TimeUUIDs; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; @@ -22,6 +23,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; @@ -38,7 +40,7 @@ public class TableAuthIdentityManagerDAOTest { */ @Test public void testRebuildIdIndex() { - DataStore dataStore = new InMemoryDataStore(new MetricRegistry()); + DataStore dataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); Supplier idSupplier = () -> "id0"; TableAuthIdentityManagerDAO tableAuthIdentityManagerDAO = new TableAuthIdentityManagerDAO<>( ApiKey.class, dataStore, "__auth:keys", "__auth:internal_ids", "app_global:sys", @@ -76,7 +78,7 @@ public void testRebuildIdIndex() { @Test public void testGrandfatheredInId() { - DataStore dataStore = new InMemoryDataStore(new MetricRegistry()); + DataStore dataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); Supplier idSupplier = () -> "id0"; TableAuthIdentityManagerDAO tableAuthIdentityManagerDAO = new TableAuthIdentityManagerDAO<>( ApiKey.class, dataStore, "__auth:keys", "__auth:internal_ids", "app_global:sys", @@ -128,7 +130,7 @@ public void testGrandfatheredInId() { @Test public void testIdAttributeCompatibility() { - DataStore dataStore = new InMemoryDataStore(new MetricRegistry()); + DataStore dataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); Supplier idSupplier = () -> "id0"; TableAuthIdentityManagerDAO tableAuthIdentityManagerDAO = new TableAuthIdentityManagerDAO<>( ApiKey.class, dataStore, "__auth:keys", "__auth:internal_ids", "app_global:sys", diff --git a/quality/integration/src/test/java/test/integration/auth/TableRoleManagerDAOTest.java b/quality/integration/src/test/java/test/integration/auth/TableRoleManagerDAOTest.java index 6b02653a6c..409d5193db 100644 --- a/quality/integration/src/test/java/test/integration/auth/TableRoleManagerDAOTest.java +++ b/quality/integration/src/test/java/test/integration/auth/TableRoleManagerDAOTest.java @@ -18,6 +18,7 @@ import com.bazaarvoice.emodb.sor.api.WriteConsistency; import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.web.auth.EmoPermissionResolver; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableList; @@ -36,10 +37,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; @@ -63,7 +61,7 @@ public class TableRoleManagerDAOTest { @BeforeMethod public void setUp() { // DataStore and PermissionManager are fairly heavy to fully mock. Use spies on in-memory implementations instead - _backendDataStore = new InMemoryDataStore(new MetricRegistry()); + _backendDataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); _dataStore = spy(_backendDataStore); _permissionResolver = new EmoPermissionResolver(null, null); _backendPermissionManager = new InMemoryPermissionManager(_permissionResolver); diff --git a/quality/integration/src/test/java/test/integration/sor/CasStashTableTest.java b/quality/integration/src/test/java/test/integration/sor/CasStashTableTest.java index a90855e41e..814e6d3f36 100644 --- a/quality/integration/src/test/java/test/integration/sor/CasStashTableTest.java +++ b/quality/integration/src/test/java/test/integration/sor/CasStashTableTest.java @@ -17,6 +17,7 @@ import com.bazaarvoice.emodb.sor.db.astyanax.DeltaPlacementFactory; import com.bazaarvoice.emodb.sor.delta.Delta; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.table.db.Table; import com.bazaarvoice.emodb.table.db.astyanax.AstyanaxTableDAO; import com.bazaarvoice.emodb.table.db.astyanax.CQLStashTableDAO; @@ -97,7 +98,7 @@ public void setup() throws Exception { _astyanaxTableDAO.setCQLStashTableDAO(cqlStashTableDAO); // Don't store table definitions in the actual backing store so as not to interrupt other tests. Use a // private in-memory implementation. - _tableBackingStore = new InMemoryDataStore(new MetricRegistry()); + _tableBackingStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); _astyanaxTableDAO.setBackingStore(_tableBackingStore); _lifeCycleRegistry.start(); diff --git a/quality/pom.xml b/quality/pom.xml index 24ba2fc7a9..582cd1812d 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 284f187d45..639dbef3b1 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java index 3f5fd99950..714121e0e7 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/BaseQueueService.java @@ -27,6 +27,11 @@ public interface BaseQueueService { */ long getMessageCount(String queue); + /** + * Get the queue size without caching + *

+ * returns long + */ default long getUncachedSize(String queue){ return 0; } diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java index a6dc77515b..5952c87b08 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/DedupQueueService.java @@ -15,6 +15,7 @@ public interface DedupQueueService extends BaseQueueService { void sendAll(Map> messagesByQueue); + //Overloaded sendAll method to send to cassandra void sendAll(String queue, Collectionmessages, boolean isFlush); /** @@ -26,6 +27,10 @@ public interface DedupQueueService extends BaseQueueService { */ long getMessageCount(String queue); + default long getUncachedSize(String queue){ + return 0; + } + /** * Counts the total number of messages for the specified queue, accurate up to the specified limit. Beyond the * specified limit the message count will be a rough estimate, allowing the caller to make the trade-off between diff --git a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java index 4d533c755e..c71e80d4d1 100644 --- a/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java +++ b/queue-api/src/main/java/com/bazaarvoice/emodb/queue/api/QueueService.java @@ -13,7 +13,6 @@ public interface QueueService extends BaseQueueService { void sendAll(String queue, Collection messages); - void sendAll(Map> messagesByQueue); //Overloaded sendAll method to send to cassandra @@ -28,6 +27,15 @@ public interface QueueService extends BaseQueueService { */ long getMessageCount(String queue); + /** + * Get the queue size without caching + *

+ * returns long + */ + default long getUncachedSize(String queue){ + return 0; + } + /** * Counts the total number of messages for the specified queue, accurate up to the specified limit. Beyond the * specified limit the message count will be a rough estimate, allowing the caller to make the trade-off between diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 6ce174aa59..906e8d8eba 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 062f708470..2e393c164c 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index f233b22dbd..56cde86315 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 0ec14488a6..fa82ee16cd 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java index b42d33b02c..dac7ec6975 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/QueueModule.java @@ -84,15 +84,12 @@ protected void configure() { bind(DedupEventStoreChannels.class).toInstance(DedupEventStoreChannels.isolated("__dedupq_write:", "__dedupq_read:")); bind(new TypeLiteral>() {}).annotatedWith(DedupEnabled.class).toInstance(Suppliers.ofInstance(true)); install(new EventStoreModule("bv.emodb.queue", _metricRegistry)); - - // Bind Kafka services - bind (KafkaAdminService.class).asEagerSingleton(); + bind(KafkaAdminService.class).asEagerSingleton(); bind(KafkaProducerService.class).asEagerSingleton(); // Bind Step Function Service bind(StepFunctionService.class).asEagerSingleton(); - // Bind the Queue instance that the rest of the application will consume bind(QueueService.class).to(DefaultQueueService.class).asEagerSingleton(); expose(QueueService.class); diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java index 0793a08b2a..c16657aa96 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/AbstractQueueService.java @@ -454,12 +454,11 @@ private void startStepFunctionExecution(Map parameters, String q String inputPayload = createInputPayload(queueThreshold, batchSize, queueType, queueName, topic, interval); - // Create the timestamp - String timestamp = String.valueOf(System.currentTimeMillis()); // Current time in milliseconds - + // Current time in milliseconds + String timestamp = String.valueOf(System.currentTimeMillis()); + queueName = stepFunctionService.sanitizeExecutionName(queueName); // Check if queueType is "dedupq" and prepend "D" to execution name if true String executionName = (queueType.equalsIgnoreCase("dedupq") ? "D_" : "") + queueName + "_" + timestamp; - // Start the Step Function execution stepFunctionService.startExecution(stateMachineArn, inputPayload, executionName); diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/ExecutionInputWrapper.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/ExecutionInputWrapper.java new file mode 100644 index 0000000000..13f396fe9a --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/ExecutionInputWrapper.java @@ -0,0 +1,14 @@ +package com.bazaarvoice.emodb.queue.core.Entities; + +public class ExecutionInputWrapper { + private QueueExecutionAttributes executionInput; + + // Getter and Setter + public QueueExecutionAttributes getExecutionInput() { + return executionInput; + } + + public void setExecutionInput(QueueExecutionAttributes executionInput) { + this.executionInput = executionInput; + } +} diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/QueueExecutionAttributes.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/QueueExecutionAttributes.java new file mode 100644 index 0000000000..a35b60cbaf --- /dev/null +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/Entities/QueueExecutionAttributes.java @@ -0,0 +1,109 @@ +package com.bazaarvoice.emodb.queue.core.Entities; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.util.Map; +import java.util.Objects; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class QueueExecutionAttributes { + + private String queueName; + private String queueType; + private String topicName; + private Integer queueThreshold; + private Integer batchSize; + private Integer interval; + private String status; + + public void setQueueName(String queueName) { + this.queueName = queueName; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public void setQueueType(String queueType) { + this.queueType = queueType; + } + + public void setTopicName(String topicName) { + this.topicName = topicName; + } + + public void setQueueThreshold(int queueThreshold) { + this.queueThreshold = queueThreshold; + } + + public void setBatchSize(int batchSize) { + this.batchSize = batchSize; + } + + public void setInterval(int interval) { + this.interval = interval; + } + + public Integer getQueueThreshold() { + return queueThreshold; + } + + public Integer getBatchSize() { + return batchSize; + } + + public Integer getInterval() { + return interval; + } + + public String getQueueName() { + return queueName; + } + + public String getQueueType() { + return queueType; + } + + public String getTopicName() { + return topicName; + } + + public String getJsonPayload(QueueExecutionAttributes attributes) throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + return mapper.writeValueAsString(attributes); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof QueueExecutionAttributes)) return false; + QueueExecutionAttributes that = (QueueExecutionAttributes) o; + return Objects.equals(getQueueName(), that.getQueueName()) && Objects.equals(getQueueType(), that.getQueueType()) && Objects.equals(getTopicName(), that.getTopicName()) && Objects.equals(getQueueThreshold(), that.getQueueThreshold()) && Objects.equals(getBatchSize(), that.getBatchSize()) && Objects.equals(getInterval(), that.getInterval()); + } + + @Override + public int hashCode() { + return Objects.hash(getQueueName(), getQueueType(), getTopicName(), getQueueThreshold(), getBatchSize(), getInterval()); + } + + @Override + public String toString() { + return "QueueExecutionAttributes{" + + "queueName='" + queueName + '\'' + + ", queueType='" + queueType + '\'' + + ", topicName='" + topicName + '\'' + + ", queueThreshold=" + queueThreshold + + ", batchSize=" + batchSize + + ", interval=" + interval + + ", status='" + status + '\'' + + '}'; + } +} diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java index 13011e8bcc..c4ab54ad99 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaConfig.java @@ -58,7 +58,7 @@ public class KafkaConfig { lingerMsConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/lingerMs", "1"); // Configures the Kafka broker addresses for producer connections. - bootstrapServersConfig = parameterValues.get("/" + UNIVERSE + "/emodb/kafka/bootstrapServers"); + bootstrapServersConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/bootstrapServers", "localhost:9092"); logger.info("Kafka configurations loaded successfully from SSM."); } catch (AmazonServiceException e) { diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java index 1a7cc72eee..efbfc5f27c 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/kafka/KafkaProducerService.java @@ -46,7 +46,7 @@ public void sendMessages(String topic, Collection events, String queueTy throw new RuntimeException("Error sending messages to Kafka", e); } } - _log.info("Finished sending messages to topic '{}' time taken : {} milliseconds", topic, Duration.between(startTime,LocalDateTime.now()).toMillis()); + _log.info("Finished sending messages to topic '{}' time taken : {} milliseconds", topic, Duration.between(startTime, LocalDateTime.now()).toMillis()); } diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java index d2d65c144f..f1bfdb0d01 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/ssm/ParameterStoreUtil.java @@ -4,6 +4,8 @@ import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder; import com.amazonaws.services.simplesystemsmanagement.model.GetParameterRequest; import com.amazonaws.services.simplesystemsmanagement.model.GetParameterResult; +import com.amazonaws.services.simplesystemsmanagement.model.PutParameterRequest; +import com.amazonaws.services.simplesystemsmanagement.model.PutParameterResult; import com.amazonaws.services.simplesystemsmanagement.model.GetParametersRequest; import com.amazonaws.services.simplesystemsmanagement.model.GetParametersResult; import com.amazonaws.services.simplesystemsmanagement.model.ParameterNotFoundException; @@ -104,4 +106,22 @@ public Map getParameters(List parameterNames) { } } + public Long updateParameter(String key, String value) { + try { + if (key == null || key.trim().isEmpty()) { + logger.error("parameter name cannot be null or blank"); + throw new IllegalArgumentException("parameter name cannot be null or blank"); + } + + PutParameterRequest request = new PutParameterRequest().withName(key).withValue(value).withOverwrite(true); + + PutParameterResult response = ssmClient.putParameter(request); + logger.info("Successfully updated parameter: " + key + " with value: " + value + ", Update Version: " + response.getVersion()); + return response.getVersion(); + } catch (Exception e) { + logger.error("Failed to update parameter: " + key + " with value: " + value, e); + throw new RuntimeException("Unexpected error updating parameter: " + key + " with value: " + value, e); + } + } + } diff --git a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java index ec4165d03f..a41d95a5a7 100644 --- a/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java +++ b/queue/src/main/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionService.java @@ -3,10 +3,21 @@ import com.amazonaws.services.stepfunctions.AWSStepFunctions; import com.amazonaws.services.stepfunctions.AWSStepFunctionsClientBuilder; +import com.amazonaws.services.stepfunctions.model.*; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaConfig; import com.amazonaws.services.stepfunctions.model.StartExecutionRequest; import com.amazonaws.services.stepfunctions.model.StartExecutionResult; +import com.bazaarvoice.emodb.queue.core.Entities.QueueExecutionAttributes; +import com.bazaarvoice.emodb.queue.core.Entities.ExecutionInputWrapper; +import com.bazaarvoice.emodb.queue.core.ssm.ParameterStoreUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.fasterxml.jackson.databind.ObjectMapper; + +import com.fasterxml.jackson.core.JsonProcessingException; + +import java.util.List; +import java.util.MissingResourceException; /** * Service to interact with AWS Step Functions using AWS SDK v1. @@ -16,15 +27,171 @@ public class StepFunctionService { private static final Logger logger = LoggerFactory.getLogger(StepFunctionService.class); private final AWSStepFunctions stepFunctionsClient; + private static String universe; + private final ParameterStoreUtil _parameterStoreUtil; /** * Constructor to initialize Step Function Client with AWS region and credentials. */ public StepFunctionService() { - this.stepFunctionsClient = AWSStepFunctionsClientBuilder.standard() - .build(); + universe=KafkaConfig.getUniverseFromEnv(); + this._parameterStoreUtil = new ParameterStoreUtil(); + this.stepFunctionsClient = AWSStepFunctionsClientBuilder.standard().build(); + } + + /** + * Sanitizes the execution name by replacing invalid characters with underscores + * and truncating if needed. + */ + public String sanitizeExecutionName(String executionName) { + if (executionName == null || executionName.isEmpty()) { + throw new IllegalArgumentException("Execution name cannot be null or empty"); + } + executionName = executionName.trim(); + // Replace invalid characters with underscores + String sanitized = executionName.replaceAll("[^a-zA-Z0-9\\-_]", "_"); + + // Check if the sanitized name is empty or consists only of underscores + if (sanitized.isEmpty() || sanitized.replaceAll("_", "").isEmpty()) { + throw new IllegalArgumentException("Execution name cannot contain only invalid characters"); + } + + // Truncate from the beginning if length exceeds 66 characters + if (sanitized.length() > 66) { + sanitized = sanitized.substring(sanitized.length() - 66); + } + + // Log the updated execution name if it has changed + if (!sanitized.equals(executionName)) { + logger.info("Updated execution name: {}", sanitized); + } + return sanitized; + } + + + /** + * Starts the execution of a Step Function with provided execution attributes. + * + * @param queueExecutionAttributes execution input attributes + * @throws RuntimeException If method fails to re-start or start with provided execution input attributes + * + * queueType and queueName are mandatory inputs + * CASE-1 (status = "DISABLED" provided) : active execution if any, stops. + * CASE-2 (all 4 inputs(qt, bs, i, tn) provided): a new execution is started with these attributes, stopping any active one. + * CASE-3 (any/all of 4 inputs(qt, bs, i, tn) missing): If any active execution exist, a new execution is started with provided inputs updated, stopping the active one + * CASE-4 (any/all of 4 inputs(qt, bs, i, tn) missing): If any active execution doesn't exist, Exception occurs, IllegalArgumentException + */ + public void startSFNWithAttributes(QueueExecutionAttributes queueExecutionAttributes) { + QueueExecutionAttributes existingAttributes; + + //1. fetch attributes for any existing execution + try { + existingAttributes = getExistingSFNAttributes(queueExecutionAttributes.getQueueType(), queueExecutionAttributes.getQueueName()); + } catch (Exception e) { + logger.error("Error getting existing step-function attributes for " + queueExecutionAttributes + " | " + e.getMessage()); + throw new RuntimeException("Error getting existing step-function attributes for " + queueExecutionAttributes + " | " + e.getMessage()); + } + + //2. if no running execution exists, start a new one with provided/new attributes + if (existingAttributes == null) { + try { + startExecution(queueExecutionAttributes.getQueueType(), queueExecutionAttributes.getQueueName(), queueExecutionAttributes); + return; + } catch(Exception e){ + logger.error("Error starting step-function with attributes " + queueExecutionAttributes + " | " + e.getMessage()); + throw new RuntimeException("Error starting step-function with attributes " + queueExecutionAttributes + " | " + e.getMessage()); + } + } + + //3. check sanity of starting a new execution before stopping the older execution. + syncFreshAttributesFromExistingExecution(queueExecutionAttributes, existingAttributes); + + //4. stop active execution (if any) + try { + stopActiveExecutions(queueExecutionAttributes.getQueueType(), queueExecutionAttributes.getQueueName()); + logger.info("Successfully stopped active execution(if any) for queueName: " + queueExecutionAttributes.getQueueName() + ", queueType: " + queueExecutionAttributes.getQueueType()); + } catch(Exception e){ + logger.error("Error stopping step-function for queueName: " + queueExecutionAttributes.getQueueName() + ", queueType: " + queueExecutionAttributes.getQueueType() + " | " + e.getMessage()); + throw new RuntimeException("Error stopping step-function for queueName: " + queueExecutionAttributes.getQueueName() + ", queueType: " + queueExecutionAttributes.getQueueType() + " | " + e.getMessage()); + } + + //4. if new attributes can't start a fresh execution, re-start the already running sfn, else start a fresh execution with new attributes + try { + startExecution(queueExecutionAttributes.getQueueType(), queueExecutionAttributes.getQueueName(), queueExecutionAttributes); + } catch (Exception e){ + logger.error("Error re-starting step-function with attributes " + queueExecutionAttributes + " | " + e.getMessage()); + throw new RuntimeException("Error re-starting step-function with attributes " + queueExecutionAttributes + "|" + e.getMessage()); + } + } + + + /** + * Starts an execution of step-function associated with (queueType, queueName), with provided attributes. + * + * @param queueType queueType + * @param queueName queueName + * @param executionAttributes execution inputs + * + */ + public void startExecution(String queueType, String queueName, QueueExecutionAttributes executionAttributes) throws JsonProcessingException { + + if(executionAttributes == null) { + throw new IllegalArgumentException("execution input object can't be null"); + } + + if(executionAttributes.getStatus() == null || executionAttributes.getStatus().isEmpty()) { + executionAttributes.setStatus("ENABLED"); + } + + if(executionAttributes.getStatus().equals("DISABLED")) { + logger.info("step-function's execution can't be triggered because status=DISABLED provided" ); + return; + } + + String payload = constructPayload(queueName, queueType, executionAttributes); + + try { + String stateMachineArn = getStateMachineARN(); + String executionName = (queueType.equalsIgnoreCase("dedup") ? "D_" : "") + queueName + "_" + System.currentTimeMillis(); + StartExecutionRequest startExecutionRequest = new StartExecutionRequest().withStateMachineArn(stateMachineArn) + .withInput(payload) + .withName(executionName); + + StartExecutionResult startExecutionResult = stepFunctionsClient.startExecution(startExecutionRequest); + + logger.info("Successfully started execution for state machine ARN: {}", stateMachineArn); + logger.debug("Execution ARN: {}", startExecutionResult.getExecutionArn()); + + } catch (StateMachineDoesNotExistException e) { + logger.error("State Machine does not exist for queue_type: " + queueType + ", queue_name: " + queueName, e); + } catch (InvalidArnException e) { + logger.error("Invalid ARN provided for queue_type: " + queueType + ", queue_name: " + queueName, e); + } catch (InvalidExecutionInputException e) { + logger.error("Invalid execution input provided: {}", payload, e); + } catch (AWSStepFunctionsException e) { + logger.error("Error executing Step Function: {}", e.getMessage(), e); + throw e; // Re-throw after logging + } catch (Exception e) { + logger.error("Unexpected error occurred during Step Function execution: {}", e.getMessage(), e); + throw e; // Re-throw unexpected exceptions + } } + + private String constructPayload(String queueName, String queueType, QueueExecutionAttributes executionAttributes) throws JsonProcessingException { + + validateExecutionInputs(queueName, queueType, executionAttributes); + executionAttributes.setQueueType(queueType); + executionAttributes.setQueueName(queueName); + + ExecutionInputWrapper executionInputWrapper = new ExecutionInputWrapper(); + executionInputWrapper.setExecutionInput(executionAttributes); + + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.writeValueAsString(executionInputWrapper); + } + + /** * Starts the execution of a Step Function with the given state machine ARN and input payload. * @@ -59,4 +226,207 @@ public void startExecution(String stateMachineArn, String inputPayload, String e throw e; } } + + + /** + * Gets execution inputs of an active/running step-function associated with (queueType, queueName). + * + * @param queueType queueType + * @param queueName queueName + * + * @return valid QueueExecutionAttributes : if any active execution exists, else NULL. + * + * @throws JsonProcessingException If execution input attributes fails in getting converted to a valid execution payload json + */ + public QueueExecutionAttributes getExistingSFNAttributes(String queueType, String queueName) throws JsonProcessingException { + try { + List executionItemList = getAllActiveExecutionArns(); + + for(ExecutionListItem executionItem : executionItemList) { + String executionARN = executionItem.getExecutionArn(); + + DescribeExecutionRequest describeExecutionRequest = new DescribeExecutionRequest().withExecutionArn(executionARN); + DescribeExecutionResult describeExecutionResult = stepFunctionsClient.describeExecution(describeExecutionRequest); + + String existingInputPayload = describeExecutionResult.getInput(); + QueueExecutionAttributes queueExecutionAttributes = new ObjectMapper().readValue(existingInputPayload, ExecutionInputWrapper.class).getExecutionInput(); + + if(queueExecutionAttributes.getQueueType() != null && queueExecutionAttributes.getQueueType().equals(queueType) + && queueExecutionAttributes.getQueueName() != null && queueExecutionAttributes.getQueueName().equals(queueName)) { + logger.info("Fetched attributes for executionArn: " + executionARN + " => " + queueExecutionAttributes); + return queueExecutionAttributes; + } + } + + logger.info("No active executions found for queue_type: " + queueType + ", queue_name: " + queueName + " stateMachineARN: "); + return null; + + } catch (Exception e) { + logger.error("Unexpected error in fetching sfn attributes for queue_type: " + queueType + ", queue_name: " + queueName); + throw e; + } + } + + + /** + * Stops an active execution of step-function associated with (queueType, queueName), if any. + * + * @param queueType queueType + * @param queueName queueName + * + * @throws Exception: If some glitch happens in stopping. + */ + public void stopActiveExecutions(String queueType, String queueName) throws JsonProcessingException { + + try { + List executionItemList = getAllActiveExecutionArns(); + + for(ExecutionListItem executionItem : executionItemList) { + String executionARN = executionItem.getExecutionArn(); + + DescribeExecutionRequest describeExecutionRequest = new DescribeExecutionRequest().withExecutionArn(executionARN); + DescribeExecutionResult describeExecutionResult = stepFunctionsClient.describeExecution(describeExecutionRequest); + + String existingInputPayload = describeExecutionResult.getInput(); + QueueExecutionAttributes queueExecutionAttributes = new ObjectMapper().readValue(existingInputPayload, ExecutionInputWrapper.class).getExecutionInput(); + + if(queueExecutionAttributes.getQueueType() != null && queueExecutionAttributes.getQueueType().equals(queueType) + && queueExecutionAttributes.getQueueName() != null && queueExecutionAttributes.getQueueName().equals(queueName)) { + logger.info("Stopping active execution: " + executionARN); + + StopExecutionRequest stopRequest = new StopExecutionRequest().withExecutionArn(executionARN); + stepFunctionsClient.stopExecution(stopRequest); + + logger.info("Stopped execution: " + executionARN); + return; + } + } + + logger.info("No active execution arn exists for queue_type:" + queueType + ", queue_name:" + queueName); + + } catch (Exception e) { + logger.error("Failure in stopping active execution: {}", e.getMessage(), e); + throw e; + } + } + + + /** + * Gets execution ARN of an active/running step-function associated with (queueType, queueName). + * + * @return String : if any active execution exists, else NULL. + */ + public List getAllActiveExecutionArns() { + + try { + String stateMachineArn = getStateMachineARN(); + + ListExecutionsRequest listExecutionRequest = new ListExecutionsRequest().withStateMachineArn(stateMachineArn) + .withStatusFilter(ExecutionStatus.RUNNING); + + ListExecutionsResult listExecutionResults = stepFunctionsClient.listExecutions(listExecutionRequest); + return listExecutionResults.getExecutions(); + + } catch (Exception e) { + logger.error("Unexpected error: {" + e.getMessage() + "} occurred while fetching all active execution ARNs", e); + throw e; + } + + } + + + /** + * Gets stateMachine ARN of a step-function from aws parameter-store. + * + * @return String: stateMachineArn + * + * @throws AWSStepFunctionsException: If some glitch happens at aws end + * @throws MissingResourceException: If state machine arn is not found/set in aws parameter store + */ + public String getStateMachineARN() { + + try { + // TODO_SHAN: Extend this fetch part later based on queueType : queue/dedup/databus + String stateMachineArn = _parameterStoreUtil.getParameter("/" + universe + "/emodb/stepfn/stateMachineArn"); + + if(stateMachineArn != null && !stateMachineArn.isEmpty()) { + return stateMachineArn; + } + } catch (Exception e) { + throw new AWSStepFunctionsException("Problem fetching state machine arn"); + } + + throw new MissingResourceException("state machine arn not found in param-store", "", ""); + } + + + private void syncFreshAttributesFromExistingExecution(QueueExecutionAttributes newQueueExecutionAttributes, QueueExecutionAttributes existingExecutionAttributes) { + + validateExecutionInputs(existingExecutionAttributes.getQueueType(), existingExecutionAttributes.getQueueName(), existingExecutionAttributes); + + if(newQueueExecutionAttributes == null) { + newQueueExecutionAttributes = new QueueExecutionAttributes(); + } + + if(newQueueExecutionAttributes.getQueueType() == null || newQueueExecutionAttributes.getQueueType().isEmpty()) { + newQueueExecutionAttributes.setQueueType(existingExecutionAttributes.getQueueType()); + } + + if(newQueueExecutionAttributes.getQueueName() == null || newQueueExecutionAttributes.getQueueName().isEmpty()) { + newQueueExecutionAttributes.setQueueName(existingExecutionAttributes.getQueueName()); + } + + if(newQueueExecutionAttributes.getQueueThreshold() == null) { + newQueueExecutionAttributes.setQueueThreshold(existingExecutionAttributes.getQueueThreshold()); + } + + if(newQueueExecutionAttributes.getBatchSize() == null) { + newQueueExecutionAttributes.setBatchSize(existingExecutionAttributes.getBatchSize()); + } + + if(newQueueExecutionAttributes.getInterval() == null) { + newQueueExecutionAttributes.setInterval(existingExecutionAttributes.getInterval()); + } + + if(newQueueExecutionAttributes.getTopicName() == null || newQueueExecutionAttributes.getTopicName().isEmpty()) { + newQueueExecutionAttributes.setTopicName(existingExecutionAttributes.getTopicName()); + } + + if(newQueueExecutionAttributes.getStatus() == null || newQueueExecutionAttributes.getStatus().isEmpty()) { + newQueueExecutionAttributes.setStatus(existingExecutionAttributes.getStatus()); + } + + validateExecutionInputs(newQueueExecutionAttributes.getQueueType(), newQueueExecutionAttributes.getQueueName(), newQueueExecutionAttributes); + + } + + private void validateExecutionInputs(String queueType, String queueName, QueueExecutionAttributes executionAttributes) { + if(queueName == null || queueName.isEmpty()) { + throw new IllegalArgumentException("queue name can't be null/empty"); + } + + if(queueType == null || queueType.isEmpty()) { + throw new IllegalArgumentException("queue type can't be null/empty"); + } + + if(executionAttributes == null) { + throw new IllegalArgumentException("execution attributes can't be null"); + } + + if(executionAttributes.getTopicName() == null || executionAttributes.getTopicName().isEmpty()) { + throw new IllegalArgumentException("topic name can't be null/empty"); + } + + if(executionAttributes.getInterval() == null) { + throw new IllegalArgumentException("interval can't be null"); + } + + if(executionAttributes.getBatchSize() == null) { + throw new IllegalArgumentException("batch size can't be null"); + } + + if(executionAttributes.getQueueThreshold() == null) { + throw new IllegalArgumentException("queue threshold can't be null"); + } + } } \ No newline at end of file diff --git a/queue/src/test/java/com/bazaarvoice/emodb/queue/QueueModuleTest.java b/queue/src/test/java/com/bazaarvoice/emodb/queue/QueueModuleTest.java index 9263d33ef4..98b4d5870d 100644 --- a/queue/src/test/java/com/bazaarvoice/emodb/queue/QueueModuleTest.java +++ b/queue/src/test/java/com/bazaarvoice/emodb/queue/QueueModuleTest.java @@ -13,6 +13,9 @@ import com.bazaarvoice.emodb.job.api.JobService; import com.bazaarvoice.emodb.queue.api.DedupQueueService; import com.bazaarvoice.emodb.queue.api.QueueService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaAdminService; +import com.bazaarvoice.emodb.queue.core.kafka.KafkaProducerService; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; import com.bazaarvoice.ostrich.HostDiscovery; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableMap; diff --git a/queue/src/test/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionServiceTest.java b/queue/src/test/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionServiceTest.java new file mode 100644 index 0000000000..136f8d5db4 --- /dev/null +++ b/queue/src/test/java/com/bazaarvoice/emodb/queue/core/stepfn/StepFunctionServiceTest.java @@ -0,0 +1,199 @@ +package com.bazaarvoice.emodb.queue.core.stepfn; + +import com.amazonaws.services.stepfunctions.AWSStepFunctions; +import com.amazonaws.services.stepfunctions.model.StartExecutionRequest; +import com.amazonaws.services.stepfunctions.model.StartExecutionResult; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.lang.reflect.Field; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; +import static org.testng.Assert.*; + +public class StepFunctionServiceTest { + + private StepFunctionService stepFunctionService; + + @Mock + private AWSStepFunctions mockStepFunctionsClient; + + @BeforeMethod + public void setUp() throws Exception { + MockitoAnnotations.openMocks(this); + stepFunctionService = new StepFunctionService(); + + // Use reflection to set the private field stepFunctionsClient + Field field = StepFunctionService.class.getDeclaredField("stepFunctionsClient"); + field.setAccessible(true); // Make the private field accessible + field.set(stepFunctionService, mockStepFunctionsClient); // Inject mock + } + + @Test + public void testStartExecution_withValidParameters() { + // Arrange + String stateMachineArn = "arn:aws:states:us-east-1:123456789012:stateMachine:exampleStateMachine"; + String inputPayload = "{\"key\":\"value\"}"; + String executionName = "testExecution"; + + StartExecutionResult mockResult = new StartExecutionResult() + .withExecutionArn("arn:aws:states:us-east-1:123456789012:execution:exampleExecution"); + when(mockStepFunctionsClient.startExecution(any(StartExecutionRequest.class))).thenReturn(mockResult); + + // Act + stepFunctionService.startExecution(stateMachineArn, inputPayload, executionName); + + // Assert + ArgumentCaptor requestCaptor = ArgumentCaptor.forClass(StartExecutionRequest.class); + verify(mockStepFunctionsClient).startExecution(requestCaptor.capture()); + + StartExecutionRequest request = requestCaptor.getValue(); + assertEquals(request.getStateMachineArn(), stateMachineArn); + assertEquals(request.getInput(), inputPayload); + //assertTrue(request.getName().startsWith("testExecution_")); + } + + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "State Machine ARN cannot be null or empty") + public void testStartExecution_withNullStateMachineArn() { + // Arrange + String stateMachineArn = null; + String inputPayload = "{\"key\":\"value\"}"; + String executionName = "testExecution"; + + // Act + stepFunctionService.startExecution(stateMachineArn, inputPayload, executionName); + } + + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "State Machine ARN cannot be null or empty") + public void testStartExecution_withEmptyStateMachineArn() { + // Arrange + String stateMachineArn = ""; + String inputPayload = "{\"key\":\"value\"}"; + String executionName = "testExecution"; + + // Act + stepFunctionService.startExecution(stateMachineArn, inputPayload, executionName); + } + + @Test + public void testStartExecution_withNullInputPayload() { + // Arrange + String stateMachineArn = "arn:aws:states:us-east-1:123456789012:stateMachine:exampleStateMachine"; + String executionName = "testExecution"; + + StartExecutionResult mockResult = new StartExecutionResult() + .withExecutionArn("arn:aws:states:us-east-1:123456789012:execution:exampleExecution"); + when(mockStepFunctionsClient.startExecution(any(StartExecutionRequest.class))).thenReturn(mockResult); + + // Act + stepFunctionService.startExecution(stateMachineArn, null, executionName); + + // Assert + ArgumentCaptor requestCaptor = ArgumentCaptor.forClass(StartExecutionRequest.class); + verify(mockStepFunctionsClient).startExecution(requestCaptor.capture()); + + StartExecutionRequest request = requestCaptor.getValue(); + assertEquals(request.getStateMachineArn(), stateMachineArn); + assertEquals(request.getInput(), "{}"); // Default to empty payload + } + + @Test + public void testSanitizeExecutionName_withInvalidCharacters() { + // Arrange + String invalidExecutionName = "test/execution:name*with?invalid|characters"; + + // Act + String sanitized = stepFunctionService.sanitizeExecutionName(invalidExecutionName); + + // Assert + assertEquals(sanitized, "test_execution_name_with_invalid_characters"); + } + + @Test + public void testSanitizeExecutionName_withTooLongName() { + // Arrange + String longExecutionName = "ThisIsAVeryLongExecutionNameThatExceedsTheMaximumAllowedLengthOfSixtyNineCharactersAndShouldBeTruncatedAtSomePoint"; + + // Act + String sanitized = stepFunctionService.sanitizeExecutionName(longExecutionName); + + // Assert + assertTrue(sanitized.length() <= 69); + } + + // New Test Cases for Edge Cases + + @Test + public void testSanitizeExecutionName_withValidName() { + // Arrange + String validExecutionName = "validExecutionName"; + + // Act + String sanitized = stepFunctionService.sanitizeExecutionName(validExecutionName); + + // Print the output + System.out.println("Sanitized Execution Name: " + sanitized); + + // Assert + assertEquals(sanitized, validExecutionName); // Should return the same name + } + + @Test + public void testSanitizeExecutionName_withLeadingAndTrailingSpaces() { + // Arrange + String executionName = " executionName "; + + // Act + String sanitized = stepFunctionService.sanitizeExecutionName(executionName); + + // Print the output + System.out.println("Sanitized Execution Name: " + sanitized); + + // Assert + assertEquals(sanitized, "executionName"); // Should trim spaces + } + + @Test(expectedExceptions = IllegalArgumentException.class, + expectedExceptionsMessageRegExp = "Execution name cannot contain only invalid characters") + public void testSanitizeExecutionName_withOnlyInvalidCharacters() { + // Arrange + String invalidOnly = "*/?|<>"; // Input with only invalid characters + + stepFunctionService.sanitizeExecutionName(invalidOnly); + } + + + @Test + public void testSanitizeExecutionName_withMaximumLength() { + // Arrange + String maxLengthExecutionName = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEDHDFHDFHHFCN"; // 69 characters + + // Act + String sanitized = stepFunctionService.sanitizeExecutionName(maxLengthExecutionName); + + // Print the output + System.out.println("Sanitized Execution Name: " + sanitized); + + // Assert + assertEquals(sanitized.length(), 66); // Should be exactly 66 characters + } + + @Test + public void testSanitizeExecutionName_withMultipleInvalidCharacters() { + // Arrange + String executionName = "test//?invalid//name?with*multiple|invalid:characters"; + + // Act + String sanitized = stepFunctionService.sanitizeExecutionName(executionName); + + // Print the output + System.out.println("Sanitized Execution Name: " + sanitized); + + // Assert + assertEquals(sanitized, "test___invalid__name_with_multiple_invalid_characters"); // Should replace all invalid characters + } +} diff --git a/sdk/pom.xml b/sdk/pom.xml index c38a76529d..85d9724b88 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 92a51e19b4..eb1dd7b070 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java index 7a00eedf9f..711c615250 100644 --- a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java +++ b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java @@ -261,4 +261,10 @@ void dropFacade(String table, String placement, Audit audit) */ URI getStashRoot() throws StashNotAvailableException; + + default void updateRefInDatabus(Iterable updateRefs, Set tags, boolean isFacade) { + /* + * This method is a no-op in the default implementation. It is used by the Databus to update the reference + */ + } } diff --git a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/Names.java b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/Names.java index 34d020b1fe..9fb41535a9 100644 --- a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/Names.java +++ b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/Names.java @@ -19,4 +19,6 @@ public static boolean isLegalTableAttributeName(String attributeName) { // The attributes should not start with "~" which is reserved for Emodb's internal use return !attributeName.startsWith("~"); } + + } diff --git a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java new file mode 100644 index 0000000000..168132b98a --- /dev/null +++ b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java @@ -0,0 +1,63 @@ +package com.bazaarvoice.emodb.sor.api; + +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + +import static java.util.Objects.hash; +import static java.util.Objects.requireNonNull; + +/** + * Reference to a System of Record update. + */ +public final class UpdateRefModel { + public static final String TAGS_NAME = "~tags"; + private final String _table; + private final String _key; + private final UUID _changeId; + private final Set _tags; + + public UpdateRefModel(String table, String key, UUID changeId, Set tags) { + _table = requireNonNull(table, "table"); + _key = requireNonNull(key, "key"); + _changeId = requireNonNull(changeId, "changeId"); + _tags = requireNonNull(tags, "tags"); + } + + public String getTable() { + return _table; + } + + public String getKey() { + return _key; + } + + public UUID getChangeId() { + return _changeId; + } + + public Set getTags() { + return _tags; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof UpdateRefModel)) { + return false; + } + UpdateRefModel that = (UpdateRefModel) o; + return Objects.equals(_table, that._table) && + Objects.equals(_key, that._key) && + Objects.equals(_changeId, that._changeId) && + Objects.equals(_tags, that._tags); + } + + @Override + public int hashCode() { + return hash(_table, _key, _changeId, _tags); + } + +} \ No newline at end of file diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index eeda20a7da..b98b56184f 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index b596c8954e..22c8159dc1 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 0b1a8c727d..3bf7ae1007 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 4adf86fdc3..eac36180fe 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml @@ -348,5 +348,13 @@ testng test + + com.amazonaws + aws-java-sdk-ssm + + + org.apache.kafka + kafka-clients + diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/DataStoreModule.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/DataStoreModule.java index fda127a190..6c3958b265 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/DataStoreModule.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/DataStoreModule.java @@ -60,6 +60,7 @@ import com.bazaarvoice.emodb.sor.db.cql.CqlForMultiGets; import com.bazaarvoice.emodb.sor.db.cql.CqlForScans; import com.bazaarvoice.emodb.sor.db.cql.SorCqlSettingsTask; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.log.LogbackSlowQueryLogProvider; import com.bazaarvoice.emodb.sor.log.SlowQueryLog; import com.bazaarvoice.emodb.sor.log.SlowQueryLogConfiguration; @@ -195,6 +196,7 @@ protected void configure() { bind(SlowQueryLog.class).toProvider(LogbackSlowQueryLogProvider.class); bind(HintsConsistencyTimeProvider.class).asEagerSingleton(); bind(MinLagConsistencyTimeProvider.class).asEagerSingleton(); + bind(KafkaProducerService.class).asEagerSingleton(); // The web servers are responsible for updating the ZooKeeper full consistency data. CLI tools don't need to. // Enable updating the ZooKeeper full consistency data if specified diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java index dadbdd3b4e..7e82c275e2 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java @@ -5,29 +5,7 @@ import com.bazaarvoice.emodb.common.json.deferred.LazyJsonMap; import com.bazaarvoice.emodb.common.uuid.TimeUUIDs; import com.bazaarvoice.emodb.common.zookeeper.store.MapStore; -import com.bazaarvoice.emodb.sor.api.Audit; -import com.bazaarvoice.emodb.sor.api.AuditBuilder; -import com.bazaarvoice.emodb.sor.api.AuditsUnavailableException; -import com.bazaarvoice.emodb.sor.api.Change; -import com.bazaarvoice.emodb.sor.api.CompactionControlSource; -import com.bazaarvoice.emodb.sor.api.Coordinate; -import com.bazaarvoice.emodb.sor.api.DataStore; -import com.bazaarvoice.emodb.sor.api.DefaultTable; -import com.bazaarvoice.emodb.sor.api.FacadeOptions; -import com.bazaarvoice.emodb.sor.api.History; -import com.bazaarvoice.emodb.sor.api.Intrinsic; -import com.bazaarvoice.emodb.sor.api.Names; -import com.bazaarvoice.emodb.sor.api.ReadConsistency; -import com.bazaarvoice.emodb.sor.api.StashNotAvailableException; -import com.bazaarvoice.emodb.sor.api.StashRunTimeInfo; -import com.bazaarvoice.emodb.sor.api.StashTimeKey; -import com.bazaarvoice.emodb.sor.api.TableOptions; -import com.bazaarvoice.emodb.sor.api.UnknownPlacementException; -import com.bazaarvoice.emodb.sor.api.UnknownTableException; -import com.bazaarvoice.emodb.sor.api.UnpublishedDatabusEvent; -import com.bazaarvoice.emodb.sor.api.UnpublishedDatabusEventType; -import com.bazaarvoice.emodb.sor.api.Update; -import com.bazaarvoice.emodb.sor.api.WriteConsistency; +import com.bazaarvoice.emodb.sor.api.*; import com.bazaarvoice.emodb.sor.audit.AuditWriter; import com.bazaarvoice.emodb.sor.compactioncontrol.LocalCompactionControl; import com.bazaarvoice.emodb.sor.condition.Condition; @@ -42,7 +20,10 @@ import com.bazaarvoice.emodb.sor.db.ScanRange; import com.bazaarvoice.emodb.sor.db.ScanRangeSplits; import com.bazaarvoice.emodb.sor.delta.Delta; +import com.bazaarvoice.emodb.sor.kafka.KafkaConfig; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.log.SlowQueryLog; +import com.bazaarvoice.emodb.sor.ssm.ParameterStoreUtil; import com.bazaarvoice.emodb.table.db.DroppedTableException; import com.bazaarvoice.emodb.table.db.StashBlackListTableCondition; import com.bazaarvoice.emodb.table.db.StashTableDAO; @@ -59,6 +40,8 @@ import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.base.Throwables; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; @@ -79,15 +62,7 @@ import java.time.Duration; import java.time.Instant; import java.time.temporal.ChronoUnit; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.RejectedExecutionException; @@ -104,6 +79,8 @@ public class DefaultDataStore implements DataStore, DataProvider, DataTools, Tab private static final int NUM_COMPACTION_THREADS = 2; private static final int MAX_COMPACTION_QUEUE_LENGTH = 100; + private static final String MASTER_FANOUT_TOPIC = "system_bus_master"; + private static final String DATA_THROTTLER = "databusThrottler"; private final Logger _log = LoggerFactory.getLogger(DefaultDataStore.class); @@ -126,6 +103,11 @@ public class DefaultDataStore implements DataStore, DataProvider, DataTools, Tab private final CompactionControlSource _compactionControlSource; private final MapStore _minSplitSizeMap; private final Clock _clock; + private final KafkaProducerService _kafkaProducerService; + private ParameterStoreUtil parameterStoreUtil; + private final Cache dataThrottlerCache = CacheBuilder.newBuilder() + .expireAfterWrite(1, TimeUnit.MINUTES) + .build(); private StashTableDAO _stashTableDao; @@ -134,10 +116,10 @@ public DefaultDataStore(LifeCycleRegistry lifeCycle, MetricRegistry metricRegist DataReaderDAO dataReaderDao, DataWriterDAO dataWriterDao, SlowQueryLog slowQueryLog, HistoryStore historyStore, @StashRoot Optional stashRootDirectory, @LocalCompactionControl CompactionControlSource compactionControlSource, @StashBlackListTableCondition Condition stashBlackListTableCondition, AuditWriter auditWriter, - @MinSplitSizeMap MapStore minSplitSizeMap, Clock clock) { + @MinSplitSizeMap MapStore minSplitSizeMap, Clock clock, KafkaProducerService kafkaProducerService) { this(eventWriterRegistry, tableDao, dataReaderDao, dataWriterDao, slowQueryLog, defaultCompactionExecutor(lifeCycle), historyStore, stashRootDirectory, compactionControlSource, stashBlackListTableCondition, auditWriter, - minSplitSizeMap, metricRegistry, clock); + minSplitSizeMap, metricRegistry, clock, kafkaProducerService); } @VisibleForTesting @@ -146,7 +128,7 @@ public DefaultDataStore(DatabusEventWriterRegistry eventWriterRegistry,TableDAO SlowQueryLog slowQueryLog, ExecutorService compactionExecutor, HistoryStore historyStore, Optional stashRootDirectory, CompactionControlSource compactionControlSource, Condition stashBlackListTableCondition, AuditWriter auditWriter, - MapStore minSplitSizeMap, MetricRegistry metricRegistry, Clock clock) { + MapStore minSplitSizeMap, MetricRegistry metricRegistry, Clock clock, KafkaProducerService kafkaProducerService) { _eventWriterRegistry = requireNonNull(eventWriterRegistry, "eventWriterRegistry"); _tableDao = requireNonNull(tableDao, "tableDao"); _dataReaderDao = requireNonNull(dataReaderDao, "dataReaderDao"); @@ -166,6 +148,8 @@ public DefaultDataStore(DatabusEventWriterRegistry eventWriterRegistry,TableDAO _compactionControlSource = requireNonNull(compactionControlSource, "compactionControlSource"); _minSplitSizeMap = requireNonNull(minSplitSizeMap, "minSplitSizeMap"); _clock = requireNonNull(clock, "clock"); + _kafkaProducerService = requireNonNull(kafkaProducerService, "kafkaProducerService"); + this.parameterStoreUtil = new ParameterStoreUtil(); } /** @@ -376,6 +360,35 @@ public AnnotatedContent apply(Record record) { }; } + /** + * Retrieves the value of the "DataThrottler" flag from the cache if available. + * If the value is not present in the cache or the cache has expired, it fetches the value + * from AWS Parameter Store and stores it in the cache. + *

+ * The cached value has a TTL (Time-To-Live) of 5 minutes, after which it will be refreshed + * from the Parameter Store on the next access. + *

+ * + * @return {@code true} if the experiment is still running, otherwise {@code false}. + * @throws RuntimeException if there is an error fetching the value from the cache or Parameter Store. + */ + private boolean getDataThrottlerValue() { + try { + String UNIVERSE = KafkaConfig.getUniverseFromEnv(); + // Attempt to retrieve from cache + return dataThrottlerCache.get(DATA_THROTTLER, () -> { + + Boolean checkDataThrottler = Boolean.parseBoolean(parameterStoreUtil.getParameter("/" + UNIVERSE + "/emodb/" + DATA_THROTTLER)); + _log.info("DATA_THROTTLER is refreshed {}", checkDataThrottler); + // If absent or expired, fetch from Parameter Store and cache the result + return checkDataThrottler; + }); + } catch (Exception e) { + _log.error("Error fetching databusThrottler valie{}", e.getMessage()); + return false; + } + } + /** * Resolve a set of changes read from the {@link DataWriterDAO} into a single JSON literal object + metadata. * If the record can be compacted an asynchronous compaction will be scheduled unless @@ -744,7 +757,10 @@ public void beforeWrite(Collection updateBatch) { } } if (!updateRefs.isEmpty()) { - _eventWriterRegistry.getDatabusWriter().writeEvents(updateRefs); + if(getDataThrottlerValue()) + _kafkaProducerService.sendMessages(MASTER_FANOUT_TOPIC, updateRefs, "update"); + else + _eventWriterRegistry.getDatabusWriter().writeEvents(updateRefs); } } @@ -1025,4 +1041,30 @@ private void decrementDeltaSizes(PendingCompaction pendingCompaction) { private String getMetricName(String name) { return MetricRegistry.name("bv.emodb.sor", "DefaultDataStore", name); } + + private Iterable convertToUpdateRef(Iterable apiUpdateRefs) { + List coreUpdateRefs = new ArrayList<>(); + for (UpdateRefModel apiUpdateRefModel : apiUpdateRefs) { + String tableName = apiUpdateRefModel.getTable(); + String key = apiUpdateRefModel.getKey(); + UUID changeId = apiUpdateRefModel.getChangeId(); + Set tags = apiUpdateRefModel.getTags(); + coreUpdateRefs.add(new com.bazaarvoice.emodb.sor.core.UpdateRef(tableName, key, changeId, tags)); + } + return coreUpdateRefs; + } + + @Override + public void updateRefInDatabus(Iterable updateRefs, Set tags, boolean isFacade) { + Iterator updateRefsIter = convertToUpdateRef(updateRefs).iterator(); + if (!updateRefsIter.hasNext()) { + return; + } + List updateRefList = new ArrayList<>(); + while (updateRefsIter.hasNext()) { + UpdateRef updateRef = updateRefsIter.next(); + updateRefList.add(updateRef); + } + _eventWriterRegistry.getDatabusWriter().writeEvents(updateRefList); + } } diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/test/InMemoryDataStore.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/test/InMemoryDataStore.java index 37348e976b..8f6d9da161 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/test/InMemoryDataStore.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/test/InMemoryDataStore.java @@ -6,6 +6,7 @@ import com.bazaarvoice.emodb.sor.core.DatabusEventWriterRegistry; import com.bazaarvoice.emodb.sor.core.DefaultDataStore; import com.bazaarvoice.emodb.sor.db.test.InMemoryDataReaderDAO; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.log.NullSlowQueryLog; import com.bazaarvoice.emodb.table.db.test.InMemoryTableDAO; import com.codahale.metrics.MetricRegistry; @@ -19,18 +20,19 @@ */ public class InMemoryDataStore extends DefaultDataStore { - public InMemoryDataStore(MetricRegistry metricRegistry) { - this(new InMemoryDataReaderDAO(), metricRegistry); + public InMemoryDataStore(MetricRegistry metricRegistry, KafkaProducerService kafkaProducerService) { + this(new InMemoryDataReaderDAO(), metricRegistry, kafkaProducerService); } - public InMemoryDataStore(InMemoryDataReaderDAO dataDao, MetricRegistry metricRegistry) { - this(new DatabusEventWriterRegistry(), dataDao, metricRegistry); + + public InMemoryDataStore(InMemoryDataReaderDAO dataDao, MetricRegistry metricRegistry, KafkaProducerService kafkaProducerService) { + this(new DatabusEventWriterRegistry(), dataDao, metricRegistry, kafkaProducerService); } - public InMemoryDataStore(DatabusEventWriterRegistry eventWriterRegistry, InMemoryDataReaderDAO dataDao, MetricRegistry metricRegistry) { + public InMemoryDataStore(DatabusEventWriterRegistry eventWriterRegistry, InMemoryDataReaderDAO dataDao, MetricRegistry metricRegistry, KafkaProducerService kafkaProducerService) { super(eventWriterRegistry, new InMemoryTableDAO(), dataDao, dataDao, new NullSlowQueryLog(), MoreExecutors.newDirectExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), metricRegistry, Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), metricRegistry, Clock.systemUTC(), kafkaProducerService); } } diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaConfig.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaConfig.java new file mode 100644 index 0000000000..a6518246b2 --- /dev/null +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaConfig.java @@ -0,0 +1,148 @@ +package com.bazaarvoice.emodb.sor.kafka; + +import com.amazonaws.AmazonServiceException; +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement; +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder; +import com.amazonaws.services.simplesystemsmanagement.model.AWSSimpleSystemsManagementException; +import com.amazonaws.services.simplesystemsmanagement.model.GetParametersRequest; +import com.amazonaws.services.simplesystemsmanagement.model.GetParametersResult; +import com.amazonaws.services.simplesystemsmanagement.model.Parameter; +import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.serialization.StringSerializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +public class KafkaConfig { + private static String bootstrapServersConfig; + private static String batchSizeConfig; + private static String retriesConfig; + private static String lingerMsConfig; + private static final Logger logger = LoggerFactory.getLogger(KafkaConfig.class); + // Static SSM Client and configuration using AWS SDK v1 + private static final AWSSimpleSystemsManagement ssmClient = AWSSimpleSystemsManagementClientBuilder + .standard() + .build(); + + + static { + try { + final String UNIVERSE = getUniverseFromEnv(); + // Load configurations from SSM during static initialization + Map parameterValues = getParameterValues( + Arrays.asList( + "/" + UNIVERSE + "/emodb/kafka/batchSize", + "/" + UNIVERSE + "/emodb/kafka/retries", + "/" + UNIVERSE + "/emodb/kafka/lingerMs", + "/" + UNIVERSE + "/emodb/kafka/bootstrapServers" + ) + ); + + // Set configurations with fallback to defaults if not present + // Sets the batch size for Kafka producer, which controls the amount of data to batch before sending. + batchSizeConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/batchSize", "16384"); + + // Sets the number of retry attempts for failed Kafka message sends. + retriesConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/retries", "3"); + + // Sets the number of milliseconds a producer is willing to wait before sending a batch out + lingerMsConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/lingerMs", "1"); + + // Configures the Kafka broker addresses for producer connections. + bootstrapServersConfig = parameterValues.getOrDefault("/" + UNIVERSE + "/emodb/kafka/bootstrapServers", "localhost:9092"); + + logger.info("Kafka configurations loaded successfully from SSM."); + } catch (AmazonServiceException e) { + logger.error("Failed to load configurations from SSM. Using default values.", e); + throw e; + } + catch (Exception e) { + logger.error("Unexpected error occurred while loading configurations from SSM. Using default values.", e); + throw e; + } + } + + public static String getUniverseFromEnv() { + String filePath = "/etc/environment"; + logger.info("Reading environment file: " + filePath); + Properties environmentProps = new Properties(); + + try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) { + String line; + while ((line = reader.readLine()) != null) { + // Skip empty lines or comments + if (line.trim().isEmpty() || line.trim().startsWith("#")) { + continue; + } + // Split the line into key-value pair + String[] parts = line.split("=", 2); + logger.info("parts: " + Arrays.toString(parts)); + if (parts.length == 2) { + String key = parts[0].trim(); + String value = parts[1].trim(); + // Remove any surrounding quotes from value + value = value.replace("\"", ""); + environmentProps.put(key, value); + } + } + // Access the environment variables + return environmentProps.getProperty("UNIVERSE"); + } catch (IOException e) { + logger.error("Error reading environment file: " + e.getMessage()); + throw new RuntimeException("Error reading environment file: " + e.getMessage()); + } + } + // Fetch parameters from AWS SSM using AWS SDK v1 + private static Map getParameterValues(List parameterNames) { + try { + GetParametersRequest request = new GetParametersRequest() + .withNames(parameterNames) + .withWithDecryption(true); + + GetParametersResult response = ssmClient.getParameters(request); + + return response.getParameters().stream() + .collect(Collectors.toMap(Parameter::getName, Parameter::getValue)); + } catch (AWSSimpleSystemsManagementException e) { + logger.error("Error fetching parameters from SSM.", e); + throw e; // Rethrow or handle the exception if necessary + } + } + + // Kafka Producer properties + public static Properties getProducerProps() { + Properties producerProps = new Properties(); + + producerProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServersConfig); + producerProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); + producerProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName()); + producerProps.put(ProducerConfig.ACKS_CONFIG, "all"); + producerProps.put(ProducerConfig.RETRIES_CONFIG, Integer.parseInt(retriesConfig)); + producerProps.put(ProducerConfig.LINGER_MS_CONFIG, Integer.parseInt(lingerMsConfig)); + producerProps.put(ProducerConfig.BATCH_SIZE_CONFIG, Integer.parseInt(batchSizeConfig)); + producerProps.put(ProducerConfig.BUFFER_MEMORY_CONFIG, 33554432); // Default buffer memory setting + logger.info("Kafka Producer properties initialized."); + return producerProps; + } + + // Ensure the SSM client is closed when the application shuts down + public static void shutdown() { + if (ssmClient != null) { + try { + ssmClient.shutdown(); + logger.info("SSM client closed successfully."); + } catch (Exception e) { + logger.error("Error while closing SSM client.", e); + } + } + } +} \ No newline at end of file diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaProducerService.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaProducerService.java new file mode 100644 index 0000000000..4cb587cf29 --- /dev/null +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/kafka/KafkaProducerService.java @@ -0,0 +1,66 @@ +package com.bazaarvoice.emodb.sor.kafka; + +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.Duration; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Future; + +public class KafkaProducerService { + private static final Logger _log = LoggerFactory.getLogger(KafkaProducerService.class); + private final KafkaProducer producer; // Changed to String + + public KafkaProducerService() { + this.producer = new KafkaProducer<>(KafkaConfig.getProducerProps()); + _log.info("KafkaProducerService initialized with producer properties: {}", KafkaConfig.getProducerProps()); + } + + /** + * Sends each message from the collection to the specified Kafka topic separately. + * + * @param topic The Kafka topic. + * @param events The collection of messages to be sent. + */ + public void sendMessages(String topic, Collection events, String queueType) { + LocalDateTime startTime = LocalDateTime.now(); + _log.info("Sending {} messages to topic '{}'", events.size(), topic); + List> futures = new ArrayList<>(); + // Use async sendMessage and collect futures + for (T event : events) { + futures.add(producer.send(new ProducerRecord<>(topic, event.toString()))); + } + + // Wait for all futures to complete + for (Future future : futures) { + try { + future.get(); // Only blocks if a future is not yet complete + } catch (Exception e) { + _log.error("Error while sending message to Kafka: {}", e.getMessage()); + throw new RuntimeException("Error sending messages to Kafka", e); + } + } + _log.info("Finished sending messages to topic '{}' time taken : {} milliseconds", topic, Duration.between(startTime, LocalDateTime.now()).toMillis()); + } + + + /** + * Closes the producer to release resources. + */ + public void close() { + _log.info("Closing Kafka producer."); + try { + producer.flush(); + producer.close(); + } catch (Exception e) { + _log.error("Error while closing Kafka producer: ", e); + throw e; + } + } +} \ No newline at end of file diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/ssm/ParameterStoreUtil.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/ssm/ParameterStoreUtil.java new file mode 100644 index 0000000000..693901b264 --- /dev/null +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/ssm/ParameterStoreUtil.java @@ -0,0 +1,120 @@ +package com.bazaarvoice.emodb.sor.ssm; + +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement; +import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder; +import com.amazonaws.services.simplesystemsmanagement.model.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Utility class for interacting with AWS Parameter Store using AWS SDK v1. + */ +public class ParameterStoreUtil { + + private static final Logger logger = LoggerFactory.getLogger(ParameterStoreUtil.class); + private final AWSSimpleSystemsManagement ssmClient; + + /** + * Constructor to initialize the SSM client + */ + public ParameterStoreUtil() { + // Create SSM client with default credentials and region + ssmClient = AWSSimpleSystemsManagementClientBuilder.standard() + .build(); + } + + /** + * Fetches a parameter from AWS Parameter Store. + * + * @param parameterName The name of the parameter to fetch + * @return The value of the parameter + * @throws IllegalArgumentException If the parameterName is null or empty + */ + public String getParameter(String parameterName) { + if (parameterName == null || parameterName.isEmpty()) { + logger.error("Parameter name cannot be null or empty"); + throw new IllegalArgumentException("Parameter name cannot be null or empty"); + } + + try { + + GetParameterRequest request = new GetParameterRequest().withName(parameterName); + GetParameterResult result = ssmClient.getParameter(request); + return result.getParameter().getValue(); + + } catch (ParameterNotFoundException e) { + logger.error("Parameter not found: {}", parameterName, e); + throw new RuntimeException("Parameter not found: " + parameterName, e); + + } catch (AWSSimpleSystemsManagementException e) { + logger.error("Error fetching parameter from AWS SSM: {}", e.getMessage(), e); + throw new RuntimeException("Error fetching parameter from AWS SSM: " + parameterName, e); + + } catch (Exception e) { + logger.error("Unexpected error while fetching parameter: {}", parameterName, e); + throw new RuntimeException("Unexpected error fetching parameter: " + parameterName, e); + } + } + + /** + * Fetches multiple parameters from AWS Parameter Store in a batch. + * + * @param parameterNames The list of parameter names to fetch + * @return A map of parameter names to their values + * @throws IllegalArgumentException If the parameterNames list is null or empty + */ + public Map getParameters(List parameterNames) { + if (parameterNames == null || parameterNames.isEmpty()) { + logger.error("Parameter names list cannot be null or empty"); + throw new IllegalArgumentException("Parameter names list cannot be null or empty"); + } + + try { + + GetParametersRequest request = new GetParametersRequest().withNames(parameterNames); + GetParametersResult result = ssmClient.getParameters(request); + + // Map the result to a Map of parameter names and values + Map parameters = new HashMap<>(); + result.getParameters().forEach(param -> parameters.put(param.getName(), param.getValue())); + + // Log any parameters that were not found + if (!result.getInvalidParameters().isEmpty()) { + logger.warn("The following parameters were not found: {}", result.getInvalidParameters()); + } + + return parameters; + + } catch (AWSSimpleSystemsManagementException e) { + logger.error("Error fetching parameters from AWS SSM: {}", e.getMessage(), e); + throw new RuntimeException("Error fetching parameters from AWS SSM: " + parameterNames, e); + + } catch (Exception e) { + logger.error("Unexpected error while fetching parameters: {}", parameterNames, e); + throw new RuntimeException("Unexpected error fetching parameters: " + parameterNames, e); + } + } + + public Long updateParameter(String key, String value) { + try { + if (key == null || key.trim().isEmpty()) { + logger.error("parameter name cannot be null or blank"); + throw new IllegalArgumentException("parameter name cannot be null or blank"); + } + + PutParameterRequest request = new PutParameterRequest().withName(key).withValue(value).withOverwrite(true); + + PutParameterResult response = ssmClient.putParameter(request); + logger.info("Successfully updated parameter: " + key + " with value: " + value + ", Update Version: " + response.getVersion()); + return response.getVersion(); + } catch (Exception e) { + logger.error("Failed to update parameter: " + key + " with value: " + value, e); + throw new RuntimeException("Unexpected error updating parameter: " + key + " with value: " + value, e); + } + } + +} diff --git a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/CompactorTest.java b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/CompactorTest.java index 48da779c69..442de20665 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/CompactorTest.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/CompactorTest.java @@ -16,6 +16,7 @@ import com.bazaarvoice.emodb.sor.db.test.InMemoryDataReaderDAO; import com.bazaarvoice.emodb.sor.delta.Delta; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.test.SystemClock; import com.bazaarvoice.emodb.sor.uuid.TimeUUIDs; import com.bazaarvoice.emodb.table.db.Table; @@ -485,7 +486,7 @@ public void compact(Table table, String key, UUID compactionKey, Compaction comp } }; - final DataStore dataStore = new InMemoryDataStore(dataDAO, new MetricRegistry()); + final DataStore dataStore = new InMemoryDataStore(dataDAO, new MetricRegistry(), mock(KafkaProducerService.class)); // Create a table for our test dataStore.createTable(tableName, @@ -571,7 +572,7 @@ public Record read(Key key, ReadConsistency ignored) { // Configure the data DAO to read 10 columns initially, causing other column reads to be read lazily dataDAO.setColumnBatchSize(10); - final DataStore dataStore = new InMemoryDataStore(dataDAO, new MetricRegistry()); + final DataStore dataStore = new InMemoryDataStore(dataDAO, new MetricRegistry(), mock(KafkaProducerService.class)); // Create a table for our test dataStore.createTable(tableName, diff --git a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/DataStoreTest.java b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/DataStoreTest.java index 3cf9b7b50f..bb66c772fd 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/DataStoreTest.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/DataStoreTest.java @@ -14,6 +14,7 @@ import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; import com.bazaarvoice.emodb.sor.delta.Delta; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.test.SystemClock; import com.bazaarvoice.emodb.sor.uuid.TimeUUIDs; import com.codahale.metrics.MetricRegistry; @@ -33,6 +34,7 @@ import java.util.Set; import java.util.UUID; +import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotEquals; @@ -47,7 +49,7 @@ public class DataStoreTest { @Test public void testDeltas() throws Exception { - DataStore store = new InMemoryDataStore(new MetricRegistry()); + DataStore store = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); assertFalse(store.getTableExists(TABLE)); @@ -167,7 +169,7 @@ public void testDeltas() throws Exception { @Test public void testRecordTimestamps() throws Exception { - DataStore store = new InMemoryDataStore(new MetricRegistry()); + DataStore store = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); assertFalse(store.getTableExists(TABLE)); @@ -262,7 +264,7 @@ record = store.get(TABLE, KEY1); @Test public void testRecordTimestampsWithEventTags() throws Exception { - DataStore store = new InMemoryDataStore(new MetricRegistry()); + DataStore store = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); assertFalse(store.getTableExists(TABLE)); diff --git a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/MinSplitSizeTest.java b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/MinSplitSizeTest.java index ac585fa220..6030144919 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/MinSplitSizeTest.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/MinSplitSizeTest.java @@ -10,6 +10,7 @@ import com.bazaarvoice.emodb.sor.db.astyanax.ChangeEncoder; import com.bazaarvoice.emodb.sor.db.test.InMemoryDataReaderDAO; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.uuid.TimeUUIDs; import com.bazaarvoice.emodb.table.db.Table; import com.bazaarvoice.emodb.table.db.astyanax.PlacementCache; @@ -43,7 +44,7 @@ public List getSplits(Table table, int recordsPerSplit, int localResplit } }; - DataStore dataStore = new InMemoryDataStore(dataDao, new MetricRegistry()); + DataStore dataStore = new InMemoryDataStore(dataDao, new MetricRegistry(), mock(KafkaProducerService.class)); dataStore.createTable("table", new TableOptionsBuilder().setPlacement("default").build(), Collections.emptyMap(), new AuditBuilder().build()); diff --git a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/RedundantDeltaTest.java b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/RedundantDeltaTest.java index 7377838dc5..36bdcdf8e4 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/RedundantDeltaTest.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/RedundantDeltaTest.java @@ -24,6 +24,7 @@ import com.bazaarvoice.emodb.sor.db.test.DeltaClusteringKey; import com.bazaarvoice.emodb.sor.db.test.InMemoryDataReaderDAO; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.log.NullSlowQueryLog; import com.bazaarvoice.emodb.table.db.Table; import com.bazaarvoice.emodb.table.db.test.InMemoryTableDAO; @@ -65,7 +66,7 @@ public void testRedundantDeltas() throws Exception { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), new InMemoryTableDAO(), dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); @@ -122,7 +123,7 @@ public void testMinUUIDDelta() throws Exception { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), new InMemoryTableDAO(), dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); @@ -159,7 +160,7 @@ public void testRedundancyWithTags() throws Exception { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), new InMemoryTableDAO(), dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); @@ -240,7 +241,7 @@ public void testTagsForNestedMapDeltas() { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), new InMemoryTableDAO(), dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); @@ -260,7 +261,7 @@ public void testRedundancyWithCompactionAndUnchangedTag() throws Exception { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), new InMemoryTableDAO(), dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); @@ -337,7 +338,7 @@ public void testPartialCompactionWithNoRedundancy() throws Exception { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), tableDao, dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); @@ -409,7 +410,7 @@ public void testPartialCompactionWithRedundancy() throws Exception { DefaultDataStore store = new DefaultDataStore(new DatabusEventWriterRegistry(), tableDao, dataDao, dataDao, new NullSlowQueryLog(), new DiscardingExecutorService(), new InMemoryHistoryStore(), Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), new MetricRegistry(), Clock.systemUTC(), mock(KafkaProducerService.class)); TableOptions options = new TableOptionsBuilder().setPlacement("default").build(); store.createTable(TABLE, options, Collections.emptyMap(), newAudit("create table")); diff --git a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/SorUpdateTest.java b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/SorUpdateTest.java index 60574f680c..047c373f72 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/sor/core/SorUpdateTest.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/sor/core/SorUpdateTest.java @@ -8,6 +8,7 @@ import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; import com.bazaarvoice.emodb.sor.db.test.InMemoryDataReaderDAO; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.test.SystemClock; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableMap; @@ -19,6 +20,7 @@ import java.util.UUID; +import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -34,7 +36,7 @@ public class SorUpdateTest { public void SetupTest() { final InMemoryDataReaderDAO dataDAO = new InMemoryDataReaderDAO(); _eventWriterRegistry = new DatabusEventWriterRegistry(); - _dataStore = new InMemoryDataStore(_eventWriterRegistry, dataDAO, new MetricRegistry()); + _dataStore = new InMemoryDataStore(_eventWriterRegistry, dataDAO, new MetricRegistry(), mock(KafkaProducerService.class)); // Create a table for our test diff --git a/sor/src/test/java/com/bazaarvoice/emodb/sor/test/MultiDCDataStores.java b/sor/src/test/java/com/bazaarvoice/emodb/sor/test/MultiDCDataStores.java index c67f985342..66e4d5fe2b 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/sor/test/MultiDCDataStores.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/sor/test/MultiDCDataStores.java @@ -11,6 +11,7 @@ import com.bazaarvoice.emodb.sor.core.test.InMemoryHistoryStore; import com.bazaarvoice.emodb.sor.core.test.InMemoryMapStore; import com.bazaarvoice.emodb.sor.db.test.InMemoryDataReaderDAO; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.sor.log.NullSlowQueryLog; import com.bazaarvoice.emodb.table.db.TableDAO; import com.bazaarvoice.emodb.table.db.test.InMemoryTableDAO; @@ -20,6 +21,8 @@ import java.time.Clock; import java.util.Optional; +import static org.mockito.Mockito.mock; + /** * Wrapper around a set of {@link DataStore} instances that replicate to each other, * simulating a set of eventually consistent data centers. @@ -63,12 +66,12 @@ public MultiDCDataStores(int numDCs, boolean asyncCompacter, MetricRegistry metr if (asyncCompacter) { _stores[i] = new DefaultDataStore(new SimpleLifeCycleRegistry(), metricRegistry, new DatabusEventWriterRegistry(), _tableDao, _inMemoryDaos[i].setHistoryStore(_historyStores[i]), _replDaos[i], new NullSlowQueryLog(), _historyStores[i], - Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), new DiscardingAuditWriter(), new InMemoryMapStore<>(), Clock.systemUTC()); + Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), new DiscardingAuditWriter(), new InMemoryMapStore<>(), Clock.systemUTC(), mock(KafkaProducerService.class)); } else { _stores[i] = new DefaultDataStore(new DatabusEventWriterRegistry(), _tableDao, _inMemoryDaos[i].setHistoryStore(_historyStores[i]), _replDaos[i], new NullSlowQueryLog(), MoreExecutors.newDirectExecutorService(), _historyStores[i], Optional.empty(), new InMemoryCompactionControlSource(), Conditions.alwaysFalse(), - new DiscardingAuditWriter(), new InMemoryMapStore<>(), metricRegistry, Clock.systemUTC()); + new DiscardingAuditWriter(), new InMemoryMapStore<>(), metricRegistry, Clock.systemUTC(), mock(KafkaProducerService.class)); } } } diff --git a/sor/src/test/java/com/bazaarvoice/emodb/table/db/astyanax/TableLifeCycleTest.java b/sor/src/test/java/com/bazaarvoice/emodb/table/db/astyanax/TableLifeCycleTest.java index 5ad5ff357f..f86ba00818 100644 --- a/sor/src/test/java/com/bazaarvoice/emodb/table/db/astyanax/TableLifeCycleTest.java +++ b/sor/src/test/java/com/bazaarvoice/emodb/table/db/astyanax/TableLifeCycleTest.java @@ -27,6 +27,7 @@ import com.bazaarvoice.emodb.sor.delta.Delta; import com.bazaarvoice.emodb.sor.delta.Deltas; import com.bazaarvoice.emodb.sor.delta.MapDeltaBuilder; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.table.db.MoveType; import com.bazaarvoice.emodb.table.db.Table; import com.bazaarvoice.emodb.table.db.TableBackingStore; @@ -1981,7 +1982,7 @@ dataCenter, mock(RateLimiterCache.class), dataCopyDAO, dataPurgeDAO, } private InMemoryDataStore newBackingStore(MetricRegistry metricRegistry) { - InMemoryDataStore store = new InMemoryDataStore(metricRegistry); + InMemoryDataStore store = new InMemoryDataStore(metricRegistry, mock(KafkaProducerService.class)); store.createTable("__system:table", newOptions(PL_GLOBAL), ImmutableMap.of(), newAudit()); store.createTable("__system:table_uuid", newOptions(PL_GLOBAL), ImmutableMap.of(), newAudit()); store.createTable("__system:table_unpublished_databus_events", newOptions(PL_GLOBAL), ImmutableMap.of(), newAudit()); diff --git a/table/pom.xml b/table/pom.xml index c0c8d86ce2..241962d945 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 1298413f2b..399e45aef5 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 392bbb0d28..67fd9c73b2 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index e583ba615c..45cbb28f45 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 33013ccfd8..f2e21d8d68 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 8bc7cd02ef..a3e65691c2 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/AbstractSubjectDatabus.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/AbstractSubjectDatabus.java index 8e9f9b2e21..7c73fd693d 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/AbstractSubjectDatabus.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/AbstractSubjectDatabus.java @@ -61,6 +61,11 @@ public long getEventCountUpTo(Subject subject, @PartitionKey String subscription return databus(subject).getEventCountUpTo(subscription, limit); } + @Override + public long getMasterCount(Subject subject){ + return databus(subject).getMasterCount(); + } + @Override public long getClaimCount(Subject subject, @PartitionKey String subscription) { return databus(subject).getClaimCount(subscription); diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/DatabusResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/DatabusResource1.java index ca356d0ac9..91e23b90e9 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/DatabusResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/DatabusResource1.java @@ -173,6 +173,18 @@ public long getEventCount(@QueryParam ("partitioned") BooleanParam partitioned, } } + @GET + @Path ("{channel}/uncached_size") + @Timed (name = "bv.emodb.databus.DatabusResource1.getMasterEventCount", absolute = true) + @ApiOperation (value = "Gets the master event count.", + notes = "Returns a long.", + response = long.class + ) + public long getEventCountInMaster(@QueryParam ("partitioned") BooleanParam partitioned, + @Authenticated Subject subject) { + return getClient(partitioned).getMasterCount(subject); + } + @GET @Path ("{subscription}/claimcount") @RequiresPermissions ("databus|get_status|{subscription}") diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/SubjectDatabus.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/SubjectDatabus.java index 44493228e9..bcac1c3e8b 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/SubjectDatabus.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/databus/SubjectDatabus.java @@ -52,6 +52,8 @@ Subscription getSubscription(Subject subject, String subscription) long getEventCountUpTo(Subject subject, String subscription, long limit); + long getMasterCount(Subject subject); + long getClaimCount(Subject subject, String subscription); Iterator peek(Subject subject, String subscription, int limit); diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java index e0a312c623..0e94b1100f 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/queue/QueueResource1.java @@ -6,6 +6,9 @@ import com.bazaarvoice.emodb.queue.api.MoveQueueStatus; import com.bazaarvoice.emodb.queue.api.QueueService; import com.bazaarvoice.emodb.queue.client.QueueServiceAuthenticator; +import com.bazaarvoice.emodb.queue.core.Entities.QueueExecutionAttributes; +import com.bazaarvoice.emodb.queue.core.ssm.ParameterStoreUtil; +import com.bazaarvoice.emodb.queue.core.stepfn.StepFunctionService; import com.bazaarvoice.emodb.web.auth.Permissions; import com.bazaarvoice.emodb.web.auth.resource.NamedResource; import com.bazaarvoice.emodb.web.jersey.params.SecondsParam; @@ -28,6 +31,7 @@ import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.POST; +import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; @@ -63,11 +67,17 @@ public class QueueResource1 { private final Meter _sendBatchNull_qr1; + private final ParameterStoreUtil _parameterStoreUtil; + + private final StepFunctionService _stepFunctionService; + public QueueResource1(QueueService queueService, QueueServiceAuthenticator queueClient, MetricRegistry metricRegistry) { //this._metricRegistry = metricRegistry; _queueService = requireNonNull(queueService, "queueService"); _queueClient = requireNonNull(queueClient, "queueClient"); + _parameterStoreUtil = new ParameterStoreUtil(); + _stepFunctionService = new StepFunctionService(); _messageCount_qr1 = metricRegistry.meter(MetricRegistry.name(QueueResource1.class, "polledMessageCount_qr1")); _nullPollsCount_qr1 = metricRegistry.meter(MetricRegistry.name(QueueResource1.class, "nullPollsCount_qr1")); _sendCount_qr1= metricRegistry.meter(MetricRegistry.name(QueueResource1.class,"sendCount_qr1")); @@ -341,6 +351,36 @@ public SuccessResponse purge(@QueryParam("partitioned") BooleanParam partitioned return SuccessResponse.instance(); } + @PUT + @Path("/UpdateParameterStore") + @Consumes(MediaType.APPLICATION_JSON) + @ApiOperation (value = "update param operation at aws parameter store .", + notes = "Returns a SuccessResponse.", response = SuccessResponse.class) + public SuccessResponse updateParam(Map keyValuePair) { + String key = keyValuePair.keySet().iterator().next(); + String value = keyValuePair.get(key); + + Long update_version = _parameterStoreUtil.updateParameter(key, value); + return SuccessResponse.instance().with(ImmutableMap.of("status", "200 | ssm-parameter updated successfully, update_version: " + update_version)); + } + + @PUT + @Path("/{queue_type}/{queue_name}/QueueExecutionAttributes") + @RequiresPermissions("queue|poll|{queue_name}") + @Consumes(MediaType.APPLICATION_JSON) + @ApiOperation (value = "update queue execution attributes .", notes = "Returns a SuccessResponse.", response = SuccessResponse.class) + public SuccessResponse updateQueueExecutionAttributes(@PathParam("queue_type") String queueType, @PathParam("queue_name") String queueName, QueueExecutionAttributes newExecAttributes) { + newExecAttributes.setQueueName(queueName); + newExecAttributes.setQueueType(queueType); + _stepFunctionService.startSFNWithAttributes(newExecAttributes); + + if("DISABLED".equals(newExecAttributes.getStatus())) { + return SuccessResponse.instance().with(ImmutableMap.of("status", "200 | step function successfully stopped(if any execution existed) as status=DISABLED was provided")); + } else { + return SuccessResponse.instance().with(ImmutableMap.of("status", "200 | step function successfully re-started, or started with updated attributes")); + } + } + private QueueService getService(BooleanParam partitioned, String apiKey) { return partitioned != null && partitioned.get() ? _queueService : _queueClient.usingCredentials(apiKey); } diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java index 27baf89a04..2efd03733e 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java @@ -8,19 +8,7 @@ import com.bazaarvoice.emodb.common.json.OrderedJson; import com.bazaarvoice.emodb.common.uuid.TimeUUIDs; import com.bazaarvoice.emodb.datacenter.api.DataCenter; -import com.bazaarvoice.emodb.sor.api.Audit; -import com.bazaarvoice.emodb.sor.api.Change; -import com.bazaarvoice.emodb.sor.api.CompactionControlSource; -import com.bazaarvoice.emodb.sor.api.Coordinate; -import com.bazaarvoice.emodb.sor.api.DataStore; -import com.bazaarvoice.emodb.sor.api.FacadeOptions; -import com.bazaarvoice.emodb.sor.api.Intrinsic; -import com.bazaarvoice.emodb.sor.api.PurgeStatus; -import com.bazaarvoice.emodb.sor.api.Table; -import com.bazaarvoice.emodb.sor.api.TableOptions; -import com.bazaarvoice.emodb.sor.api.UnpublishedDatabusEvent; -import com.bazaarvoice.emodb.sor.api.Update; -import com.bazaarvoice.emodb.sor.api.WriteConsistency; +import com.bazaarvoice.emodb.sor.api.*; import com.bazaarvoice.emodb.sor.core.DataStoreAsync; import com.bazaarvoice.emodb.sor.delta.Delta; import com.bazaarvoice.emodb.sor.delta.Deltas; @@ -947,6 +935,59 @@ private Response redirectTo(DataCenter dataCenter, URI requestUri) { build(); } + @POST + @Path("{channel}/sendbatch1") + @Consumes(MediaType.APPLICATION_JSON) + @Timed(name = "bv.emodb.sor.DataStoreResource1.updateRef", absolute = true) + @ApiOperation(value = "Updates a reference", + notes = "Updates a reference", + response = SuccessResponse.class + ) + public SuccessResponse updateRefToDatabus(InputStream in, + @QueryParam("consistency") @DefaultValue("STRONG") WriteConsistencyParam consistency, + @QueryParam("tag") List tags, + @Authenticated Subject subject) { + Set tagsSet = (tags == null) ? ImmutableSet.of() : Sets.newHashSet(tags); + Iterable updateRefs = asSubjectSafeUpdateRefModelIterable(new JsonStreamingArrayParser<>(in, UpdateRefModel.class), subject, true); + // Perform the update by writing to Databus + _dataStore.updateRefInDatabus(updateRefs, tagsSet, false); + return SuccessResponse.instance(); + } + + /** + * Takes an update ref stream from a subject and performs the following actions on it: + * 1. Checks that the subject has permission to update the record being updated + * 2. Applies any active rate limiting for updates by the subject + */ + private Iterable asSubjectSafeUpdateRefModelIterable(Iterator updateRefs, final Subject subject, final boolean isFacade) { + return Iterables.filter( + OneTimeIterable.wrap(updateRefs), + new Predicate() { + @Override + public boolean apply(UpdateRefModel updateRefModel) { + NamedResource resource = new NamedResource(updateRefModel.getTable()); + boolean hasPermission; + if (isFacade) { + hasPermission = subject.hasPermission(Permissions.updateFacade(resource)); + } else { + hasPermission = subject.hasPermission(Permissions.updateSorTable(resource)); + } + + if (!hasPermission) { + throw new UnauthorizedException("not authorized to update table " + updateRefModel.getTable()); + } + + // Facades are a unique case used internally for shoveling data across data centers, so don't rate + // limit facade updates. + if (!isFacade) { + _updateThrottle.beforeUpdate(subject.getId()); + } + + return true; + } + }); + } + private UUID parseUuidOrTimestamp(@Nullable String string, boolean rangeUpperEnd) { if (string == null) { return null; diff --git a/web/src/test/java/com/bazaarvoice/emodb/web/purge/PurgeTest.java b/web/src/test/java/com/bazaarvoice/emodb/web/purge/PurgeTest.java index fd11acab47..d0d45f8435 100644 --- a/web/src/test/java/com/bazaarvoice/emodb/web/purge/PurgeTest.java +++ b/web/src/test/java/com/bazaarvoice/emodb/web/purge/PurgeTest.java @@ -24,6 +24,7 @@ import com.bazaarvoice.emodb.sor.core.PurgeResult; import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.web.resources.sor.AuditParam; import com.bazaarvoice.emodb.web.resources.sor.DataStoreResource1; import com.bazaarvoice.emodb.web.throttling.UnlimitedDataStoreUpdateThrottler; @@ -84,7 +85,7 @@ public void setUp() throws Exception { lifeCycleRegistry, _queueService, "testqueue", _jobHandlerRegistry, _jobStatusDAO, _curator, 1, Duration.ZERO, 100, Duration.ofHours(1)); - _store = new InMemoryDataStore(new MetricRegistry()); + _store = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); _dataStoreResource = new DataStoreResource1(_store, new DefaultDataStoreAsync(_store, _service, _jobHandlerRegistry), mock(CompactionControlSource.class), new UnlimitedDataStoreUpdateThrottler()); diff --git a/web/src/test/java/com/bazaarvoice/emodb/web/scanner/ScanUploaderTest.java b/web/src/test/java/com/bazaarvoice/emodb/web/scanner/ScanUploaderTest.java index a96563df8d..03c4b58787 100644 --- a/web/src/test/java/com/bazaarvoice/emodb/web/scanner/ScanUploaderTest.java +++ b/web/src/test/java/com/bazaarvoice/emodb/web/scanner/ScanUploaderTest.java @@ -27,6 +27,7 @@ import com.bazaarvoice.emodb.sor.db.Record; import com.bazaarvoice.emodb.sor.db.ScanRange; import com.bazaarvoice.emodb.sor.db.ScanRangeSplits; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.table.db.Table; import com.bazaarvoice.emodb.table.db.astyanax.AstyanaxStorage; import com.bazaarvoice.emodb.web.scanner.control.DistributedScanRangeMonitor; @@ -420,8 +421,9 @@ dataTools, scanWriterGenerator, compactionControlSource, mock(LifeCycleRegistry. @Test public void testScanUploadFromExistingScan() throws Exception { MetricRegistry metricRegistry = new MetricRegistry(); + KafkaProducerService kafkaProducerService = mock(KafkaProducerService.class); // Use an in-memory data store but override the default splits operation to return 4 splits for the test placement - InMemoryDataStore dataStore = spy(new InMemoryDataStore(metricRegistry)); + InMemoryDataStore dataStore = spy(new InMemoryDataStore(metricRegistry, kafkaProducerService)); when(dataStore.getScanRangeSplits("app_global:default", 1000000, Optional.empty())) .thenReturn(new ScanRangeSplits(ImmutableList.of( createSimpleSplitGroup("00", "40"), @@ -621,7 +623,7 @@ public void testScanFailureRecovery() Lists.newArrayList(), Lists.newArrayList()); InMemoryScanWorkflow scanWorkflow = new InMemoryScanWorkflow(); - ScanStatusDAO scanStatusDAO = new DataStoreScanStatusDAO(new InMemoryDataStore(new MetricRegistry()), "scan_table", "app_global:sys"); + ScanStatusDAO scanStatusDAO = new DataStoreScanStatusDAO(new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)), "scan_table", "app_global:sys"); LocalScanUploadMonitor monitor = new LocalScanUploadMonitor(scanWorkflow, scanStatusDAO, mock(ScanWriterGenerator.class), mock(StashStateListener.class), mock(ScanCountListener.class), mock(DataTools.class), new InMemoryCompactionControlSource(), mock(DataCenters.class)); diff --git a/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreScanStatusDAOTest.java b/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreScanStatusDAOTest.java index 0c19fa2c14..0fedee1486 100644 --- a/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreScanStatusDAOTest.java +++ b/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreScanStatusDAOTest.java @@ -6,6 +6,7 @@ import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; import com.bazaarvoice.emodb.sor.db.ScanRange; import com.bazaarvoice.emodb.sor.delta.Deltas; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.bazaarvoice.emodb.web.scanner.ScanDestination; import com.bazaarvoice.emodb.web.scanner.ScanOptions; import com.codahale.metrics.MetricRegistry; @@ -22,6 +23,7 @@ import java.util.List; import java.util.Optional; +import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -33,7 +35,7 @@ public class DataStoreScanStatusDAOTest { @BeforeMethod public void setUp() { - _dataStore = new InMemoryDataStore(new MetricRegistry()); + _dataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); _dao = new DataStoreScanStatusDAO(_dataStore, "scan_table", "app_global:sys"); } diff --git a/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreStashRequestDAOTest.java b/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreStashRequestDAOTest.java index 4e14f50fd1..aab4241cae 100644 --- a/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreStashRequestDAOTest.java +++ b/web/src/test/java/com/bazaarvoice/emodb/web/scanner/scanstatus/DataStoreStashRequestDAOTest.java @@ -2,6 +2,7 @@ import com.bazaarvoice.emodb.sor.api.DataStore; import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableSet; import org.testng.annotations.BeforeMethod; @@ -9,6 +10,7 @@ import java.util.Date; +import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -19,7 +21,7 @@ public class DataStoreStashRequestDAOTest { @BeforeMethod public void setUp() { - _dataStore = new InMemoryDataStore(new MetricRegistry()); + _dataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); _dao = new DataStoreStashRequestDAO(_dataStore, "request_table", "app_global:sys"); } diff --git a/web/src/test/java/com/bazaarvoice/emodb/web/settings/SettingsManagerTest.java b/web/src/test/java/com/bazaarvoice/emodb/web/settings/SettingsManagerTest.java index f8c5758a07..fd7249564f 100644 --- a/web/src/test/java/com/bazaarvoice/emodb/web/settings/SettingsManagerTest.java +++ b/web/src/test/java/com/bazaarvoice/emodb/web/settings/SettingsManagerTest.java @@ -6,6 +6,7 @@ import com.bazaarvoice.emodb.sor.api.DataStore; import com.bazaarvoice.emodb.sor.api.Intrinsic; import com.bazaarvoice.emodb.sor.core.test.InMemoryDataStore; +import com.bazaarvoice.emodb.sor.kafka.KafkaProducerService; import com.codahale.metrics.MetricRegistry; import com.google.common.cache.Cache; import com.google.inject.util.Providers; @@ -32,7 +33,7 @@ public class SettingsManagerTest { @BeforeMethod public void setUp() { - _dataStore = new InMemoryDataStore(new MetricRegistry()); + _dataStore = new InMemoryDataStore(new MetricRegistry(), mock(KafkaProducerService.class)); _cacheRegistry = mock(CacheRegistry.class); _cacheHandle = mock(CacheHandle.class); when(_cacheRegistry.register(eq("settings"), any(Cache.class), eq(true))).thenReturn(_cacheHandle); diff --git a/yum/pom.xml b/yum/pom.xml index b4c6f8e3a5..d82d25e11b 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.205-SNAPSHOT + 6.5.209-SNAPSHOT ../parent/pom.xml From e5e5bd2b18ca8ca796078a5c9c73cf47db556fde Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 6 Nov 2024 18:13:02 +0000 Subject: [PATCH 22/29] branch admin -prepare release emodb-6.5.209 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 1890a704a5..49a81f6095 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 523af72412..bddd991087 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index b611c249b5..f04ac94278 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 59a7d10563..ef76c8e1a5 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.209-SNAPSHOT + 6.5.209 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 5d7b92e667..c34776f3c9 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index a3590ed25f..ea60599372 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 771fdf0354..8e5b533beb 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index d7e1c2fcef..c4fc62df38 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 0e243280df..a06ecf8921 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 874dca3e62..7d393e5ee6 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 51fff44d63..f9e88ee794 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 4675d2f463..eaec8aa7ab 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index d4b2e57e73..063858c41c 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 7cb8297b46..dbca83c6f5 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 2003d93270..b91323d233 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index b19cb6b489..6a94f4fccb 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 6eaf3310ee..77b63d4751 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 83dc90371a..d61de56ebc 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index af7efbd3b8..24229d9bef 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 4cf563bb24..2cf9df4051 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 7e07c275bc..9a8d04304c 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 826efd6eac..b3fcc6f606 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 739a9e4916..d887ab7fa5 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 3d9abfe14f..bc25114afe 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 6adb088d7e..b0bf0ae9fa 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 810134724e..50fad6a98d 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 016d15560d..42adf164ab 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 5112994bcf..cda718dea0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 2cbd6ef1b4..1e8a2fa0e6 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 394a0a1d3f..663dfa70b9 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index d2e6de7ccf..72d202e41b 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index c2e44a8941..9fe5e51b6e 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 3c38e1aa12..c22eb02126 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.208-SNAPSHOT + emodb-6.5.209 diff --git a/plugins/pom.xml b/plugins/pom.xml index 0adfbc7572..25e9e26fc7 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 3c51863038..f325cbbbdf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.208-SNAPSHOT + emodb-6.5.209 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 4deee0ebee..dee7f484d3 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 582cd1812d..343e2d36d0 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 639dbef3b1..de93b01ef5 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 906e8d8eba..df49740b67 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 2e393c164c..4435510674 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 56cde86315..2a779ef66c 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index fa82ee16cd..3ecf382bbf 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 85d9724b88..28ec0dbf49 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index eb1dd7b070..6dc2747c54 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index b98b56184f..43afe7cf3b 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 22c8159dc1..f37216d0b5 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 3bf7ae1007..53c0ea6292 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index eac36180fe..11525c577d 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 241962d945..c238fe75a9 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 399e45aef5..8d568f3879 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 67fd9c73b2..dbe4952154 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 45cbb28f45..17405d6cdd 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index f2e21d8d68..c349ce5aa7 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index a3e65691c2..1e80555a53 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index d82d25e11b..3b0dff4719 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209-SNAPSHOT + 6.5.209 ../parent/pom.xml From 31cea142a0d89232e0c9385ca592ac9ae4a77ecd Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 6 Nov 2024 18:13:04 +0000 Subject: [PATCH 23/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 49a81f6095..4449c2b1bc 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index bddd991087..8d084f471e 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index f04ac94278..c38c73fab2 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index ef76c8e1a5..1d85c01265 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.209 + 6.5.210-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index c34776f3c9..1e048de3a0 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index ea60599372..072589c8e8 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 8e5b533beb..bbc8164997 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index c4fc62df38..0ecba4392b 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index a06ecf8921..109f18884c 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 7d393e5ee6..2699d1c938 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index f9e88ee794..4e609613ff 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index eaec8aa7ab..2736819324 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 063858c41c..c770b7d906 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index dbca83c6f5..509236e728 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index b91323d233..9004c868a7 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 6a94f4fccb..5d5fe621bc 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 77b63d4751..33ce584c44 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index d61de56ebc..16fd403df0 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 24229d9bef..68dedd3bc6 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 2cf9df4051..83f90ea977 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 9a8d04304c..ab96d44024 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index b3fcc6f606..3decc9bfb5 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index d887ab7fa5..b1d8f31651 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index bc25114afe..0c967dec9e 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index b0bf0ae9fa..1d8054ebe8 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 50fad6a98d..ddca1f12bf 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 42adf164ab..75f96c6de2 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index cda718dea0..e2d08cd876 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 1e8a2fa0e6..1f62cb087a 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 663dfa70b9..f0f3f2c457 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 72d202e41b..d473b0929b 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 9fe5e51b6e..a22e672064 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index c22eb02126..31da486c34 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.209 + emodb-6.5.208-SNAPSHOT diff --git a/plugins/pom.xml b/plugins/pom.xml index 25e9e26fc7..61537a6a4c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index f325cbbbdf..a3e5d501a5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.209 + emodb-6.5.208-SNAPSHOT diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index dee7f484d3..efd5e523c6 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 343e2d36d0..1a0625630e 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index de93b01ef5..cc533dee17 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index df49740b67..800aae509e 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 4435510674..bfb35faef1 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 2a779ef66c..07282fa57f 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 3ecf382bbf..896f3661bc 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 28ec0dbf49..7ff6eafc64 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 6dc2747c54..4cc2d9d48b 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 43afe7cf3b..fc8f44701c 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index f37216d0b5..480a22400f 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 53c0ea6292..88706649af 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 11525c577d..001e6a861e 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index c238fe75a9..003c547b03 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 8d568f3879..ba18b74396 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index dbe4952154..dd6e975663 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 17405d6cdd..105a9cd896 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index c349ce5aa7..a41bace174 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 1e80555a53..f5906cdb72 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 3b0dff4719..9fa081bcf0 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.209 + 6.5.210-SNAPSHOT ../parent/pom.xml From bfdc7d9b4d90b56c7c7e9a7d702d4a7f2a1dabf8 Mon Sep 17 00:00:00 2001 From: nabajyotiDash-hub <80683084+nabajyotiDash-hub@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:43:06 +0530 Subject: [PATCH 24/29] PD-257039 : Fix Serialisation issue in databus (#850) * fix serialization issue in databus * remove unused code * update pom versions * Update sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java Co-authored-by: Igor Kruiper <30622704+IgorKruiper@users.noreply.github.com> * fix build failure --------- Co-authored-by: Igor Kruiper <30622704+IgorKruiper@users.noreply.github.com> --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- .../bazaarvoice/emodb/sor/api/DataStore.java | 9 +-- .../emodb/sor/api/UpdateRefModel.java | 63 ------------------- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- .../emodb/sor/core/DefaultDataStore.java | 43 +++++++------ .../bazaarvoice/emodb/sor/core/UpdateRef.java | 17 ++++- .../sor/core/WriteCloseableDataStore.java | 5 ++ table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- .../web/resources/sor/DataStoreResource1.java | 41 +----------- yum/pom.xml | 2 +- 61 files changed, 104 insertions(+), 184 deletions(-) delete mode 100644 sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 4449c2b1bc..47ed6d02b1 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 8d084f471e..2253444d61 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index c38c73fab2..4ba2bab9d9 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 1d85c01265..503f6413af 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 1e048de3a0..e66abd2f61 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 072589c8e8..fa77612bd2 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index bbc8164997..84436f7aff 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 0ecba4392b..5dd35296fb 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 109f18884c..e8677484e3 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 2699d1c938..d934419cd9 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 4e609613ff..dbb2feb31c 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 2736819324..8ee62ba80f 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index c770b7d906..24defeabfc 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 509236e728..52eaf70d22 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 9004c868a7..3de2c02808 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 5d5fe621bc..c4bbfa5985 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 33ce584c44..7bc6d2a967 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 16fd403df0..0688da04ce 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 68dedd3bc6..0a5f8f8d60 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 83f90ea977..a28a1d1652 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index ab96d44024..5df121375f 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 3decc9bfb5..fadca2c170 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index b1d8f31651..d733e1ee7f 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 0c967dec9e..6a1c5433e3 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 1d8054ebe8..3138039f4e 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index ddca1f12bf..2fde8e3c86 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 75f96c6de2..7f9e414907 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index e2d08cd876..b1146f7709 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 1f62cb087a..884ec3f165 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index f0f3f2c457..e250f820cb 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index d473b0929b..78fd621b3d 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index a22e672064..7ba5075f4d 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 31da486c34..5335daa7f9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 61537a6a4c..eac237b3eb 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index a3e5d501a5..7828abe0e4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index efd5e523c6..067426a915 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 1a0625630e..ff9a4206b9 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index cc533dee17..dd503b1e08 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 800aae509e..4a2dad51f7 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index bfb35faef1..4086f47f27 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 07282fa57f..883ccc564b 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 896f3661bc..4c51ae9bbd 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 7ff6eafc64..7ca7899555 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 4cc2d9d48b..ccd2b0c81e 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java index 711c615250..e104444227 100644 --- a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java +++ b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java @@ -262,9 +262,10 @@ void dropFacade(String table, String placement, Audit audit) URI getStashRoot() throws StashNotAvailableException; - default void updateRefInDatabus(Iterable updateRefs, Set tags, boolean isFacade) { - /* - * This method is a no-op in the default implementation. It is used by the Databus to update the reference - */ + /* + * This method is a no-op in the default implementation. It is used by the Databus to update the reference + */ + default void updateRefInDatabus(List updateRefs) { + } } diff --git a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java deleted file mode 100644 index 168132b98a..0000000000 --- a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/UpdateRefModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.bazaarvoice.emodb.sor.api; - -import java.util.Objects; -import java.util.Set; -import java.util.UUID; - -import static java.util.Objects.hash; -import static java.util.Objects.requireNonNull; - -/** - * Reference to a System of Record update. - */ -public final class UpdateRefModel { - public static final String TAGS_NAME = "~tags"; - private final String _table; - private final String _key; - private final UUID _changeId; - private final Set _tags; - - public UpdateRefModel(String table, String key, UUID changeId, Set tags) { - _table = requireNonNull(table, "table"); - _key = requireNonNull(key, "key"); - _changeId = requireNonNull(changeId, "changeId"); - _tags = requireNonNull(tags, "tags"); - } - - public String getTable() { - return _table; - } - - public String getKey() { - return _key; - } - - public UUID getChangeId() { - return _changeId; - } - - public Set getTags() { - return _tags; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof UpdateRefModel)) { - return false; - } - UpdateRefModel that = (UpdateRefModel) o; - return Objects.equals(_table, that._table) && - Objects.equals(_key, that._key) && - Objects.equals(_changeId, that._changeId) && - Objects.equals(_tags, that._tags); - } - - @Override - public int hashCode() { - return hash(_table, _key, _changeId, _tags); - } - -} \ No newline at end of file diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index fc8f44701c..055d94ec17 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 480a22400f..befb0f493f 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 88706649af..0c354b746c 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 001e6a861e..fe74eb06fd 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java index 7e82c275e2..2b65dc4fb6 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java @@ -36,6 +36,8 @@ import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Supplier; @@ -69,6 +71,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -1042,29 +1045,25 @@ private String getMetricName(String name) { return MetricRegistry.name("bv.emodb.sor", "DefaultDataStore", name); } - private Iterable convertToUpdateRef(Iterable apiUpdateRefs) { - List coreUpdateRefs = new ArrayList<>(); - for (UpdateRefModel apiUpdateRefModel : apiUpdateRefs) { - String tableName = apiUpdateRefModel.getTable(); - String key = apiUpdateRefModel.getKey(); - UUID changeId = apiUpdateRefModel.getChangeId(); - Set tags = apiUpdateRefModel.getTags(); - coreUpdateRefs.add(new com.bazaarvoice.emodb.sor.core.UpdateRef(tableName, key, changeId, tags)); - } - return coreUpdateRefs; - } - @Override - public void updateRefInDatabus(Iterable updateRefs, Set tags, boolean isFacade) { - Iterator updateRefsIter = convertToUpdateRef(updateRefs).iterator(); - if (!updateRefsIter.hasNext()) { - return; - } - List updateRefList = new ArrayList<>(); - while (updateRefsIter.hasNext()) { - UpdateRef updateRef = updateRefsIter.next(); - updateRefList.add(updateRef); + public void updateRefInDatabus(List updateRefsModel) { + try { + List updateRefModelList = updateRefsModel.stream() + .map(string -> { + try { + return new ObjectMapper().readValue(string, UpdateRef.class); + } catch (JsonProcessingException e) { + _log.error("Error In Parsing The Message: " , e); + throw new RuntimeException(e); + } + }) + .collect(Collectors.toList()); + if(!updateRefModelList.isEmpty()){ + _eventWriterRegistry.getDatabusWriter().writeEvents(updateRefModelList); + _log.info("Successfully wrote {} number of msgs to databus", updateRefModelList.size()); + } + } catch (Exception e) { + _log.info("Error in writing updateRef to databus {}", e.getMessage()); } - _eventWriterRegistry.getDatabusWriter().writeEvents(updateRefList); } } diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/UpdateRef.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/UpdateRef.java index a7cb0fc008..7e78d9646e 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/UpdateRef.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/UpdateRef.java @@ -1,8 +1,12 @@ package com.bazaarvoice.emodb.sor.core; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Objects; import java.util.Set; import java.util.UUID; +import java.util.stream.Collectors; import static java.util.Objects.hash; import static java.util.Objects.requireNonNull; @@ -17,7 +21,9 @@ public final class UpdateRef { private final UUID _changeId; private final Set _tags; - public UpdateRef(String table, String key, UUID changeId, Set tags) { + + @JsonCreator + public UpdateRef(@JsonProperty("table") String table,@JsonProperty("key") String key,@JsonProperty("changeId") UUID changeId,@JsonProperty("tags") Set tags) { _table = requireNonNull(table, "table"); _key = requireNonNull(key, "key"); _changeId = requireNonNull(changeId, "changeId"); @@ -60,4 +66,13 @@ public int hashCode() { return hash(_table, _key, _changeId, _tags); } + @Override + public String toString() { + return "{" + + "\"table\":\"" + _table + "\"" + + ",\"key\":\"" + _key + "\"" + + ",\"changeId\":\"" + _changeId +"\""+ + ",\"tags\":" + _tags.stream() .map(item -> "\"" + item + "\"") .collect(Collectors.toSet()) + + "}"; + } } diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/WriteCloseableDataStore.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/WriteCloseableDataStore.java index 784e2c5fba..adcba12d6f 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/WriteCloseableDataStore.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/WriteCloseableDataStore.java @@ -297,4 +297,9 @@ public Collection getTablePlacements() { public URI getStashRoot() throws StashNotAvailableException { return _delegate.getStashRoot(); } + + @Override + public void updateRefInDatabus(List updateRefsModel) { + _delegate.updateRefInDatabus(updateRefsModel); + } } diff --git a/table/pom.xml b/table/pom.xml index 003c547b03..405ab83298 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index ba18b74396..cbdcff3d95 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index dd6e975663..2bccf39bc7 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 105a9cd896..9100962dcd 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index a41bace174..30d79c84f4 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index f5906cdb72..fcd5afb5f5 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java index 2efd03733e..1493a4524c 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java @@ -943,50 +943,13 @@ private Response redirectTo(DataCenter dataCenter, URI requestUri) { notes = "Updates a reference", response = SuccessResponse.class ) - public SuccessResponse updateRefToDatabus(InputStream in, - @QueryParam("consistency") @DefaultValue("STRONG") WriteConsistencyParam consistency, - @QueryParam("tag") List tags, + public SuccessResponse updateRefToDatabus(List updateRefs, @Authenticated Subject subject) { - Set tagsSet = (tags == null) ? ImmutableSet.of() : Sets.newHashSet(tags); - Iterable updateRefs = asSubjectSafeUpdateRefModelIterable(new JsonStreamingArrayParser<>(in, UpdateRefModel.class), subject, true); // Perform the update by writing to Databus - _dataStore.updateRefInDatabus(updateRefs, tagsSet, false); + _dataStore.updateRefInDatabus(updateRefs); return SuccessResponse.instance(); } - /** - * Takes an update ref stream from a subject and performs the following actions on it: - * 1. Checks that the subject has permission to update the record being updated - * 2. Applies any active rate limiting for updates by the subject - */ - private Iterable asSubjectSafeUpdateRefModelIterable(Iterator updateRefs, final Subject subject, final boolean isFacade) { - return Iterables.filter( - OneTimeIterable.wrap(updateRefs), - new Predicate() { - @Override - public boolean apply(UpdateRefModel updateRefModel) { - NamedResource resource = new NamedResource(updateRefModel.getTable()); - boolean hasPermission; - if (isFacade) { - hasPermission = subject.hasPermission(Permissions.updateFacade(resource)); - } else { - hasPermission = subject.hasPermission(Permissions.updateSorTable(resource)); - } - - if (!hasPermission) { - throw new UnauthorizedException("not authorized to update table " + updateRefModel.getTable()); - } - - // Facades are a unique case used internally for shoveling data across data centers, so don't rate - // limit facade updates. - if (!isFacade) { - _updateThrottle.beforeUpdate(subject.getId()); - } - - return true; - } - }); - } private UUID parseUuidOrTimestamp(@Nullable String string, boolean rangeUpperEnd) { if (string == null) { diff --git a/yum/pom.xml b/yum/pom.xml index 9fa081bcf0..88699853c3 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.210-SNAPSHOT + 6.5.211-SNAPSHOT ../parent/pom.xml From 04b480929e3d3ef3eeecc43f08ad3c8dc9fc357c Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 7 Nov 2024 13:43:20 +0000 Subject: [PATCH 25/29] branch admin -prepare release emodb-6.5.211 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 47ed6d02b1..822f8e5aab 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 2253444d61..b5a33824c6 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 4ba2bab9d9..16f5c38e17 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 503f6413af..bdbd6c393d 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.211-SNAPSHOT + 6.5.211 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index e66abd2f61..299227853b 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index fa77612bd2..0ec3b97e3f 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 84436f7aff..518fa83d11 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 5dd35296fb..395afc5d97 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index e8677484e3..2e2a52d02f 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index d934419cd9..2c9aae019a 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index dbb2feb31c..429e8ae6c3 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 8ee62ba80f..0799e5a9e3 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 24defeabfc..3fac50809b 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 52eaf70d22..e7d3e41ccb 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 3de2c02808..aa38df651e 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index c4bbfa5985..53a8c14e46 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 7bc6d2a967..8810f4623a 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 0688da04ce..63aa05c97d 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 0a5f8f8d60..c40b494009 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index a28a1d1652..daed4ca8b9 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 5df121375f..4e723480ff 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index fadca2c170..a97ac5e06f 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index d733e1ee7f..46e24f282b 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 6a1c5433e3..0ba309265d 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 3138039f4e..8c8b320881 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 2fde8e3c86..9428704331 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 7f9e414907..8c64fd0f46 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index b1146f7709..71f4d9e2db 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 884ec3f165..84d652b0a3 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index e250f820cb..703bed0353 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 78fd621b3d..f0794dc302 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 7ba5075f4d..23bc7e69cd 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 5335daa7f9..48ff23bd13 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.208-SNAPSHOT + emodb-6.5.211 diff --git a/plugins/pom.xml b/plugins/pom.xml index eac237b3eb..861d53f2e9 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 7828abe0e4..99cecf9fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.208-SNAPSHOT + emodb-6.5.211 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 067426a915..a203369b94 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index ff9a4206b9..70898a3e88 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index dd503b1e08..0a9a2e6d42 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 4a2dad51f7..76c227bf37 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 4086f47f27..a3f1daa4f5 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 883ccc564b..4090a8a777 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 4c51ae9bbd..6ef7fac99c 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 7ca7899555..68e0001bdf 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index ccd2b0c81e..11682d651e 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 055d94ec17..ab9c85d591 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index befb0f493f..fd6938ba78 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 0c354b746c..c7390ef18e 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index fe74eb06fd..20c7bed5c9 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 405ab83298..83ed7c21d0 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index cbdcff3d95..887da0cf08 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 2bccf39bc7..372a0c3bbc 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 9100962dcd..093af7999c 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 30d79c84f4..37fbef21cb 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index fcd5afb5f5..31f6b2bd71 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 88699853c3..8f62a1adde 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211-SNAPSHOT + 6.5.211 ../parent/pom.xml From 9e73faa57d4739820b2a3eb8ac1cb4731e85daad Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 7 Nov 2024 13:43:23 +0000 Subject: [PATCH 26/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 822f8e5aab..40f76cae11 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index b5a33824c6..b2cd613a18 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 16f5c38e17..74d4943723 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index bdbd6c393d..25206db161 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.211 + 6.5.212-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 299227853b..81489d6a71 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 0ec3b97e3f..7adf451c3a 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 518fa83d11..2e9077f315 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 395afc5d97..a24d66a8d6 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 2e2a52d02f..af68f9b3bc 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 2c9aae019a..7f6266ee17 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 429e8ae6c3..5096fa6c1e 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 0799e5a9e3..549001322b 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 3fac50809b..941724f73f 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index e7d3e41ccb..36a9706a20 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index aa38df651e..917656e648 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 53a8c14e46..82e3f26b3b 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 8810f4623a..415817bac8 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 63aa05c97d..7ac3cf2c5d 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index c40b494009..3b2479015e 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index daed4ca8b9..17f0018ac7 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 4e723480ff..e43f751d5c 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index a97ac5e06f..329b13fac4 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 46e24f282b..43f54557df 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 0ba309265d..343c75d9c8 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 8c8b320881..81c625ad5e 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 9428704331..0b2fbfa1a0 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 8c64fd0f46..7735a42e8b 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 71f4d9e2db..eb73cf7bb0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 84d652b0a3..fc5d5738df 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 703bed0353..06624a8166 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index f0794dc302..a803bb7557 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 23bc7e69cd..4dab5473b2 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 48ff23bd13..b970d6329c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.211 + emodb-6.5.208-SNAPSHOT diff --git a/plugins/pom.xml b/plugins/pom.xml index 861d53f2e9..61494cd706 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 99cecf9fc2..3810d44636 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.211 + emodb-6.5.208-SNAPSHOT diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index a203369b94..9e50ef3b77 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 70898a3e88..1d36603622 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 0a9a2e6d42..f84d8ce242 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 76c227bf37..801742e301 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index a3f1daa4f5..b5c98698c6 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 4090a8a777..7502791850 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 6ef7fac99c..c20f3db7e2 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 68e0001bdf..48f637e023 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 11682d651e..72a430c0dd 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index ab9c85d591..af6af5f94e 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index fd6938ba78..33d37715fe 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index c7390ef18e..42a9a21c64 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 20c7bed5c9..685d3bf7fe 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 83ed7c21d0..a8a7662940 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 887da0cf08..943ef63f29 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 372a0c3bbc..0ffd68a193 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 093af7999c..9e162e136b 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 37fbef21cb..43b5ebe2f8 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index 31f6b2bd71..dc2cf32270 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 8f62a1adde..e41016f984 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.211 + 6.5.212-SNAPSHOT ../parent/pom.xml From dfa42aa71c20ae1af43663ea9d14500ed5866208 Mon Sep 17 00:00:00 2001 From: nabajyotiDash-hub <80683084+nabajyotiDash-hub@users.noreply.github.com> Date: Fri, 8 Nov 2024 01:46:24 +0530 Subject: [PATCH 27/29] Hotfix for EU databus throttler (#851) * add logs * branch admin -prepare release emodb-6.5.212 * branch admin -prepare for next development iteration * add default to Datstore * branch admin -prepare release emodb-6.5.213 * branch admin -prepare for next development iteration * format logs for release --------- Co-authored-by: jenkins --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 2 +- plugins/pom.xml | 2 +- pom.xml | 2 +- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- .../main/java/com/bazaarvoice/emodb/sor/api/DataStore.java | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- .../bazaarvoice/emodb/sor/core/DataStoreProviderProxy.java | 5 +++++ .../com/bazaarvoice/emodb/sor/core/DefaultDataStore.java | 4 ++-- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- .../emodb/web/resources/sor/DataStoreResource1.java | 1 + yum/pom.xml | 2 +- 59 files changed, 64 insertions(+), 58 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 40f76cae11..1e3b3b23c6 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index b2cd613a18..2e4a973b89 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 74d4943723..a0df936b6f 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 25206db161..bdb490b985 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 81489d6a71..970ad359db 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 7adf451c3a..eb4eb5644e 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 2e9077f315..4e106f4624 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index a24d66a8d6..0a4a4a56d8 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index af68f9b3bc..9a3c32a918 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 7f6266ee17..eeb8c03fc5 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 5096fa6c1e..e32efb0372 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 549001322b..7712dab4dc 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 941724f73f..c1f10c2fc7 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 36a9706a20..a2bfe82d14 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 917656e648..303bc566a2 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index 82e3f26b3b..e804e43146 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 415817bac8..b4bf27645e 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 7ac3cf2c5d..cd578eee13 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 3b2479015e..d0504ae2e2 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 17f0018ac7..00e7ab47d2 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index e43f751d5c..67080afb61 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 329b13fac4..c2cb8e1e3f 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 43f54557df..84c3d0ba46 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 343c75d9c8..10d5bd7b2a 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 81c625ad5e..2f2fad3a54 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 0b2fbfa1a0..bb8f0c6f25 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 7735a42e8b..ca7da765b9 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index eb73cf7bb0..28f396e788 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index fc5d5738df..153dfc1caf 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 06624a8166..8135179239 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index a803bb7557..acee42cd78 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 4dab5473b2..588b86d277 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index b970d6329c..0a4920c4bc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 61494cd706..d5035eebf7 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 3810d44636..809f868873 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 9e50ef3b77..45ed681113 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 1d36603622..e3711c4e5b 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index f84d8ce242..a1d2a145e0 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 801742e301..fd98da4e65 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index b5c98698c6..1247b734e5 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 7502791850..3439299675 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index c20f3db7e2..d3d9c01fc6 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 48f637e023..e510f761eb 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 72a430c0dd..ef531d80f1 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java index e104444227..3e7676659c 100644 --- a/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java +++ b/sor-api/src/main/java/com/bazaarvoice/emodb/sor/api/DataStore.java @@ -266,6 +266,6 @@ URI getStashRoot() * This method is a no-op in the default implementation. It is used by the Databus to update the reference */ default void updateRefInDatabus(List updateRefs) { - + } } diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index af6af5f94e..006e4748ac 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index 33d37715fe..ae86af154b 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 42a9a21c64..68af147ec4 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 685d3bf7fe..730b9ebe1e 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DataStoreProviderProxy.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DataStoreProviderProxy.java index 607b27d2de..bc67e58e78 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DataStoreProviderProxy.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DataStoreProviderProxy.java @@ -208,4 +208,9 @@ public void dropFacade(String table, String placement, Audit audit) throws Unkno public URI getStashRoot() throws StashNotAvailableException { return _local.get().getStashRoot(); } + + @Override + public void updateRefInDatabus(List updateRefs) { + _local.get().updateRefInDatabus(updateRefs); + } } diff --git a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java index 2b65dc4fb6..5cb454b161 100644 --- a/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java +++ b/sor/src/main/java/com/bazaarvoice/emodb/sor/core/DefaultDataStore.java @@ -1053,7 +1053,7 @@ public void updateRefInDatabus(List updateRefsModel) { try { return new ObjectMapper().readValue(string, UpdateRef.class); } catch (JsonProcessingException e) { - _log.error("Error In Parsing The Message: " , e); + _log.error("Error In Parsing The Message for {}" , string, e); throw new RuntimeException(e); } }) @@ -1063,7 +1063,7 @@ public void updateRefInDatabus(List updateRefsModel) { _log.info("Successfully wrote {} number of msgs to databus", updateRefModelList.size()); } } catch (Exception e) { - _log.info("Error in writing updateRef to databus {}", e.getMessage()); + _log.info("Error in writing updateRef to databus ", e); } } } diff --git a/table/pom.xml b/table/pom.xml index a8a7662940..e7b1cbf18b 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index 943ef63f29..ce08ee9805 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 0ffd68a193..8a7c7331d1 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 9e162e136b..1e0284a833 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 43b5ebe2f8..cc68a500d5 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index dc2cf32270..ac0749db02 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java b/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java index 1493a4524c..22fabcb4bd 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/resources/sor/DataStoreResource1.java @@ -945,6 +945,7 @@ private Response redirectTo(DataCenter dataCenter, URI requestUri) { ) public SuccessResponse updateRefToDatabus(List updateRefs, @Authenticated Subject subject) { + _log.info("Inside updateRefToDatabus datastore : {}", _dataStore.getClass().getName()); // Perform the update by writing to Databus _dataStore.updateRefInDatabus(updateRefs); return SuccessResponse.instance(); diff --git a/yum/pom.xml b/yum/pom.xml index e41016f984..9118780b3f 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.212-SNAPSHOT + 6.5.214-SNAPSHOT ../parent/pom.xml From bf9002516be6fcfb4f921f2f5c38bb1a37f2c672 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 7 Nov 2024 20:21:28 +0000 Subject: [PATCH 28/29] branch admin -prepare release emodb-6.5.214 --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index 1e3b3b23c6..ed8b0f2b9e 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 2e4a973b89..7cc99bdcaf 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index a0df936b6f..9c7b8f5831 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index bdb490b985..584b3befe1 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.214-SNAPSHOT + 6.5.214 ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 970ad359db..38dc9c48d4 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index eb4eb5644e..5373af5dc4 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 4e106f4624..2a2aa88333 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 0a4a4a56d8..b12485668b 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 9a3c32a918..5943490a06 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index eeb8c03fc5..badcb99dbe 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index e32efb0372..03c38bbd8d 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 7712dab4dc..c092c80243 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index c1f10c2fc7..3c1be4d538 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index a2bfe82d14..0a0732dd5c 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 303bc566a2..8fbcb7a612 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index e804e43146..d217ddae07 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index b4bf27645e..6f1ee9c684 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index cd578eee13..83e2877907 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index d0504ae2e2..b5b9eb59ca 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 00e7ab47d2..231cf542aa 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 67080afb61..e343a91b16 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index c2cb8e1e3f..0b64b03cf6 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 84c3d0ba46..f050736e3c 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 10d5bd7b2a..30a7559502 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 2f2fad3a54..5028616a19 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index bb8f0c6f25..4da4cd95d3 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index ca7da765b9..4466728e52 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index 28f396e788..bf0bd28ae4 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 153dfc1caf..63c67ad9ad 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index 8135179239..b8ef5e2b7f 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index acee42cd78..e9c87a1ef5 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 588b86d277..536ab0a744 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 0a4920c4bc..3aee26a39c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.208-SNAPSHOT + emodb-6.5.214 diff --git a/plugins/pom.xml b/plugins/pom.xml index d5035eebf7..7e64c8f2e1 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 809f868873..3ad0f6aa82 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.208-SNAPSHOT + emodb-6.5.214 diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 45ed681113..508937d7f1 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index e3711c4e5b..1592d79c24 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index a1d2a145e0..3bcc3731ec 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index fd98da4e65..6f045793d7 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 1247b734e5..d74ac8c742 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 3439299675..9684498c4d 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index d3d9c01fc6..c5f1228fa4 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index e510f761eb..6062a44745 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index ef531d80f1..9c9a10c087 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 006e4748ac..3231943f79 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index ae86af154b..d151afb628 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 68af147ec4..8cb2d0f5b4 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 730b9ebe1e..d56b537f51 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index e7b1cbf18b..7b1b0fc147 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index ce08ee9805..cee84b3950 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 8a7c7331d1..81b5af8212 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 1e0284a833..21e685bab2 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index cc68a500d5..54915ec60f 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index ac0749db02..f06f815b0a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 9118780b3f..7d2b85cb0e 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214-SNAPSHOT + 6.5.214 ../parent/pom.xml From 8184514eb831eb9f874718741ab701d2d02a638c Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 7 Nov 2024 20:21:29 +0000 Subject: [PATCH 29/29] branch admin -prepare for next development iteration --- auth/auth-client/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-store/pom.xml | 2 +- auth/auth-util/pom.xml | 2 +- blob-api/pom.xml | 2 +- blob-clients/blob-client-common/pom.xml | 2 +- blob-clients/blob-client-jersey2/pom.xml | 2 +- blob-clients/blob-client/pom.xml | 2 +- blob/pom.xml | 2 +- cachemgr/pom.xml | 2 +- common/api/pom.xml | 2 +- common/astyanax/pom.xml | 2 +- common/client-jax-rs-2/pom.xml | 2 +- common/client-jersey2/pom.xml | 2 +- common/client/pom.xml | 2 +- common/dropwizard/pom.xml | 2 +- common/jersey-client/pom.xml | 2 +- common/json/pom.xml | 2 +- common/stash/pom.xml | 2 +- common/uuid/pom.xml | 2 +- common/zookeeper/pom.xml | 2 +- databus-api/pom.xml | 2 +- databus-client-common/pom.xml | 2 +- databus-client-jersey2/pom.xml | 2 +- databus-client/pom.xml | 2 +- databus/pom.xml | 2 +- datacenter/pom.xml | 2 +- event/pom.xml | 2 +- job-api/pom.xml | 2 +- job/pom.xml | 2 +- kafka/pom.xml | 2 +- megabus/pom.xml | 2 +- parent/pom.xml | 4 ++-- plugins/pom.xml | 2 +- pom.xml | 4 ++-- quality/integration/pom.xml | 2 +- quality/pom.xml | 2 +- queue-api/pom.xml | 2 +- queue-client-common/pom.xml | 2 +- queue-client-jersey2/pom.xml | 2 +- queue-client/pom.xml | 2 +- queue/pom.xml | 2 +- sdk/pom.xml | 2 +- sor-api/pom.xml | 2 +- sor-client-common/pom.xml | 2 +- sor-client-jersey2/pom.xml | 2 +- sor-client/pom.xml | 2 +- sor/pom.xml | 2 +- table/pom.xml | 2 +- uac-api/pom.xml | 2 +- uac-client-jersey2/pom.xml | 2 +- uac-client/pom.xml | 2 +- web-local/pom.xml | 2 +- web/pom.xml | 2 +- yum/pom.xml | 2 +- 55 files changed, 57 insertions(+), 57 deletions(-) diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index ed8b0f2b9e..e2e098e24f 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 7cc99bdcaf..46e57a97ec 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index 9c7b8f5831..67aada572a 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 584b3befe1..56ac22c96a 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.214 + 6.5.215-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 38dc9c48d4..32abce6810 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 5373af5dc4..fcce0b9e2d 100644 --- a/blob-clients/blob-client-common/pom.xml +++ b/blob-clients/blob-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 2a2aa88333..09e83f00bd 100644 --- a/blob-clients/blob-client-jersey2/pom.xml +++ b/blob-clients/blob-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index b12485668b..bf68f93573 100644 --- a/blob-clients/blob-client/pom.xml +++ b/blob-clients/blob-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 5943490a06..9066916d7b 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index badcb99dbe..d10e967816 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 03c38bbd8d..3314b782a5 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index c092c80243..7bbfdfa77b 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 3c1be4d538..78a2a62a0b 100644 --- a/common/client-jax-rs-2/pom.xml +++ b/common/client-jax-rs-2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 0a0732dd5c..d9e154bbba 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 8fbcb7a612..3e735f0397 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index d217ddae07..d15fd1fd86 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 6f1ee9c684..8b0a41dba1 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 83e2877907..222c09e03b 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index b5b9eb59ca..cec5363066 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 231cf542aa..d21473d72d 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index e343a91b16..9788878562 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 0b64b03cf6..66f46199a5 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index f050736e3c..5cf7467680 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 30a7559502..9e18722dbe 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 5028616a19..c680c82106 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 4da4cd95d3..b9f179a258 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index 4466728e52..bf48013de3 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/event/pom.xml b/event/pom.xml index bf0bd28ae4..cbd59540a0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 63c67ad9ad..03aa1aa8ad 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index b8ef5e2b7f..39a5129387 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index e9c87a1ef5..541dbe1fcc 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index 536ab0a744..5a48371190 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 3aee26a39c..0dd5b4a07d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT pom EmoDB Parent @@ -20,7 +20,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.214 + emodb-6.5.208-SNAPSHOT diff --git a/plugins/pom.xml b/plugins/pom.xml index 7e64c8f2e1..d1858c5926 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/pom.xml b/pom.xml index 3ad0f6aa82..d352e7a2d7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT parent/pom.xml @@ -18,7 +18,7 @@ scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git scm:git:git@github.com:bazaarvoice/emodb.git - emodb-6.5.214 + emodb-6.5.208-SNAPSHOT diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 508937d7f1..dab93da959 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../../parent/pom.xml diff --git a/quality/pom.xml b/quality/pom.xml index 1592d79c24..947f0883d4 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 3bcc3731ec..3f8987c2db 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 6f045793d7..79319f2706 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index d74ac8c742..070139e899 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 9684498c4d..124722aff7 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index c5f1228fa4..416a08a1b6 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 6062a44745..81b0ee0b03 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 9c9a10c087..81e16753c4 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index 3231943f79..cf1a7df1b5 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index d151afb628..15f4ca4283 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 8cb2d0f5b4..9493c37ff1 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index d56b537f51..fb2ffa746c 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index 7b1b0fc147..bf8da54674 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index cee84b3950..b09909fc1d 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 81b5af8212..ec42f043a3 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index 21e685bab2..e9dff54e69 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/web-local/pom.xml b/web-local/pom.xml index 54915ec60f..08dcb75859 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/web/pom.xml b/web/pom.xml index f06f815b0a..2016f124be 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml diff --git a/yum/pom.xml b/yum/pom.xml index 7d2b85cb0e..00f182e296 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.214 + 6.5.215-SNAPSHOT ../parent/pom.xml