diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
index bcd807599..77ec7b0c5 100644
--- a/.github/workflows/maven-deploy.yml
+++ b/.github/workflows/maven-deploy.yml
@@ -32,7 +32,7 @@ jobs:
name: Maven deploy
uses: Netcracker/qubership-core-infra/.github/workflows/generic-maven-build.yaml@68e865434b0548d4ad2192e368bc5e898a0ce2ed # v2.4.2
with:
- maven-command: 'deploy -T 1C -Dorg.slf4j.simpleLogger.showThreadId=true'
+ maven-command: 'deploy -T 1C -Dorg.slf4j.simpleLogger.showThreadId=true -DskipTests'
maven-username: 'NetcrackerCLPLCI'
sonar-project-key: ${{ vars.SONAR_PROJECT_KEY }}
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }}
diff --git a/core-blue-green-state-monitor-quarkus/pom.xml b/core-blue-green-state-monitor-quarkus/pom.xml
index 5def4ca36..737364249 100644
--- a/core-blue-green-state-monitor-quarkus/pom.xml
+++ b/core-blue-green-state-monitor-quarkus/pom.xml
@@ -21,7 +21,7 @@
21
UTF-8
3.33.1
- 10.0.1
+ 10.0.2-SNAPSHOT
2.1.1
${project.basedir}/../aggregator-for-jacoco/target/jacoco-ut/jacoco.xml
diff --git a/core-blue-green-state-monitor/pom.xml b/core-blue-green-state-monitor/pom.xml
index f813daf05..b9b80318b 100644
--- a/core-blue-green-state-monitor/pom.xml
+++ b/core-blue-green-state-monitor/pom.xml
@@ -19,7 +19,7 @@
21
21
UTF-8
- 7.2.1
+ 7.2.2-SNAPSHOT
${project.basedir}/../blue-green-state-monitor-report-aggregate/target/site/jacoco-aggregate/jacoco.xml
diff --git a/core-microservice-dependencies/cloud-core-java-bom/pom.xml b/core-microservice-dependencies/cloud-core-java-bom/pom.xml
index d64fa11fa..ea9bd233b 100644
--- a/core-microservice-dependencies/cloud-core-java-bom/pom.xml
+++ b/core-microservice-dependencies/cloud-core-java-bom/pom.xml
@@ -22,11 +22,11 @@
1.16.5
21
8.1.1
- 7.2.1
- 9.1.1
+ 7.2.2-SNAPSHOT
+ 9.1.2-SNAPSHOT
7.1.1
8.2.2
- 12.2.1
+ 12.2.2-SNAPSHOT
4.2.1
diff --git a/core-microservice-framework/microservice-framework-parent/pom.xml b/core-microservice-framework/microservice-framework-parent/pom.xml
index 5217bddc3..ea04133ec 100644
--- a/core-microservice-framework/microservice-framework-parent/pom.xml
+++ b/core-microservice-framework/microservice-framework-parent/pom.xml
@@ -20,7 +20,7 @@
3.15.0
3.7
0.8.14
- 12.1.1
+ 12.1.2-SNAPSHOT
${project.basedir}/../microservice-framework-report-aggregate/target/site/jacoco-aggregate/jacoco.xml
diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml
index 29ee0f1ad..0ab1c9e4d 100644
--- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml
+++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml
@@ -15,9 +15,9 @@
8.2.2
- 9.1.1
+ 9.1.2-SNAPSHOT
3.1.2-SNAPSHOT
- 7.2.1
+ 7.2.2-SNAPSHOT
12.2.2-SNAPSHOT
4.2.1
diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java
index 33b2ccdae..fdb4f5fd8 100644
--- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java
+++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java
@@ -35,10 +35,12 @@ public DbaasClient build() {
String dbaasUrl = dbaasAgentUrl;
if(M2MClientFactory.isK8sM2mEnabled()) {
- if(dbaasConfig.dbaasUrl().isEmpty()) {
+ String dbaasUrlFromEnv = System.getenv("API_DBAAS_ADDRESS");
+ if(dbaasUrlFromEnv == null || dbaasUrlFromEnv.isEmpty()) {
log.warn("DBaaS address is not available, falling back to dbaas-agent. Specify 'api.dbaas.address' property to DBaaS url");
+ } else {
+ dbaasUrl = dbaasUrlFromEnv;
}
- dbaasUrl = dbaasConfig.dbaasUrl().orElse(dbaasAgentUrl);
}
OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue());
diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java
index 371ab91f5..faeb7fe74 100644
--- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java
+++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java
@@ -33,6 +33,7 @@ void setUp() {
when(dbaasConfig.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL));
when(dbaasConfig.dbaasUrl()).thenReturn(Optional.of(DB_AGGREGATOR_URL));
environmentVariables.set("KUBERNETES_M2M_ENABLED", "true");
+ environmentVariables.set("API_DBAAS_ADDRESS", DB_AGGREGATOR_URL);
m2MDbaaSClient = new M2MDbaaSClient(dbaasConfig);
}
diff --git a/core-rest-libraries/pom.xml b/core-rest-libraries/pom.xml
index aac6537fb..a600877b8 100644
--- a/core-rest-libraries/pom.xml
+++ b/core-rest-libraries/pom.xml
@@ -17,7 +17,7 @@
21
- 3.1.1
+ 3.1.2-SNAPSHOT
diff --git a/core-restclient/parent/pom.xml b/core-restclient/parent/pom.xml
index fa3d43329..ae5a2aec1 100644
--- a/core-restclient/parent/pom.xml
+++ b/core-restclient/parent/pom.xml
@@ -22,7 +22,7 @@
3.4.0
4.2.1
- 3.1.1
+ 3.1.2-SNAPSHOT
${project.basedir}/../microservice-restclient-report-aggregate/target/site/jacoco-aggregate/jacoco.xml
diff --git a/core-springboot-starter/pom.xml b/core-springboot-starter/pom.xml
index e29f72f3b..89e0b5407 100644
--- a/core-springboot-starter/pom.xml
+++ b/core-springboot-starter/pom.xml
@@ -27,7 +27,7 @@
UTF-8
21
- 12.1.1
+ 12.1.2-SNAPSHOT
8.1.1
diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml
index b8f9b80a1..3c1bae586 100644
--- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml
+++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml
@@ -24,7 +24,7 @@
1.0.0-SNAPSHOT
- 7.2.1
+ 7.2.2-SNAPSHOT
7.1.1
8.2.2
3.1.2-SNAPSHOT
diff --git a/maas-client-spring/pom.xml b/maas-client-spring/pom.xml
index ffe1af04a..cc8429d2b 100644
--- a/maas-client-spring/pom.xml
+++ b/maas-client-spring/pom.xml
@@ -20,7 +20,7 @@
21
UTF-8
12.2.2-SNAPSHOT
- 3.1.1
+ 3.1.2-SNAPSHOT
0.8.14
${project.basedir}/../maas-client-spring-report-aggregate/target/site/jacoco-aggregate/jacoco.xml
diff --git a/maas-declarative-client-quarkus/pom.xml b/maas-declarative-client-quarkus/pom.xml
index f67c87719..aac8b8390 100644
--- a/maas-declarative-client-quarkus/pom.xml
+++ b/maas-declarative-client-quarkus/pom.xml
@@ -35,7 +35,7 @@
6.1.2-SNAPSHOT
11.0.2-SNAPSHOT
4.0.1
- 3.1.1
+ 3.1.2-SNAPSHOT
${project.basedir}/../../maas-kafka-quarkus-client-report-aggregate/target/site/jacoco-aggregate/jacoco.xml
diff --git a/maas-declarative-client-spring/pom.xml b/maas-declarative-client-spring/pom.xml
index 41a924c33..e89457b75 100644
--- a/maas-declarative-client-spring/pom.xml
+++ b/maas-declarative-client-spring/pom.xml
@@ -27,7 +27,7 @@
21
6.1.2-SNAPSHOT
- 9.1.1
+ 9.1.2-SNAPSHOT
2.1.1