This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch quarkus-3.2LTS
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/quarkus-3.2LTS by this push:
new 5334b93bc1 Fixing Fabric8 version alignment on Quarkus and SB (#3324)
5334b93bc1 is described below
commit 5334b93bc181bffd1593ad2b39d046229d39d777
Author: Ricardo Zanini <[email protected]>
AuthorDate: Tue Dec 12 10:13:58 2023 -0300
Fixing Fabric8 version alignment on Quarkus and SB (#3324)
Signed-off-by: Ricardo Zanini <[email protected]>
---
addons/common/kubernetes/pom.xml | 2 ++
kogito-build/kogito-dependencies-bom/pom.xml | 17 +++++---------
quarkus/bom/pom.xml | 15 +++++++++++++
springboot/addons/kubernetes/pom.xml | 20 +----------------
springboot/bom/pom.xml | 33 ++++++++++++++++------------
5 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/addons/common/kubernetes/pom.xml b/addons/common/kubernetes/pom.xml
index 9a77b08b0d..8de7715f1f 100644
--- a/addons/common/kubernetes/pom.xml
+++ b/addons/common/kubernetes/pom.xml
@@ -52,11 +52,13 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>knative-client</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
<scope>provided</scope>
</dependency>
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml
b/kogito-build/kogito-dependencies-bom/pom.xml
index bff9397dce..dfa65608e6 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -55,6 +55,11 @@
<version.ch.qos.logback>1.4.7</version.ch.qos.logback>
<version.io.cloudevents>2.3.0</version.io.cloudevents>
+ <!--
+ We add Fabric8 here to use as a basis for Addons/Kubernetes
+ Don't add as a management dependency because it will break SpringBoot and
Quarkus
+ Kubernetes addons since they use a different version.
+ -->
<version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client>
<version.io.micrometer>1.11.1</version.io.micrometer>
<version.org.flywaydb>9.16.3</version.org.flywaydb>
@@ -640,18 +645,6 @@
<version>${version.io.swagger.core.v3}</version>
</dependency>
- <!-- fabric8 -->
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-client</artifactId>
- <version>${version.io.fabric8.kubernetes-client}</version>
- </dependency>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>knative-client</artifactId>
- <version>${version.io.fabric8.kubernetes-client}</version>
- </dependency>
-
<!-- infinispan -->
<dependency>
<groupId>org.infinispan</groupId>
diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml
index 8aff649b2e..e1aa169cf2 100755
--- a/quarkus/bom/pom.xml
+++ b/quarkus/bom/pom.xml
@@ -36,6 +36,9 @@
<name>Kogito :: Quarkus :: BOM</name>
<description>Internal BOM descriptor for Kogito modules targeting Quarkus
use-cases. Specific dependencies targeting the Quarkus platform must be added
here.</description>
+ <properties>
+
<version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client>
+ </properties>
<dependencyManagement>
<dependencies>
<dependency>
@@ -101,6 +104,18 @@
<artifactId>quarkus-embedded-postgresql-deployment</artifactId>
<version>${version.io.quarkiverse.embedded.postgresql}</version>
</dependency>
+
+ <!-- fabric8 -->
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>knative-client</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/springboot/addons/kubernetes/pom.xml
b/springboot/addons/kubernetes/pom.xml
index 9ca17296ad..be1fa62f07 100644
--- a/springboot/addons/kubernetes/pom.xml
+++ b/springboot/addons/kubernetes/pom.xml
@@ -32,23 +32,6 @@
<artifactId>kogito-addons-springboot-kubernetes</artifactId>
<name>Kogito :: Add-Ons :: Spring Boot :: Kubernetes</name>
- <properties>
- <!-- Fabric8 aligned with Spring Cloud. See:
https://github.com/spring-cloud/spring-cloud-kubernetes/blob/main/spring-cloud-kubernetes-dependencies/pom.xml#L36
-->
- <version.io.fabric8>6.2.0</version.io.fabric8>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-client-bom</artifactId>
- <version>${version.io.fabric8}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.kie.kogito</groupId>
@@ -66,15 +49,14 @@
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
+ <!-- Forcing here since Fabric8 BOM won't bring it -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>knative-client</artifactId>
- <version>${version.io.fabric8}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
- <version>${version.io.fabric8}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
index f18307dde3..2171f43eca 100644
--- a/springboot/bom/pom.xml
+++ b/springboot/bom/pom.xml
@@ -42,10 +42,10 @@
<version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
<version.org.spockframework>1.3-groovy-2.4</version.org.spockframework>
<!-- Spring Boot Cloud aligned with Spring Boot Framework version. See:
https://spring.io/projects/spring-cloud -->
-
<version.org.springframework.cloud.kubernetes>3.0.2</version.org.springframework.cloud.kubernetes>
- <!-- CVE-2022-25857: Upgrading snakeyaml until we upgrade to Spring Boot
3.x -->
- <!-- See: https://github.com/spring-projects/spring-boot/issues/32221 -->
-
<version.org.springframework.security>1.0.2</version.org.springframework.security>
+ <!--
https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes
-->
+
<version.org.springframework.cloud>2022.0.3</version.org.springframework.cloud>
+ <!-- Aligned with Spring Boot Cloud -->
+ <version.io.fabric8>6.2.0</version.io.fabric8>
</properties>
<dependencyManagement>
@@ -57,6 +57,20 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client-bom</artifactId>
+ <version>${version.io.fabric8}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${version.org.springframework.cloud}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
@@ -78,18 +92,9 @@
<version>${version.org.spockframework}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
- <version>${version.org.springframework.cloud.kubernetes}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-authorization-server</artifactId>
- <version>${version.org.springframework.security}</version>
- </dependency>
</dependencies>
</dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
