From d1ab776d83ffcbff6e7c0aada85b9625c4c13387 Mon Sep 17 00:00:00 2001 From: Elias Nogueira Date: Mon, 22 Jan 2024 14:44:20 +0100 Subject: [PATCH 1/3] removal of unnecessary profiles --- src/main/resources/application-baas.yml | 35 ------------------ src/main/resources/application-k8s-3ang.yml | 38 -------------------- src/main/resources/application-k8s.yml | 39 --------------------- src/main/resources/application-pcf.yml | 26 -------------- 4 files changed, 138 deletions(-) delete mode 100644 src/main/resources/application-baas.yml delete mode 100644 src/main/resources/application-k8s-3ang.yml delete mode 100644 src/main/resources/application-k8s.yml delete mode 100644 src/main/resources/application-pcf.yml diff --git a/src/main/resources/application-baas.yml b/src/main/resources/application-baas.yml deleted file mode 100644 index 64165a5f..00000000 --- a/src/main/resources/application-baas.yml +++ /dev/null @@ -1,35 +0,0 @@ -bb-fuel: - platform: - registry: https://registry.${environment.name}.${environment.domain} - identity: https://identity.${environment.name}.${environment.domain} - gateway: https://app.${environment.name}.${environment.domain}/api - auth: https://app.${environment.name}.${environment.domain}/api/auth/login - tokenconverter: https://app.${environment.name}.${environment.domain}/tokenconverter - dbs: - accessgroup: https://app.${environment.name}.${environment.domain}/accessgroup - accounts: https://app.${environment.name}.${environment.domain}/account/service-api - approvals: https://app.${environment.name}.${environment.domain}/approvals/integration-api - arrangements: https://app.${environment.name}.${environment.domain}/arrangement/integration-api - billpay: https://app.${environment.name}.${environment.domain}/billpayprovidermock/client-api - contactmanager: https://app.${environment.name}.${environment.domain}/contacts/integration-api - legalentity: https://app.${environment.name}.${environment.domain}/legalentity - transactions: https://app.${environment.name}.${environment.domain}/transactions/integration-api - user: https://app.${environment.name}.${environment.domain}/user-manager/integration-api - accountStatement: https://app.${environment.name}.${environment.domain}/accountstatementsintegration/service-api - pockets: https://app.${environment.name}.${environment.domain}/api/pocket-tailor/client-api - pocketsArrangements: https://app.${environment.name}.${environment.domain}/arrangementoutboundoriginationmock/service-api - contentservices: https://app.${environment.name}.${environment.domain}/api/contentservices/client-api - dbs-service-names: - accessgroup: access-control - actions: action - arrangements: arrangements-manager - billpay: billpay-integrator - legalentity: access-control - limits: limit - messages: messages-service - notifications: notifications-service - payments: payment-order-service - pfm: transaction-category-collector - user: user-manager - products: arrangement-manager - contentservices: contentservices diff --git a/src/main/resources/application-k8s-3ang.yml b/src/main/resources/application-k8s-3ang.yml deleted file mode 100644 index 1cd0e8ad..00000000 --- a/src/main/resources/application-k8s-3ang.yml +++ /dev/null @@ -1,38 +0,0 @@ -environment: - domain: backbase.test - -bb-fuel: - platform: - registry: http://registry.${environment.name}.${environment.domain} - identity: http://identity.${environment.name}.${environment.domain} - gateway: http://edge.${environment.name}.${environment.domain}/api - auth: http://edge.${environment.name}.${environment.domain}/api/auth/login - tokenconverter: http://tokenconverter.${environment.name}.${environment.domain} - dbs: - accessgroup: http://accessgroup.${environment.name}.${environment.domain} - accounts: http://account.${environment.name}.${environment.domain}/service-api - approvals: http://approvals.${environment.name}.${environment.domain}/client-api - arrangements: http://arrangements.${environment.name}.${environment.domain}/client-api - billpay: http://billpayprovidermock.${environment.name}.${environment.domain}/client-api - contactmanager: http://contacts.${environment.name}.${environment.domain}/client-api - legalentity: http://legalentity.${environment.name}.${environment.domain} - transactions: http://transactions.${environment.name}.${environment.domain} - user: http://user.${environment.name}.${environment.domain}/client-api - accountStatement: http://accountstatementsintegration.${environment.name}.${environment.domain}/account-statement-integration-service/service-api - pockets: http://edge.${environment.name}.${environment.domain}/api/pocket-tailor/client-api - pocketsArrangements: http://arrangementoutboundoriginationmock.${environment.name}.${environment.domain}/service-api - contentservices: http://edge.${environment.name}.${environment.domain}/api/contentservices/client-api - dbs-service-names: - accessgroup: accessgroup-presentation-service - actions: actionrecipes-presentation-service - arrangements: product-summary-presentation-service - billpay: billpay-presentation-service - legalentity: legalentity-presentation-service - limits: limits-presentation-service - messages: messages-presentation-service - notifications: notifications-presentation-service - payments: payment-order-presentation-service - pfm: categories-management-presentation-service - user: user-presentation-service - products: product-summary-presentation-service - contentservices: contentservices diff --git a/src/main/resources/application-k8s.yml b/src/main/resources/application-k8s.yml deleted file mode 100644 index a3b4fba9..00000000 --- a/src/main/resources/application-k8s.yml +++ /dev/null @@ -1,39 +0,0 @@ -environment: - domain: backbase.test - -bb-fuel: - platform: - registry: http://registry.${environment.name}.${environment.domain} - identity: http://identity.${environment.name}.${environment.domain} - gateway: http://edge.${environment.name}.${environment.domain}/api - auth: http://edge.${environment.name}.${environment.domain}/api/auth/login - tokenconverter: http://tokenconverter.${environment.name}.${environment.domain} - dbs: - accessgroup: http://accessgroup.${environment.name}.${environment.domain} - accounts: http://account.${environment.name}.${environment.domain}/service-api - approvals: http://approvals.${environment.name}.${environment.domain}/integration-api - arrangements: http://arrangements.${environment.name}.${environment.domain}/client-api - billpay: http://billpayprovidermock.${environment.name}.${environment.domain}/client-api - contactmanager: http://contacts.${environment.name}.${environment.domain}/integration-api - legalentity: http://legalentity.${environment.name}.${environment.domain} - transactions: http://transactions.${environment.name}.${environment.domain}/integration-api - user: http://user.${environment.name}.${environment.domain}/client-api - accountStatement: http://accountstatementsintegration.${environment.name}.${environment.domain}/service-api - pockets: http://edge.${environment.name}.${environment.domain}/api/pocket-tailor/client-api - pocketsArrangements: http://arrangementoutboundoriginationmock.${environment.name}.${environment.domain}/service-api - contentservices: http://edge.${environment.name}.${environment.domain}/api/contentservices/client-api - dbs-service-names: - accessgroup: accessgroup-presentation-service - actions: actionrecipes-presentation-service - arrangements: product-summary-presentation-service - billpay: billpay-presentation-service - legalentity: legalentity-presentation-service - limits: limits-presentation-service - messages: messages-service - notifications: notifications-service - payments: payment-order-service - pfm: transaction-category-collector - user: user-presentation-service - products: product-summary-presentation-service - positivePay: positive-pay-check - contentservices: contentservices diff --git a/src/main/resources/application-pcf.yml b/src/main/resources/application-pcf.yml deleted file mode 100644 index 7bd03edf..00000000 --- a/src/main/resources/application-pcf.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Unlike autoconfig, in PCF services are deployed to their own application server instance and have no context path (root). -# Each capability specific integration service has its own route which can be configured below. -# Presentation services are accessed via the gateway and do not require any configuration. -# Remember to include the name of the space in the route to avoid collisions. - -pcf: - domain: apps.pcf-v21.backbasepcf.com - uri: ${pcf.space}.${pcf.domain} - -bb-fuel: - platform: - registry: http://registry-${pcf.uri}/eureka - identity: http://bbiam-${pcf.uri} - gateway: http://gateway-${pcf.uri}/api - auth: ${bb-fuel.platform.gateway}/auth/login - tokenconverter: http://token-converter-service-${pcf.uri} - dbs: - approvals: http://approval-integration-service-${pcf.uri} - transactions: http://transaction-integration-service-${pcf.uri} - contactmanager: http://contactmanager-integration-service-${pcf.uri} - messages: http://messages-integration-service-${pcf.uri} - user: http://user-integration-service-${pcf.uri} - legalentity: http://legalentity-integration-service-${pcf.uri} - accessgroup: http://accessgroup-integration-service-${pcf.uri} - arrangements: http://arrangements-integration-service-${pcf.uri} - notifications: http://notifications-presentation-service-${pcf.uri} From c677b990da1fc84f025704488febecf6b58b8090 Mon Sep 17 00:00:00 2001 From: Elias Nogueira Date: Mon, 22 Jan 2024 14:44:37 +0100 Subject: [PATCH 2/3] added ephemeral business profile --- .../resources/application-eph-business.yml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/main/resources/application-eph-business.yml diff --git a/src/main/resources/application-eph-business.yml b/src/main/resources/application-eph-business.yml new file mode 100644 index 00000000..47044b5c --- /dev/null +++ b/src/main/resources/application-eph-business.yml @@ -0,0 +1,41 @@ +environment: + domain: eph.rndbb.azure.backbaseservices.com + +bb-fuel: + platform: + registry: https://registry-${environment.name}.${environment.domain} + identity: https://identity-${environment.name}.${environment.domain} + gateway: https://edge-${environment.name}.${environment.domain}/api + auth: https://edge-${environment.name}.${environment.domain}/api/auth/login + tokenconverter: https://token-converter-${environment.name}.${environment.domain} + dbs: + accessgroup: https://accessgroup-${environment.name}.${environment.domain}/integration-api + accounts: https://account-${environment.name}.${environment.domain}/service-api + approvals: https://approvals-${environment.name}.${environment.domain}/integration-api + arrangements: https://arrangement-${environment.name}.${environment.domain}/integration-api + billpay: https://billpayprovidermock-${environment.name}.${environment.domain}/client-api + contactmanager: https://contacts-${environment.name}.${environment.domain}/integration-api + legalentity: https://legalentity-${environment.name}.${environment.domain} + transactions: https://transactions-${environment.name}.${environment.domain}/integration-api + user: https://user-manager-${environment.name}.${environment.domain}/integration-api + accountStatement: https://accountstatementsintegration-${environment.name}.${environment.domain}/service-api + pockets: https://edge.${environment.name}-${environment.domain}/api/pocket-tailor/client-api + pocketsArrangements: https://arrangementoutboundoriginationmock-${environment.name}.${environment.domain}/service-api + contentservices: https://edge.${environment.name}.${environment.domain}/api/contentservices/client-api + userProfileManager: http://edge.${environment.name}.${environment.domain}:80/api + dbs-service-names: + accessgroup: access-control + actions: action + arrangements: arrangements-manager + billpay: billpay-integrator + legalentity: access-control + limits: limit + messages: messages-service + notifications: notifications-service + payments: payment-order-service + pfm: transaction-category-collector + user: user-manager + products: arrangement-manager + positivePay: positive-pay-check + contentservices: contentservices + userprofilemanager: user-profile-manager From f32bc07fc566bba89ca1b73963917ea84e6ea956 Mon Sep 17 00:00:00 2001 From: Elias Nogueira Date: Mon, 22 Jan 2024 14:45:13 +0100 Subject: [PATCH 3/3] library updates --- pom.xml | 138 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 41c41ac1..397f4cb3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 service-sdk-starter-core @@ -9,7 +10,7 @@ com.backbase.ct bb-fuel - 2.7.1-SNAPSHOT + 2.8.0-SNAPSHOT Backbase :: Capability Testing :: bb-fuel @@ -22,37 +23,47 @@ com.backbase.ct.bbfuel.BbFuelApplication - 1.8 - 1.8 + 11 + 11 + 3.11.0 2.4.1 2.5.3 - 4.13.1 + 11 + 11 + 3.6.0 + 3.0.1 + 3.3.0 + + 4.13.2 1.10 4.4 4.2.0 - 3.0.7 - 32.0.0-jre + 3.0.20 + 33.0.0-jre + 1.18.28 ${project.build.directory}/downloaded-api 5.1.0 0.14.3 - 2.14.2 - 0.2.1 - 1.6.0 + 2.16.1 + 2.0.0 + 0.2.6 + 1.6.9 3.0.0 - 1.0.2 - 3.2.1 + 3.2.7-RELEASE 11.0.0 - 1.0.5 + 2.0.14 - 2.1.1 - 1.0.3 + 2.1.1 + + 1.0.3 + 2.7.2 2.6.0 2.9.5 @@ -186,6 +197,7 @@ org.projectlombok lombok + ${lombok.version} io.rest-assured @@ -223,6 +235,11 @@ jsr305 ${jsr305-version} + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} + @@ -231,7 +248,7 @@ org.codehaus.mojo wagon-maven-plugin - 2.0.0 + ${wagon-maven-plugin.version} ${api.target} Public Backbase Repository @@ -241,10 +258,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${maven.compiler.source} + ${maven.compiler.target} + + org.apache.maven.plugins maven-jar-plugin - 3.1.2 + ${maven-jar-plugin.version} package @@ -268,7 +294,7 @@ maven-release-plugin ${maven-release-plugin.version} - [ci skip][maven-release-plugin] + [ci skip][maven-release-plugin] @@ -421,7 +447,9 @@ generate-sources https://repo.backbase.com/specs/arrangement-manager - arrangement-integration-outbound-origination-api-v${arrangement-integration-outbound-origination-api.version}.yaml + + arrangement-integration-outbound-origination-api-v${arrangement-integration-outbound-origination-api.version}.yaml + @@ -433,7 +461,9 @@ generate-sources https://repo.backbase.com/specs/arrangement-manager - arrangement-integration-outbound-link-account-api-v${arrangement-integration-outbound-link-account-api.version}.yaml + + arrangement-integration-outbound-link-account-api-v${arrangement-integration-outbound-link-account-api.version}.yaml + @@ -445,7 +475,9 @@ generate-sources https://repo.backbase.com/specs/arrangement-manager - arrangement-integration-inbound-api-v${arrangement-integration-inbound-api.version}.yaml + + arrangement-integration-inbound-api-v${arrangement-integration-inbound-api.version}.yaml + @@ -469,7 +501,9 @@ generate-sources https://repo.backbase.com/specs/contact-manager - contact-manager-integration-inbound-api-v${contact-manager-integration-inbound-api.version}.yaml + + contact-manager-integration-inbound-api-v${contact-manager-integration-inbound-api.version}.yaml + @@ -492,18 +526,18 @@ - generate-access-control-client-code - - generate - - - ${api.target}/access-control-client-api-v3.6.0.yaml - - com.backbase.dbs.accesscontrol.client.v3 - com.backbase.dbs.accesscontrol.client.v3.model - - - + generate-access-control-client-code + + generate + + + ${api.target}/access-control-client-api-v3.6.0.yaml + + com.backbase.dbs.accesscontrol.client.v3 + com.backbase.dbs.accesscontrol.client.v3.model + + + generate-accessgroup-integration-client-code @@ -551,7 +585,8 @@ generate - ${api.target}/billpay-integration-external-provider-outbound-api-v2.0.0.yaml + ${api.target}/billpay-integration-external-provider-outbound-api-v2.0.0.yaml + com.backbase.dbs.billpay.client.v2 com.backbase.dbs.billpay.client.v2.model @@ -621,7 +656,9 @@ generate - ${api.target}/contentservices-client-api-v${contentservices-client-api.version}.yaml + + ${api.target}/contentservices-client-api-v${contentservices-client-api.version}.yaml + com.backbase.dbs.contentservices.client.v2 com.backbase.dbs.contentservices.client.v2.model @@ -635,7 +672,9 @@ generate - ${api.target}/contact-manager-integration-inbound-api-v${contact-manager-integration-inbound-api.version}.yaml + + ${api.target}/contact-manager-integration-inbound-api-v${contact-manager-integration-inbound-api.version}.yaml + com.backbase.dbs.contact.integration.inbound.api.v2 com.backbase.dbs.contact.integration.inbound.api.v2.model @@ -664,6 +703,7 @@ true true + @@ -674,10 +714,14 @@ generate - ${api.target}/arrangement-integration-outbound-origination-api-v${arrangement-integration-outbound-origination-api.version}.yaml + + ${api.target}/arrangement-integration-outbound-origination-api-v${arrangement-integration-outbound-origination-api.version}.yaml + - com.backbase.dbs.arrangement.integration.outbound.origination.v1 - com.backbase.dbs.arrangement.integration.outbound.origination.v1.model + com.backbase.dbs.arrangement.integration.outbound.origination.v1 + + com.backbase.dbs.arrangement.integration.outbound.origination.v1.model + @@ -688,10 +732,13 @@ generate - ${api.target}/arrangement-integration-outbound-link-account-api-v${arrangement-integration-outbound-link-account-api.version}.yaml + + ${api.target}/arrangement-integration-outbound-link-account-api-v${arrangement-integration-outbound-link-account-api.version}.yaml + com.backbase.dbs.arrangement.integration.outbound.link.v2 - com.backbase.dbs.arrangement.integration.outbound.link.v2.model + com.backbase.dbs.arrangement.integration.outbound.link.v2.model + @@ -703,10 +750,13 @@ generate-sources - ${api.target}/arrangement-integration-inbound-api-v${arrangement-integration-inbound-api.version}.yaml + + ${api.target}/arrangement-integration-inbound-api-v${arrangement-integration-inbound-api.version}.yaml + com.backbase.dbs.arrangement.integration.inbound.api.v2 - com.backbase.dbs.arrangement.integration.inbound.api.v2.model + com.backbase.dbs.arrangement.integration.inbound.api.v2.model +