diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml index ab22a7c072..8ec17b61b8 100644 --- a/auth/auth-client/pom.xml +++ b/auth/auth-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml @@ -22,4 +22,4 @@ guava - \ No newline at end of file + diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index dc3868dcb7..8529b6742d 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-store/pom.xml b/auth/auth-store/pom.xml index d4e572aea6..9756ffc863 100644 --- a/auth/auth-store/pom.xml +++ b/auth/auth-store/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/auth/auth-util/pom.xml b/auth/auth-util/pom.xml index 5393386e8e..4727f34beb 100644 --- a/auth/auth-util/pom.xml +++ b/auth/auth-util/pom.xml @@ -3,7 +3,7 @@ emodb com.bazaarvoice.emodb - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/blob-api/pom.xml b/blob-api/pom.xml index 477c099ad7..a1d568ca36 100644 --- a/blob-api/pom.xml +++ b/blob-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/blob-clients/blob-client-common/pom.xml b/blob-clients/blob-client-common/pom.xml index 61d9ef5528..794f7b65c0 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.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client-jersey2/pom.xml b/blob-clients/blob-client-jersey2/pom.xml index 6b62ddd5e5..e22a2cf5ef 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.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/blob-clients/blob-client/pom.xml b/blob-clients/blob-client/pom.xml index 726f9414d3..10d2979257 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.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/blob/pom.xml b/blob/pom.xml index 8889d6123f..557374bfee 100644 --- a/blob/pom.xml +++ b/blob/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/cachemgr/pom.xml b/cachemgr/pom.xml index 6433ea08cb..4ee227ba35 100644 --- a/cachemgr/pom.xml +++ b/cachemgr/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/common/api/pom.xml b/common/api/pom.xml index 7d95ac2021..8de200511c 100644 --- a/common/api/pom.xml +++ b/common/api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/astyanax/pom.xml b/common/astyanax/pom.xml index 156e53ca2f..f19741a8f7 100644 --- a/common/astyanax/pom.xml +++ b/common/astyanax/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jax-rs-2/pom.xml b/common/client-jax-rs-2/pom.xml index 0cd0851a1b..f90cbc0fab 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.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/client-jersey2/pom.xml b/common/client-jersey2/pom.xml index 71576b755f..2b0a44258a 100644 --- a/common/client-jersey2/pom.xml +++ b/common/client-jersey2/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/client/pom.xml b/common/client/pom.xml index 91c5505962..7289c58229 100644 --- a/common/client/pom.xml +++ b/common/client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/dropwizard/pom.xml b/common/dropwizard/pom.xml index ad8bcc7330..0e706ea476 100644 --- a/common/dropwizard/pom.xml +++ b/common/dropwizard/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/jersey-client/pom.xml b/common/jersey-client/pom.xml index 3193d213f1..b205afb70a 100644 --- a/common/jersey-client/pom.xml +++ b/common/jersey-client/pom.xml @@ -5,7 +5,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/json/pom.xml b/common/json/pom.xml index 6d3d32f54b..9849da4515 100644 --- a/common/json/pom.xml +++ b/common/json/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/stash/pom.xml b/common/stash/pom.xml index 8846bc9d22..04780bad78 100644 --- a/common/stash/pom.xml +++ b/common/stash/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/uuid/pom.xml b/common/uuid/pom.xml index 48aabc29ff..43bee156db 100644 --- a/common/uuid/pom.xml +++ b/common/uuid/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/common/zookeeper/pom.xml b/common/zookeeper/pom.xml index 4cd335dca6..34e720ebf1 100644 --- a/common/zookeeper/pom.xml +++ b/common/zookeeper/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/databus-api/pom.xml b/databus-api/pom.xml index 82a667ef01..48441e7a8a 100644 --- a/databus-api/pom.xml +++ b/databus-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-common/pom.xml b/databus-client-common/pom.xml index 56b088a593..0d97607524 100644 --- a/databus-client-common/pom.xml +++ b/databus-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/pom.xml b/databus-client-jersey2/pom.xml index 78e1107f2b..056a0d8634 100644 --- a/databus-client-jersey2/pom.xml +++ b/databus-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/databus-client-jersey2/src/main/java/com/bazaarvoice/emodb/databus/client/DatabusClient.java b/databus-client-jersey2/src/main/java/com/bazaarvoice/emodb/databus/client/DatabusClient.java index a33c811e7c..0af9a4ca06 100644 --- a/databus-client-jersey2/src/main/java/com/bazaarvoice/emodb/databus/client/DatabusClient.java +++ b/databus-client-jersey2/src/main/java/com/bazaarvoice/emodb/databus/client/DatabusClient.java @@ -306,7 +306,8 @@ public void acknowledge(String subscription, Collection eventKeys) { .queryParam("partitioned", _partitionSafe) .build(); _log.debug("Uri for acknowledge call:{} ", uri.toString()); - + _log.info("entering point"); + _log.info("event keys {}",eventKeys); Failsafe.with(_retryPolicy) .run(() -> _client.resource(uri) .type(MediaType.APPLICATION_JSON_TYPE) @@ -314,6 +315,8 @@ public void acknowledge(String subscription, Collection eventKeys) { .post(Entity.entity(eventKeys, "application/x.json-condition"))); } catch (UnknownHostException e) { throw new RuntimeException(e); + } catch (Exception e) { + _log.error("error occured from acknowledge ",e); } } diff --git a/databus-client/pom.xml b/databus-client/pom.xml index 9f214e412a..1fe451a948 100644 --- a/databus-client/pom.xml +++ b/databus-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/databus/pom.xml b/databus/pom.xml index 7ed56ba8db..f1a60906bb 100644 --- a/databus/pom.xml +++ b/databus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/datacenter/pom.xml b/datacenter/pom.xml index beb3e5b72a..8f82c2eb00 100644 --- a/datacenter/pom.xml +++ b/datacenter/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/docker/configs/config-megabus-dc1.yaml b/docker/configs/config-megabus-dc1.yaml index e3af41a057..bd99e21210 100644 --- a/docker/configs/config-megabus-dc1.yaml +++ b/docker/configs/config-megabus-dc1.yaml @@ -199,8 +199,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/docker/configs/config-megabus-dc2.yaml b/docker/configs/config-megabus-dc2.yaml index 99c9f58bf5..e06d4e6ddc 100644 --- a/docker/configs/config-megabus-dc2.yaml +++ b/docker/configs/config-megabus-dc2.yaml @@ -199,8 +199,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/docker/configs/config-stash-dc1.yaml b/docker/configs/config-stash-dc1.yaml index bbc6ecadc3..642f6e6c18 100644 --- a/docker/configs/config-stash-dc1.yaml +++ b/docker/configs/config-stash-dc1.yaml @@ -122,8 +122,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/docker/configs/config-stash-dc2.yaml b/docker/configs/config-stash-dc2.yaml index 1e82d5bf44..0fc6cc279e 100644 --- a/docker/configs/config-stash-dc2.yaml +++ b/docker/configs/config-stash-dc2.yaml @@ -122,8 +122,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/docker/configs/config-web-dc1.yaml b/docker/configs/config-web-dc1.yaml index ae9c3e0151..ce6a2fc399 100644 --- a/docker/configs/config-web-dc1.yaml +++ b/docker/configs/config-web-dc1.yaml @@ -161,8 +161,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/docker/configs/config-web-dc2.yaml b/docker/configs/config-web-dc2.yaml index cce6ddd463..6c9596287d 100644 --- a/docker/configs/config-web-dc2.yaml +++ b/docker/configs/config-web-dc2.yaml @@ -161,8 +161,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/event/pom.xml b/event/pom.xml index 8d190f797e..e2f4e7cd39 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/job-api/pom.xml b/job-api/pom.xml index 80dfa46a9e..7b27c60cda 100644 --- a/job-api/pom.xml +++ b/job-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/job/pom.xml b/job/pom.xml index b21cc27b5e..8abfa55d8e 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/kafka/pom.xml b/kafka/pom.xml index 14978459c3..b6840783b5 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/megabus/pom.xml b/megabus/pom.xml index f9def7d9d7..589e1ea832 100644 --- a/megabus/pom.xml +++ b/megabus/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/parent/pom.xml b/parent/pom.xml index 720b08932e..3e53fa61fa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT pom EmoDB Parent diff --git a/plugins/pom.xml b/plugins/pom.xml index 7df7060482..5ea4489bdb 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml @@ -78,4 +78,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 305f5976f7..e341635103 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT parent/pom.xml diff --git a/quality/integration/pom.xml b/quality/integration/pom.xml index 8a5fb49c8b..3dd3c36073 100644 --- a/quality/integration/pom.xml +++ b/quality/integration/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../../parent/pom.xml diff --git a/quality/integration/src/test/resources/config-all-role.yaml b/quality/integration/src/test/resources/config-all-role.yaml index bc5b00817e..9e6a95f808 100644 --- a/quality/integration/src/test/resources/config-all-role.yaml +++ b/quality/integration/src/test/resources/config-all-role.yaml @@ -161,8 +161,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" #compaction-control anonymousRoles: - anonymous diff --git a/quality/integration/src/test/resources/config-stash-role.yaml b/quality/integration/src/test/resources/config-stash-role.yaml index 694ca4a6f6..6facf25110 100644 --- a/quality/integration/src/test/resources/config-stash-role.yaml +++ b/quality/integration/src/test/resources/config-stash-role.yaml @@ -157,8 +157,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/quality/pom.xml b/quality/pom.xml index fd258b1bf9..dc63e597be 100644 --- a/quality/pom.xml +++ b/quality/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/queue-api/pom.xml b/queue-api/pom.xml index 201c1e3180..142af6125f 100644 --- a/queue-api/pom.xml +++ b/queue-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-common/pom.xml b/queue-client-common/pom.xml index 6499732964..1923f51798 100644 --- a/queue-client-common/pom.xml +++ b/queue-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/queue-client-jersey2/pom.xml b/queue-client-jersey2/pom.xml index 5e2e74272d..427416545d 100644 --- a/queue-client-jersey2/pom.xml +++ b/queue-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/queue-client/pom.xml b/queue-client/pom.xml index 2ec9d394ba..986a55cb29 100644 --- a/queue-client/pom.xml +++ b/queue-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/queue/pom.xml b/queue/pom.xml index 790b45baaa..0266f48e1e 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index fa660693ed..ec974ebf28 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/sdk/src/main/java/com/bazaarvoice/emodb/sdk/EmoStartMojo.java b/sdk/src/main/java/com/bazaarvoice/emodb/sdk/EmoStartMojo.java index 507518ca54..298204dd21 100644 --- a/sdk/src/main/java/com/bazaarvoice/emodb/sdk/EmoStartMojo.java +++ b/sdk/src/main/java/com/bazaarvoice/emodb/sdk/EmoStartMojo.java @@ -346,7 +346,8 @@ private URI getEmoUri(MinimalEmoConfiguration config) { } private String getAdminApiKey(MinimalEmoConfiguration config) { - return new ApiKeyEncryption(config.cluster).decrypt(config.auth.adminApiKey); + // return new ApiKeyEncryption(config.cluster).decrypt(config.auth.adminApiKey); + return config.auth.adminApiKey; } @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/sdk/src/main/resources/emodb-default-config.yaml b/sdk/src/main/resources/emodb-default-config.yaml index 7eaf20165d..c18cfc8294 100644 --- a/sdk/src/main/resources/emodb-default-config.yaml +++ b/sdk/src/main/resources/emodb-default-config.yaml @@ -161,8 +161,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/sor-api/pom.xml b/sor-api/pom.xml index 161edd13d3..fa256efa01 100644 --- a/sor-api/pom.xml +++ b/sor-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-common/pom.xml b/sor-client-common/pom.xml index cfc9041313..6d903c1792 100644 --- a/sor-client-common/pom.xml +++ b/sor-client-common/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/sor-client-jersey2/pom.xml b/sor-client-jersey2/pom.xml index f4b18b40cf..3db547b68c 100644 --- a/sor-client-jersey2/pom.xml +++ b/sor-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/sor-client/pom.xml b/sor-client/pom.xml index 4394adbd58..4609d3f67f 100644 --- a/sor-client/pom.xml +++ b/sor-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/sor/pom.xml b/sor/pom.xml index 971da8401e..53d3212c15 100644 --- a/sor/pom.xml +++ b/sor/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/table/pom.xml b/table/pom.xml index adc2c89d16..cc8f8b276a 100644 --- a/table/pom.xml +++ b/table/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/uac-api/pom.xml b/uac-api/pom.xml index ad6fe938d5..522fef6945 100644 --- a/uac-api/pom.xml +++ b/uac-api/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/uac-client-jersey2/pom.xml b/uac-client-jersey2/pom.xml index 11627f21b2..1dbe26b9e0 100644 --- a/uac-client-jersey2/pom.xml +++ b/uac-client-jersey2/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/uac-client/pom.xml b/uac-client/pom.xml index f73ac9cbf0..9b34c54ba4 100644 --- a/uac-client/pom.xml +++ b/uac-client/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/web-local/config-dc2.yaml b/web-local/config-dc2.yaml index 5114037b40..27dec5d0eb 100644 --- a/web-local/config-dc2.yaml +++ b/web-local/config-dc2.yaml @@ -138,8 +138,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication anonymousRoles: - anonymous compControlApiKey: "local_admin" # compaction-control diff --git a/web-local/config-jenkins.yaml b/web-local/config-jenkins.yaml index 3ff573b686..a5c37c9fb3 100644 --- a/web-local/config-jenkins.yaml +++ b/web-local/config-jenkins.yaml @@ -186,8 +186,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication anonymousRoles: - anonymous diff --git a/web-local/config-local-2.yaml b/web-local/config-local-2.yaml index 1c4ece652e..b8432fb89c 100644 --- a/web-local/config-local-2.yaml +++ b/web-local/config-local-2.yaml @@ -200,8 +200,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/config-local-blob-role.yaml b/web-local/config-local-blob-role.yaml index de4e96b273..6a0e5a381d 100644 --- a/web-local/config-local-blob-role.yaml +++ b/web-local/config-local-blob-role.yaml @@ -182,8 +182,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/config-local-dc1.yaml b/web-local/config-local-dc1.yaml index fd23e2ebc2..be212dd492 100644 --- a/web-local/config-local-dc1.yaml +++ b/web-local/config-local-dc1.yaml @@ -201,8 +201,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/config-local-main-role.yaml b/web-local/config-local-main-role.yaml index cb01c66238..f22a94a91e 100644 --- a/web-local/config-local-main-role.yaml +++ b/web-local/config-local-main-role.yaml @@ -185,8 +185,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication anonymousRoles: - anonymous diff --git a/web-local/config-local.yaml b/web-local/config-local.yaml index 616162f851..291d9b6f1d 100644 --- a/web-local/config-local.yaml +++ b/web-local/config-local.yaml @@ -201,8 +201,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/config-megabus.yaml b/web-local/config-megabus.yaml index 9ade21e5d7..74cab5d087 100644 --- a/web-local/config-megabus.yaml +++ b/web-local/config-megabus.yaml @@ -225,8 +225,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/config-scantest.yaml b/web-local/config-scantest.yaml index 60f72d70a4..c2b54090e4 100644 --- a/web-local/config-scantest.yaml +++ b/web-local/config-scantest.yaml @@ -193,8 +193,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/config-web.yaml b/web-local/config-web.yaml index a3e321bea8..df01c29f48 100644 --- a/web-local/config-web.yaml +++ b/web-local/config-web.yaml @@ -201,8 +201,8 @@ auth: # The admin and replication API keys must be encrypted using the encrypt-configuration-api-key command # The unencrypted values are included below to make local testing easier. It should go without saying that # IN A PRODUCTION ENVIRONMENT DO NOT INCLUDE THE UNENCRYPTED KEYS IN THIS FILE! - adminApiKey: "zl+p3AU4/EgT8OtR0ZmLrkL70j0SklugAzd+xxYR1Dz/rioe5aXo4yay7sKi7PSKD59h7/HumH7442nGhlR2rw" # local_admin - replicationApiKey: "iuOPUIfI0lyxRrNZ9j9Aa68m1yrALBbVMw8kdqb6FVhSwMgOXVsuUblLr9nL73D4xpMVEZZHZr50pCBy1gbjDg" # local_replication + adminApiKey: "local_admin" # local_admin + replicationApiKey: "local_replication" # local_replication compControlApiKey: "local_admin" # compaction-control anonymousRoles: - anonymous diff --git a/web-local/pom.xml b/web-local/pom.xml index 6a67b3ae5c..6217ae14c2 100644 --- a/web-local/pom.xml +++ b/web-local/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml @@ -408,4 +408,4 @@ - \ No newline at end of file + diff --git a/web-local/src/main/java/com/bazaarvoice/emodb/local/EmoServiceWithZK.java b/web-local/src/main/java/com/bazaarvoice/emodb/local/EmoServiceWithZK.java index 96c13220ba..5ff2b14d07 100644 --- a/web-local/src/main/java/com/bazaarvoice/emodb/local/EmoServiceWithZK.java +++ b/web-local/src/main/java/com/bazaarvoice/emodb/local/EmoServiceWithZK.java @@ -241,15 +241,15 @@ protected void configure() { Injector injector = Guice.createInjector(module); HostAndPort selfHostAndPort = injector.getInstance(Key.get(HostAndPort.class, SelfHostAndPort.class)); - ApiKeyEncryption apiKeyEncryption = injector.getInstance(ApiKeyEncryption.class); + // ApiKeyEncryption apiKeyEncryption = injector.getInstance(ApiKeyEncryption.class); String adminApiKey = emoConfig.getAuthorizationConfiguration().getAdminApiKey(); - try { - adminApiKey = apiKeyEncryption.decrypt(adminApiKey); - } catch (Exception e) { - if (ApiKeyEncryption.isPotentiallyEncryptedApiKey(adminApiKey)) { - throw e; - } - } +// try { +// adminApiKey = apiKeyEncryption.decrypt(adminApiKey); +// } catch (Exception e) { +// if (ApiKeyEncryption.isPotentiallyEncryptedApiKey(adminApiKey)) { +// throw e; +// } +// } // Create a client for the local EmoDB service UserAccessControl uac = ServicePoolBuilder.create(UserAccessControl.class) diff --git a/web/pom.xml b/web/pom.xml index dd6de99194..2a797f12cf 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml diff --git a/web/src/main/java/com/bazaarvoice/emodb/web/auth/SecurityModule.java b/web/src/main/java/com/bazaarvoice/emodb/web/auth/SecurityModule.java index f8e493b20b..37d087bd18 100644 --- a/web/src/main/java/com/bazaarvoice/emodb/web/auth/SecurityModule.java +++ b/web/src/main/java/com/bazaarvoice/emodb/web/auth/SecurityModule.java @@ -178,7 +178,8 @@ DropwizardAuthConfigurator provideDropwizardAuthConfigurator(SecurityManager sec @Singleton @ReplicationKey String provideReplicationKey(AuthorizationConfiguration config, ApiKeyEncryption encryption) { - return configurationKeyAsPlaintext(config.getReplicationApiKey(), encryption, "replication"); +// return configurationKeyAsPlaintext(config.getReplicationApiKey(), encryption, "replication"); + return config.getReplicationApiKey(); } @Provides @@ -193,7 +194,8 @@ String provideCompControlKey(AuthorizationConfiguration config, ApiKeyEncryption @Exposed @Named("AdminKey") String provideAdminKey(AuthorizationConfiguration config, ApiKeyEncryption encryption) { - return configurationKeyAsPlaintext(config.getAdminApiKey(), encryption, "admin"); + // return configurationKeyAsPlaintext(config.getAdminApiKey(), encryption, "admin"); + return config.getAdminApiKey(); } private String configurationKeyAsPlaintext(String key, ApiKeyEncryption encryption, String description) { diff --git a/yum/pom.xml b/yum/pom.xml index 8b0430afe4..2c25650f7f 100644 --- a/yum/pom.xml +++ b/yum/pom.xml @@ -4,7 +4,7 @@ com.bazaarvoice.emodb emodb-parent - 6.5.51-SNAPSHOT + 6.5.66-SNAPSHOT ../parent/pom.xml