From b0f6f636b8f276063453518320f7c100f66f5c56 Mon Sep 17 00:00:00 2001
From: manusa <marc@marcnuri.com>
Date: Tue, 22 Jun 2021 12:16:08 +0200
Subject: [PATCH]  Replace fabric8-maven-plugin dependency with Eclipse JKube
 OpenShift Maven Plugin

---
 cep-fraud-detection-springboot/README.adoc    |  2 +-
 cep-fraud-detection-springboot/pom.xml        | 25 ++++++++-----------
 .../main/{fabric8 => jkube}/deployment.yml    |  0
 .../src/main/{fabric8 => jkube}/route.yml     |  0
 .../src/main/{fabric8 => jkube}/svc.yml       |  0
 5 files changed, 12 insertions(+), 15 deletions(-)
 rename cep-fraud-detection-springboot/src/main/{fabric8 => jkube}/deployment.yml (100%)
 rename cep-fraud-detection-springboot/src/main/{fabric8 => jkube}/route.yml (100%)
 rename cep-fraud-detection-springboot/src/main/{fabric8 => jkube}/svc.yml (100%)

diff --git a/cep-fraud-detection-springboot/README.adoc b/cep-fraud-detection-springboot/README.adoc
index dac1439..d696583 100644
--- a/cep-fraud-detection-springboot/README.adoc
+++ b/cep-fraud-detection-springboot/README.adoc
@@ -127,7 +127,7 @@ $ oc new-project rules-service
 [source, java]
 .*2. 部署到 OpenShift*
 ----
-$ mvn package fabric8:deploy -Popenshift
+$ mvn package oc:deploy -Popenshift
 ----
 
 == 测试
diff --git a/cep-fraud-detection-springboot/pom.xml b/cep-fraud-detection-springboot/pom.xml
index c07b8b4..5d8e5b9 100644
--- a/cep-fraud-detection-springboot/pom.xml
+++ b/cep-fraud-detection-springboot/pom.xml
@@ -1,27 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>org.drools.example</groupId>
     <artifactId>cep-fraud-detection</artifactId>
     <version>0.1.0</version>
-    
+
     <!--  -->
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.12.RELEASE</version>
     </parent>
-     
+
     <properties>
         <version.org.kie>7.14.0.Final-redhat-00002</version.org.kie>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <fabric8.version>3.5.40</fabric8.version>
-        
+        <jkube.version>1.3.0</jkube.version>
     </properties>
 
     <dependencies>
@@ -30,8 +27,8 @@
             <groupId>org.kie</groupId>
             <artifactId>kie-server-spring-boot-starter-drools</artifactId>
             <version>${version.org.kie}</version>
-        </dependency>      
-       
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -60,13 +57,13 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${fabric8.version}</version>
+                        <groupId>org.eclipse.jkube</groupId>
+                        <artifactId>openshift-maven-plugin</artifactId>
+                        <version>${jkube.version}</version>
                         <configuration>
                             <enricher>
                                 <excludes>
-                                    <exclude>fmp-openshift-route</exclude>
+                                    <exclude>jkube-openshift-route</exclude>
                                 </excludes>
                             </enricher>
                         </configuration>
diff --git a/cep-fraud-detection-springboot/src/main/fabric8/deployment.yml b/cep-fraud-detection-springboot/src/main/jkube/deployment.yml
similarity index 100%
rename from cep-fraud-detection-springboot/src/main/fabric8/deployment.yml
rename to cep-fraud-detection-springboot/src/main/jkube/deployment.yml
diff --git a/cep-fraud-detection-springboot/src/main/fabric8/route.yml b/cep-fraud-detection-springboot/src/main/jkube/route.yml
similarity index 100%
rename from cep-fraud-detection-springboot/src/main/fabric8/route.yml
rename to cep-fraud-detection-springboot/src/main/jkube/route.yml
diff --git a/cep-fraud-detection-springboot/src/main/fabric8/svc.yml b/cep-fraud-detection-springboot/src/main/jkube/svc.yml
similarity index 100%
rename from cep-fraud-detection-springboot/src/main/fabric8/svc.yml
rename to cep-fraud-detection-springboot/src/main/jkube/svc.yml