chore: fabric8 version to 6.9.2 + quarkus 3.5.0 and related fixes (#178)

Signed-off-by: Attila Mészáros <[email protected]>
operator-framework · Dec 4, 2023 · b901880 · b901880
1 parent 10b8090
commit b901880
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 36 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -99,10 +99,6 @@
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.github.java-json-tools</groupId>
-      <artifactId>json-patch</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>crd-generator-apt</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -40,12 +40,10 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <junit.version>5.10.0</junit.version>
-        <fabric8-client.version>6.7.2</fabric8-client.version>
+        <fabric8-client.version>6.9.2</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.21.0</log4j.version>
         <mokito.version>5.6.0</mokito.version>
-        <mokito.version>5.2.0</mokito.version>
-        <dekorate.version>3.7.0</dekorate.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <auto-service.version>1.0.1</auto-service.version>
         <assertj.version>3.24.2</assertj.version>
@@ -61,11 +59,10 @@
         <git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <json-patch.version>1.13</json-patch.version>
         <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
         <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
         <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-        <spring-boot-dependencies.version>3.1.5</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>3.2.0</spring-boot-dependencies.version>
     </properties>
 
     <modules>
@@ -120,31 +117,7 @@
                 <artifactId>log4j-core</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.github.java-json-tools</groupId>
-                <artifactId>json-patch</artifactId>
-                <version>${json-patch.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dekorate</groupId>
-                <artifactId>kubernetes-spring-starter</artifactId>
-                <version>${dekorate.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dekorate</groupId>
-                <artifactId>certmanager-annotations</artifactId>
-                <version>${dekorate.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dekorate</groupId>
-                <artifactId>kubernetes-annotations</artifactId>
-                <version>${dekorate.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dekorate</groupId>
-                <artifactId>jib-annotations</artifactId>
-                <version>${dekorate.version}</version>
-            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

diff --git a/samples/quarkus/pom.xml b/samples/quarkus/pom.xml
@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.4.3</quarkus.platform.version>
+        <quarkus.platform.version>3.5.0</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.2.1</surefire-plugin.version>
     </properties>

diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
@@ -10,12 +10,12 @@
 
 	<groupId>io.javaoperatorsdk.webhook.sample</groupId>
 	<artifactId>spring-boot-sample</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
 	<name>Kubernetes Webhooks Framework - Samples - Spring Boot</name>
 
 	<properties>
 		<java.version>17</java.version>
 		<jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+		<dekorate.version>4.1.0</dekorate.version>
 	</properties>
 
 	<dependencyManagement>
@@ -84,14 +84,22 @@
 		<dependency>
 			<groupId>io.dekorate</groupId>
 			<artifactId>kubernetes-spring-starter</artifactId>
+			<version>${dekorate.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dekorate</groupId>
 			<artifactId>certmanager-annotations</artifactId>
+			<version>${dekorate.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.dekorate</groupId>
+			<artifactId>kubernetes-annotations</artifactId>
+			<version>${dekorate.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dekorate</groupId>
 			<artifactId>jib-annotations</artifactId>
+			<version>${dekorate.version}</version>
 		</dependency>
 	</dependencies>