From 2afd12f1010799ee84f7975c2090fa3416b4a31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20J=C3=B8rgensrud?= Date: Tue, 28 Mar 2023 13:53:07 +0200 Subject: [PATCH 1/6] [FKJ-899] Set new correlationId header --- pom.xml | 5 +++-- servicebuilder-activemq/pom.xml | 2 +- servicebuilder-addons/pom.xml | 2 +- servicebuilder-core-addons/pom.xml | 2 +- servicebuilder-core-test/pom.xml | 2 +- servicebuilder-core/pom.xml | 2 +- .../util/servicebuilder/client/RequestIdClientFilter.java | 1 + servicebuilder-db-basicdatasource/pom.xml | 2 +- servicebuilder-db-h2/pom.xml | 2 +- servicebuilder-db-jdbi/pom.xml | 2 +- servicebuilder-db-queryrunner/pom.xml | 2 +- servicebuilder-db/pom.xml | 2 +- servicebuilder-elasticsearch-mock/pom.xml | 2 +- servicebuilder-elasticsearch/pom.xml | 2 +- servicebuilder-iam/pom.xml | 2 +- servicebuilder-interfaces/pom.xml | 2 +- .../java/no/obos/util/servicebuilder/model/Constants.java | 1 + 17 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 2e163b5b..d803d5f0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,14 @@ 4.0.0 no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT pom + no.obos.common obos-common-pom - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml index 95c7f6e2..876b671f 100644 --- a/servicebuilder-activemq/pom.xml +++ b/servicebuilder-activemq/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml index 45d60159..5dd6403e 100644 --- a/servicebuilder-addons/pom.xml +++ b/servicebuilder-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index 73bd27c8..4daafba0 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml index e305522e..de882165 100644 --- a/servicebuilder-core-test/pom.xml +++ b/servicebuilder-core-test/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml index 8b7f5cef..e9fcd3ae 100644 --- a/servicebuilder-core/pom.xml +++ b/servicebuilder-core/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java b/servicebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java index bf006bb6..d6b3fe0b 100644 --- a/servicebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java +++ b/servicebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java @@ -16,6 +16,7 @@ public void filter(ClientRequestContext requestContext) throws IOException { String requestId = MDC.get(Constants.X_OBOS_REQUEST_ID); if (requestId != null) { requestContext.getHeaders().putSingle(Constants.X_OBOS_REQUEST_ID, requestId); + requestContext.getHeaders().putSingle(Constants.CORRELATION_ID, requestId); } } } diff --git a/servicebuilder-db-basicdatasource/pom.xml b/servicebuilder-db-basicdatasource/pom.xml index 2d66fa39..5d99a95d 100644 --- a/servicebuilder-db-basicdatasource/pom.xml +++ b/servicebuilder-db-basicdatasource/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml index 6a0d345b..d7873e41 100644 --- a/servicebuilder-db-h2/pom.xml +++ b/servicebuilder-db-h2/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml index 39545249..f02174e7 100644 --- a/servicebuilder-db-jdbi/pom.xml +++ b/servicebuilder-db-jdbi/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml index 8d27110f..3b8684c3 100644 --- a/servicebuilder-db-queryrunner/pom.xml +++ b/servicebuilder-db-queryrunner/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml index 42548c2f..dd0cbd59 100644 --- a/servicebuilder-db/pom.xml +++ b/servicebuilder-db/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml index 5c761385..a5bee2ba 100644 --- a/servicebuilder-elasticsearch-mock/pom.xml +++ b/servicebuilder-elasticsearch-mock/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT 4.0.0 diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml index b563239f..eaa9189c 100644 --- a/servicebuilder-elasticsearch/pom.xml +++ b/servicebuilder-elasticsearch/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT 4.0.0 diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml index 4c3c57a3..de57e49c 100644 --- a/servicebuilder-iam/pom.xml +++ b/servicebuilder-iam/pom.xml @@ -6,7 +6,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-interfaces/pom.xml b/servicebuilder-interfaces/pom.xml index 6dc2765d..523aa929 100644 --- a/servicebuilder-interfaces/pom.xml +++ b/servicebuilder-interfaces/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.2.0-SNAPSHOT diff --git a/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java b/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java index 129ea0bc..76707dd8 100644 --- a/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java +++ b/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java @@ -5,6 +5,7 @@ public final class Constants { public static final String CLIENT_APPNAME_HEADER = "X-OBOS-CLIENT-APPNAME"; public static final String USERTOKENID_HEADER = "X-OBOS-USERTOKENID"; public static final String X_OBOS_REQUEST_ID = "X-OBOS-REQUEST-ID"; + public static final String CORRELATION_ID = "correlationId"; public static final String APPCONFIG_KEY = "SERVICE_CONFIG"; public static final String CONFIG_KEY_SERVICE_VERSION = "service.version"; public static final String CONFIG_KEY_SERVICE_VERSION_MAJOR = "service.version.major"; From 0e83bbaade66f1b685be21def449073a182908fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20J=C3=B8rgensrud?= Date: Wed, 29 Mar 2023 09:01:39 +0200 Subject: [PATCH 2/6] correct SNAPSHOT --- pom.xml | 4 ++-- servicebuilder-activemq/pom.xml | 2 +- servicebuilder-addons/pom.xml | 2 +- servicebuilder-core-addons/pom.xml | 2 +- servicebuilder-core-test/pom.xml | 2 +- servicebuilder-core/pom.xml | 2 +- servicebuilder-db-basicdatasource/pom.xml | 2 +- servicebuilder-db-h2/pom.xml | 2 +- servicebuilder-db-jdbi/pom.xml | 2 +- servicebuilder-db-queryrunner/pom.xml | 2 +- servicebuilder-db/pom.xml | 2 +- servicebuilder-elasticsearch-mock/pom.xml | 2 +- servicebuilder-elasticsearch/pom.xml | 2 +- servicebuilder-iam/pom.xml | 2 +- servicebuilder-interfaces/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index d803d5f0..680335d7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT pom no.obos.common obos-common-pom - 10.2.0-SNAPSHOT + 10.1.13 diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml index 876b671f..faae4460 100644 --- a/servicebuilder-activemq/pom.xml +++ b/servicebuilder-activemq/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml index 5dd6403e..4dc51893 100644 --- a/servicebuilder-addons/pom.xml +++ b/servicebuilder-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index 4daafba0..a5fb6b8c 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml index de882165..ee84a8eb 100644 --- a/servicebuilder-core-test/pom.xml +++ b/servicebuilder-core-test/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml index e9fcd3ae..223abbdf 100644 --- a/servicebuilder-core/pom.xml +++ b/servicebuilder-core/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-basicdatasource/pom.xml b/servicebuilder-db-basicdatasource/pom.xml index 5d99a95d..ff73c85e 100644 --- a/servicebuilder-db-basicdatasource/pom.xml +++ b/servicebuilder-db-basicdatasource/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml index d7873e41..78e0045d 100644 --- a/servicebuilder-db-h2/pom.xml +++ b/servicebuilder-db-h2/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml index f02174e7..06f1e214 100644 --- a/servicebuilder-db-jdbi/pom.xml +++ b/servicebuilder-db-jdbi/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml index 3b8684c3..1da5ed25 100644 --- a/servicebuilder-db-queryrunner/pom.xml +++ b/servicebuilder-db-queryrunner/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml index dd0cbd59..fafa68da 100644 --- a/servicebuilder-db/pom.xml +++ b/servicebuilder-db/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml index a5bee2ba..97515798 100644 --- a/servicebuilder-elasticsearch-mock/pom.xml +++ b/servicebuilder-elasticsearch-mock/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT 4.0.0 diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml index eaa9189c..f83fc9eb 100644 --- a/servicebuilder-elasticsearch/pom.xml +++ b/servicebuilder-elasticsearch/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT 4.0.0 diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml index de57e49c..7796890e 100644 --- a/servicebuilder-iam/pom.xml +++ b/servicebuilder-iam/pom.xml @@ -6,7 +6,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT diff --git a/servicebuilder-interfaces/pom.xml b/servicebuilder-interfaces/pom.xml index 523aa929..6ed11539 100644 --- a/servicebuilder-interfaces/pom.xml +++ b/servicebuilder-interfaces/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.2.0-SNAPSHOT + 11.0.0-SNAPSHOT From a04144ef89771c91b11475e1edcbf96782726df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20J=C3=B8rgensrud?= Date: Wed, 29 Mar 2023 09:51:25 +0200 Subject: [PATCH 3/6] [VERSION] 10.1.15 --- pom.xml | 4 ++-- servicebuilder-activemq/pom.xml | 2 +- servicebuilder-addons/pom.xml | 2 +- servicebuilder-core-addons/pom.xml | 2 +- servicebuilder-core-test/pom.xml | 2 +- servicebuilder-core/pom.xml | 2 +- servicebuilder-db-basicdatasource/pom.xml | 2 +- servicebuilder-db-h2/pom.xml | 2 +- servicebuilder-db-jdbi/pom.xml | 2 +- servicebuilder-db-queryrunner/pom.xml | 2 +- servicebuilder-db/pom.xml | 2 +- servicebuilder-elasticsearch-mock/pom.xml | 2 +- servicebuilder-elasticsearch/pom.xml | 2 +- servicebuilder-iam/pom.xml | 2 +- servicebuilder-interfaces/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 680335d7..cafe818a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 pom no.obos.common obos-common-pom - 10.1.13 + 10.1.15 diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml index faae4460..38640e09 100644 --- a/servicebuilder-activemq/pom.xml +++ b/servicebuilder-activemq/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml index 4dc51893..199857a1 100644 --- a/servicebuilder-addons/pom.xml +++ b/servicebuilder-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index a5fb6b8c..d4c66867 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml index ee84a8eb..d7e17b70 100644 --- a/servicebuilder-core-test/pom.xml +++ b/servicebuilder-core-test/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml index 223abbdf..d5fcb594 100644 --- a/servicebuilder-core/pom.xml +++ b/servicebuilder-core/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-basicdatasource/pom.xml b/servicebuilder-db-basicdatasource/pom.xml index ff73c85e..777ca221 100644 --- a/servicebuilder-db-basicdatasource/pom.xml +++ b/servicebuilder-db-basicdatasource/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml index 78e0045d..ee027541 100644 --- a/servicebuilder-db-h2/pom.xml +++ b/servicebuilder-db-h2/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml index 06f1e214..4c89815e 100644 --- a/servicebuilder-db-jdbi/pom.xml +++ b/servicebuilder-db-jdbi/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml index 1da5ed25..e70d0d76 100644 --- a/servicebuilder-db-queryrunner/pom.xml +++ b/servicebuilder-db-queryrunner/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml index fafa68da..2cbb122d 100644 --- a/servicebuilder-db/pom.xml +++ b/servicebuilder-db/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml index 97515798..08586167 100644 --- a/servicebuilder-elasticsearch-mock/pom.xml +++ b/servicebuilder-elasticsearch-mock/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 4.0.0 diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml index f83fc9eb..183748d1 100644 --- a/servicebuilder-elasticsearch/pom.xml +++ b/servicebuilder-elasticsearch/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 4.0.0 diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml index 7796890e..352ea68e 100644 --- a/servicebuilder-iam/pom.xml +++ b/servicebuilder-iam/pom.xml @@ -6,7 +6,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-interfaces/pom.xml b/servicebuilder-interfaces/pom.xml index 6ed11539..2081e1bb 100644 --- a/servicebuilder-interfaces/pom.xml +++ b/servicebuilder-interfaces/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 From 3e9ae964c0b714629dd3944a12f2fc5555fd62a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20J=C3=B8rgensrud?= Date: Wed, 29 Mar 2023 10:00:56 +0200 Subject: [PATCH 4/6] Forth and back --- pom.xml | 4 ++-- servicebuilder-activemq/pom.xml | 2 +- servicebuilder-addons/pom.xml | 2 +- servicebuilder-core-addons/pom.xml | 2 +- servicebuilder-core-test/pom.xml | 2 +- servicebuilder-core/pom.xml | 2 +- servicebuilder-db-basicdatasource/pom.xml | 2 +- servicebuilder-db-h2/pom.xml | 2 +- servicebuilder-db-jdbi/pom.xml | 2 +- servicebuilder-db-queryrunner/pom.xml | 2 +- servicebuilder-db/pom.xml | 2 +- servicebuilder-elasticsearch-mock/pom.xml | 2 +- servicebuilder-elasticsearch/pom.xml | 2 +- servicebuilder-iam/pom.xml | 2 +- servicebuilder-interfaces/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index cafe818a..680335d7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT pom no.obos.common obos-common-pom - 10.1.15 + 10.1.13 diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml index 38640e09..faae4460 100644 --- a/servicebuilder-activemq/pom.xml +++ b/servicebuilder-activemq/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml index 199857a1..4dc51893 100644 --- a/servicebuilder-addons/pom.xml +++ b/servicebuilder-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index d4c66867..a5fb6b8c 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml index d7e17b70..ee84a8eb 100644 --- a/servicebuilder-core-test/pom.xml +++ b/servicebuilder-core-test/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml index d5fcb594..223abbdf 100644 --- a/servicebuilder-core/pom.xml +++ b/servicebuilder-core/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-basicdatasource/pom.xml b/servicebuilder-db-basicdatasource/pom.xml index 777ca221..ff73c85e 100644 --- a/servicebuilder-db-basicdatasource/pom.xml +++ b/servicebuilder-db-basicdatasource/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml index ee027541..78e0045d 100644 --- a/servicebuilder-db-h2/pom.xml +++ b/servicebuilder-db-h2/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml index 4c89815e..06f1e214 100644 --- a/servicebuilder-db-jdbi/pom.xml +++ b/servicebuilder-db-jdbi/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml index e70d0d76..1da5ed25 100644 --- a/servicebuilder-db-queryrunner/pom.xml +++ b/servicebuilder-db-queryrunner/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml index 2cbb122d..fafa68da 100644 --- a/servicebuilder-db/pom.xml +++ b/servicebuilder-db/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml index 08586167..97515798 100644 --- a/servicebuilder-elasticsearch-mock/pom.xml +++ b/servicebuilder-elasticsearch-mock/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT 4.0.0 diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml index 183748d1..f83fc9eb 100644 --- a/servicebuilder-elasticsearch/pom.xml +++ b/servicebuilder-elasticsearch/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT 4.0.0 diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml index 352ea68e..7796890e 100644 --- a/servicebuilder-iam/pom.xml +++ b/servicebuilder-iam/pom.xml @@ -6,7 +6,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT diff --git a/servicebuilder-interfaces/pom.xml b/servicebuilder-interfaces/pom.xml index 2081e1bb..6ed11539 100644 --- a/servicebuilder-interfaces/pom.xml +++ b/servicebuilder-interfaces/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.15 + 11.0.0-SNAPSHOT From 30ec661dd6ba1370172bd1e76e7d50b3e2d945d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20J=C3=B8rgensrud?= Date: Wed, 29 Mar 2023 10:05:23 +0200 Subject: [PATCH 5/6] Revert "Forth and back" This reverts commit 3e9ae964c0b714629dd3944a12f2fc5555fd62a0. --- pom.xml | 4 ++-- servicebuilder-activemq/pom.xml | 2 +- servicebuilder-addons/pom.xml | 2 +- servicebuilder-core-addons/pom.xml | 2 +- servicebuilder-core-test/pom.xml | 2 +- servicebuilder-core/pom.xml | 2 +- servicebuilder-db-basicdatasource/pom.xml | 2 +- servicebuilder-db-h2/pom.xml | 2 +- servicebuilder-db-jdbi/pom.xml | 2 +- servicebuilder-db-queryrunner/pom.xml | 2 +- servicebuilder-db/pom.xml | 2 +- servicebuilder-elasticsearch-mock/pom.xml | 2 +- servicebuilder-elasticsearch/pom.xml | 2 +- servicebuilder-iam/pom.xml | 2 +- servicebuilder-interfaces/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 680335d7..cafe818a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 pom no.obos.common obos-common-pom - 10.1.13 + 10.1.15 diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml index faae4460..38640e09 100644 --- a/servicebuilder-activemq/pom.xml +++ b/servicebuilder-activemq/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml index 4dc51893..199857a1 100644 --- a/servicebuilder-addons/pom.xml +++ b/servicebuilder-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index a5fb6b8c..d4c66867 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml index ee84a8eb..d7e17b70 100644 --- a/servicebuilder-core-test/pom.xml +++ b/servicebuilder-core-test/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml index 223abbdf..d5fcb594 100644 --- a/servicebuilder-core/pom.xml +++ b/servicebuilder-core/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-basicdatasource/pom.xml b/servicebuilder-db-basicdatasource/pom.xml index ff73c85e..777ca221 100644 --- a/servicebuilder-db-basicdatasource/pom.xml +++ b/servicebuilder-db-basicdatasource/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml index 78e0045d..ee027541 100644 --- a/servicebuilder-db-h2/pom.xml +++ b/servicebuilder-db-h2/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml index 06f1e214..4c89815e 100644 --- a/servicebuilder-db-jdbi/pom.xml +++ b/servicebuilder-db-jdbi/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml index 1da5ed25..e70d0d76 100644 --- a/servicebuilder-db-queryrunner/pom.xml +++ b/servicebuilder-db-queryrunner/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml index fafa68da..2cbb122d 100644 --- a/servicebuilder-db/pom.xml +++ b/servicebuilder-db/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml index 97515798..08586167 100644 --- a/servicebuilder-elasticsearch-mock/pom.xml +++ b/servicebuilder-elasticsearch-mock/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 4.0.0 diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml index f83fc9eb..183748d1 100644 --- a/servicebuilder-elasticsearch/pom.xml +++ b/servicebuilder-elasticsearch/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 4.0.0 diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml index 7796890e..352ea68e 100644 --- a/servicebuilder-iam/pom.xml +++ b/servicebuilder-iam/pom.xml @@ -6,7 +6,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 diff --git a/servicebuilder-interfaces/pom.xml b/servicebuilder-interfaces/pom.xml index 6ed11539..2081e1bb 100644 --- a/servicebuilder-interfaces/pom.xml +++ b/servicebuilder-interfaces/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 11.0.0-SNAPSHOT + 10.1.15 From 5cd5134b5c7ba1e26781157c08150d12ebfcf3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20J=C3=B8rgensrud?= Date: Thu, 30 Mar 2023 12:28:33 +0200 Subject: [PATCH 6/6] Fix test --- .../obos/util/servicebuilder/client/JerseyClientAddonTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servicebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java b/servicebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java index bfabd708..0db676f9 100644 --- a/servicebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java +++ b/servicebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java @@ -158,6 +158,7 @@ public void request_id_gets_carried_over() { TestServiceFull.Call expected = getCall() .toBuilder() .header(Constants.X_OBOS_REQUEST_ID, "Banana") + .header(Constants.CORRELATION_ID, "Banana") .build(); TestServiceRunner.Runtime nestedRuntime = nestedService.start().runtime;