Merge pull request #58 from dewan-ahmed/dewan-springstarter-47-update

fabric8 --> jkube for spring-rhoar-intro
openshift-instruqt · Jun 21, 2021 · 660bbda · 660bbda
2 parents f4908a2 + 8b85807
commit 660bbda
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 35 deletions.
diff --git a/spring/spring-mvc/pom.xml b/spring/spring-mvc/pom.xml
@@ -24,12 +24,11 @@
 	    <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
 	    <spring-boot-bom.version>2.1.6.Final-redhat-00004</spring-boot-bom.version>
 		<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
-		<fabric8-maven-plugin.version>3.5.40</fabric8-maven-plugin.version>
-		<fabric8.openshift.trimImageInContainerSpec>true</fabric8.openshift.trimImageInContainerSpec>
-		<fabric8.skip.build.pom>true</fabric8.skip.build.pom>
-		<fabric8.generator.from>
-			registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:${openjdk18-openshift.version}
-		</fabric8.generator.from>
+	<jkube.openshift.trimImageInContainerSpec>true</jkube.openshift.trimImageInContainerSpec>
+    <jkube.skip.build.pom>true</jkube.skip.build.pom>
+    <jkube.generator.from>
+      registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:${openjdk18-openshift.version}
+    </jkube.generator.from>  
 	</properties>
 
 	<dependencyManagement>
@@ -102,9 +101,9 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>io.fabric8</groupId>
-						<artifactId>fabric8-maven-plugin</artifactId>
-						<version>${fabric8-maven-plugin.version}</version>
+						 <groupId>org.eclipse.jkube</groupId>
+            <artifactId>openshift-maven-plugin</artifactId>
+            <version>1.3.0</version>
 						<executions>
 							<execution>
 								<id>fmp</id>

diff --git a/...c/src/main/fabric8/credentials-secret.yml → ...mvc/src/main/jkube/credentials-secret.yml b/...c/src/main/fabric8/credentials-secret.yml → ...mvc/src/main/jkube/credentials-secret.yml
diff --git a/...pring-mvc/src/main/fabric8/deployment.yml → .../spring-mvc/src/main/jkube/deployment.yml b/...pring-mvc/src/main/fabric8/deployment.yml → .../spring-mvc/src/main/jkube/deployment.yml
diff --git a/spring/spring-mvc/src/main/fabric8/route.yml → spring/spring-mvc/src/main/jkube/route.yml b/spring/spring-mvc/src/main/fabric8/route.yml → spring/spring-mvc/src/main/jkube/route.yml
diff --git a/spring/spring-rhoar-intro/pom.xml b/spring/spring-rhoar-intro/pom.xml
@@ -19,38 +19,30 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.example</groupId>
-  <artifactId>fruits</artifactId>
-  <version>15-SNAPSHOT</version>
+  <artifactId>spring-getting-started</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
 
-  <name>Simple Fruits Application</name>
-  <description>Spring Boot - CRUD Booster</description>
+  <name>Spring Getting Started</name>
+  <description>Spring Getting Started Code Repository</description>
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
     <maven.min.version>3.3.9</maven.min.version>
-    <postgresql.version>9.4.1212</postgresql.version>
-    <openjdk18-openshift.version>1.3</openjdk18-openshift.version>
-
-    <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
-    <spring-boot-bom.version>2.1.6.Final-redhat-00004</spring-boot-bom.version>
-    <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
-    <fabric8-maven-plugin.version>3.5.40</fabric8-maven-plugin.version>
-    <fabric8.openshift.trimImageInContainerSpec>true</fabric8.openshift.trimImageInContainerSpec>
-    <fabric8.skip.build.pom>true</fabric8.skip.build.pom>
-    <fabric8.generator.from>
-      registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:${openjdk18-openshift.version}
-    </fabric8.generator.from>
-  </properties>
+    <spring-boot.version>2.3.6.RELEASE</spring-boot.version>
+    <spring-boot-bom.version>2.3.6.Final-redhat-00001</spring-boot-bom.version>
+    <jkube.skip.build.pom>true</jkube.skip.build.pom>
+    <jkube-maven-plugin.version>1.3.0</jkube-maven-plugin.version>
+    <jkube.generator.from>registry.redhat.io/ubi8/openjdk-11:latest</jkube.generator.from> 
+</properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>me.snowdrop</groupId>
-        <artifactId>spring-boot-bom</artifactId>
+        <groupId>dev.snowdrop</groupId>
+        <artifactId>snowdrop-dependencies</artifactId>
         <version>${spring-boot-bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -75,6 +67,11 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
+      </dependency>
+      <dependency>
+      <groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -98,6 +95,20 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+      <artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.2</version>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.22.2</version>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+			</plugin>
     </plugins>
   </build>
 
@@ -119,10 +130,10 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>fabric8-maven-plugin</artifactId>
-            <version>${fabric8-maven-plugin.version}</version>
-            <executions>
+   <groupId>org.eclipse.jkube</groupId>
+            <artifactId>openshift-maven-plugin</artifactId>
+            <version>${jkube-maven-plugin.version}</version>            
+<executions>
               <execution>
                 <id>fmp</id>
                 <goals>
@@ -136,4 +147,34 @@
       </build>
     </profile>
   </profiles>
+  <repositories>
+		<repository>
+			<id>jboss-ga-repository</id>
+			<url>https://maven.repository.redhat.com/ga</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>daily</updatePolicy>
+			</snapshots>
+			<name>Red Hat GA</name>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>jboss-ga-repository</id>
+			<url>https://maven.repository.redhat.com/ga</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>daily</updatePolicy>
+			</snapshots>
+			<name>Red Hat GA</name>
+		</pluginRepository>
+	</pluginRepositories>
 </project>
diff --git a/...o/src/main/fabric8/credentials-secret.yml → ...tro/src/main/jkube/credentials-secret.yml b/...o/src/main/fabric8/credentials-secret.yml → ...tro/src/main/jkube/credentials-secret.yml
diff --git a/...oar-intro/src/main/fabric8/deployment.yml → ...rhoar-intro/src/main/jkube/deployment.yml b/...oar-intro/src/main/fabric8/deployment.yml → ...rhoar-intro/src/main/jkube/deployment.yml
diff --git a/...ng-rhoar-intro/src/main/fabric8/route.yml → ...ring-rhoar-intro/src/main/jkube/route.yml b/...ng-rhoar-intro/src/main/fabric8/route.yml → ...ring-rhoar-intro/src/main/jkube/route.yml