Merge pull request #15165 from GaetanoPiazzolla/JAVA-27245-module-rename

JAVA-27245 - Renamed modules.

spring-cloud-modules/spring-cloud-bootstrap/README.md

@@ -21,4 +21,4 @@ This module contains articles about bootstrapping Spring Cloud applications that
     - git commit -m "First commit"
   - start the config server
   - start the discovery server
-  - start all the other servers in any order (gateway, svc-book, svc-rating, zipkin)
+  - start all the other servers in any order (gateway, zipkin-log-svc-book, zipkin-log-svc-rating, zipkin)

spring-cloud-modules/spring-cloud-bootstrap/pom.xml

@@ -19,8 +19,8 @@
         <module>discovery</module>
         <module>gateway</module>
         <module>gateway-2</module>
-        <module>svc-book</module>
-        <module>svc-rating</module>
+        <module>zipkin-log-svc-book</module>
+        <module>zipkin-log-svc-rating</module>
         <module>customer-service</module>
         <module>order-service</module>
     </modules>

spring-cloud-modules/spring-cloud-bootstrap/zipkin-log-svc-book/pom.xml

@@ -4,9 +4,9 @@
     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>com.baeldung.spring.cloud</groupId>
-    <artifactId>svc-book</artifactId>
+    <artifactId>zipkin-log-svc-book</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>svc-book</name>
+    <name>zipkin-log-svc-book</name>
 
     <parent>
         <groupId>com.baeldung</groupId>

spring-cloud-modules/spring-cloud-bootstrap/zipkin-log-svc-rating/pom.xml

@@ -4,9 +4,9 @@
     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>com.baeldung.spring.cloud</groupId>
-    <artifactId>svc-rating</artifactId>
+    <artifactId>zipkin-log-svc-rating</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>svc-rating</name>
+    <name>zipkin-log-svc-rating</name>
 
     <parent>
         <groupId>com.baeldung</groupId>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile

@@ -1,5 +0,0 @@
-FROM openjdk:8-jdk-alpine
-VOLUME /tmp
-COPY target/demo-backend-1.0-SNAPSHOT.jar app.jar
-ENV JAVA_OPTS=""
-ENTRYPOINT exec java -jar /app.jar --debug

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile

@@ -1,5 +0,0 @@
-FROM openjdk:8-jdk-alpine
-VOLUME /tmp
-COPY target/demo-frontend-1.0-SNAPSHOT.jar app.jar
-ENV JAVA_OPTS=""
-ENTRYPOINT exec java -jar /app.jar

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/minikube-demo-backend/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+COPY target/minikube-demo-backend-1.0-SNAPSHOT.jar app.jar
+ENV JAVA_OPTS=""
+ENTRYPOINT exec java -jar /app.jar --debug

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/minikube-demo-backend/pom.xml

@@ -3,8 +3,8 @@
     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>
-    <artifactId>demo-frontend</artifactId>
-    <name>demo-frontend</name>
+    <artifactId>minikube-demo-backend</artifactId>
+    <name>minikube-demo-backend</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/minikube-demo-frontend/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+COPY target/minikube-demo-frontend-1.0-SNAPSHOT.jar app.jar
+ENV JAVA_OPTS=""
+ENTRYPOINT exec java -jar /app.jar

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/minikube-demo-frontend/pom.xml

@@ -3,8 +3,8 @@
     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>
-    <artifactId>demo-backend</artifactId>
-    <name>demo-backend</name>
+    <artifactId>minikube-demo-frontend</artifactId>
+    <name>minikube-demo-frontend</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/minikube-demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java

@@ -22,7 +22,7 @@ public class KubernetesFrontendApplication {
 
 		RestTemplate restTemplate = new RestTemplate();
 		String resourceUrl
-				= "http://demo-backend:8080";
+				= "http://minikube-demo-backend:8080";
 		ResponseEntity<String> response
 				= restTemplate.getForEntity(resourceUrl, String.class);
 		return "Message from backend is: " + response.getBody();

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml

@@ -1,10 +1,10 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: demo-backend
+  name: minikube-demo-backend
 spec:
   selector:
-    app: demo-backend
+    app: minikube-demo-backend
     tier: backend
   ports:
   - protocol: TCP
@@ -14,22 +14,22 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: demo-backend
+  name: dminikube-demo-backend
 spec:
   selector:
       matchLabels:
-        app: demo-backend
+        app: minikube-demo-backend
         tier: backend
   replicas: 3
   template:
     metadata:
       labels:
-        app: demo-backend
+        app: minikube-demo-backend
         tier: backend
     spec:
       containers:
-        - name: demo-backend
-          image: demo-backend:latest
+        - name: minikube-demo-backend
+          image: minikube-demo-backend:latest
           imagePullPolicy: Never
           ports:
             - containerPort: 8080

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml

@@ -1,10 +1,10 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: demo-frontend
+  name: minikube-demo-frontend
 spec:
   selector:
-    app: demo-frontend
+    app: minikube-demo-frontend
   ports:
   - protocol: TCP
     port: 8081
@@ -14,20 +14,20 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: demo-frontend
+  name: minikube-demo-frontend
 spec:
   selector:
       matchLabels:
-        app: demo-frontend
+        app: minikube-demo-frontend
   replicas: 3
   template:
     metadata:
       labels:
-        app: demo-frontend
+        app: minikube-demo-frontend
     spec:
       containers:
-        - name: demo-frontend
-          image: demo-frontend:latest
+        - name: minikube-demo-frontend
+          image: minikube-demo-frontend:latest
           imagePullPolicy: Never
           ports:
             - containerPort: 8081

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml

@@ -14,8 +14,8 @@
     </parent>
 
     <modules>
-        <module>demo-backend</module>
-        <module>demo-frontend</module>
+        <module>minikube-demo-backend</module>
+        <module>minikube-demo-frontend</module>
     </modules>
 
 </project>