upgrade version

.github/workflows/maven.yml

@@ -1,17 +1,21 @@
 name: Java CI
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+      - develop
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v3
       with:
-        java-version: 17
+        java-version: 21
+        distribution: 'temurin'
+        cache: maven
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package --file pom.xml -DskipTests -X

.run/ExampleSpringCloudKubernetesAdmin.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesAdmin" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-cloud-admin" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesAdmin" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesEureka.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesEureka" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-cloud-eureka" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesEureka" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesGateway.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesGateway" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-cloud-gateway" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesGateway" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesHelloWorld.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesHelloWorld" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-hello-world" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesHelloWorld" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesServerAccount.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesServerAccount" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-server-account" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesServerAccount" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesServerMovie.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesServerMovie" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-server-movie" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesServerMovie" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesServerUI.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesServerUI" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-server-front" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesServerUI" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/ExampleSpringCloudKubernetesZipkin.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ExampleSpringCloudKubernetesZipkin" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="example-spring-cloud-kubernetes-cloud-zipkin" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.toquery.k8s.ExampleSpringCloudKubernetesZipkin" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

clouds/admin/pom.xml → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-admin/pom.xml

@@ -19,16 +19,26 @@
             <artifactId>spring-boot-admin-starter-server</artifactId>
         </dependency>
 
-        <!--
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-kubernetes-client-all</artifactId>
+            <artifactId>spring-cloud-starter-kubernetes-discoveryclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <scope>annotationProcessor</scope>
         </dependency>
-        -->
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-kubernetes-discoveryclient</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>annotationProcessor</scope>
         </dependency>
     </dependencies>
     <build>

clouds/admin/src/main/java/io/github/toquery/k8s/K8sCloudAdmin.java → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-admin/src/main/java/io/github/toquery/k8s/ExampleSpringCloudKubernetesAdmin.java

@@ -9,9 +9,9 @@
 @EnableAdminServer
 @SpringBootApplication
 @EnableDiscoveryClient
-public class K8sCloudAdmin {
+public class ExampleSpringCloudKubernetesAdmin {
 
     public static void main(String[] args) {
-        SpringApplication.run(K8sCloudAdmin.class, args);
+        SpringApplication.run(ExampleSpringCloudKubernetesAdmin.class, args);
     }
 }

clouds/zipkin/pom.xml → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-eureka/pom.xml

@@ -9,40 +9,43 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>example-spring-cloud-kubernetes-cloud-zipkin</artifactId>
-    <name>Spring Cloud Kubernetes :: Cloud :: Zipkin</name>
+    <artifactId>example-spring-cloud-kubernetes-cloud-eureka</artifactId>
+    <name>Spring Cloud Kubernetes :: Cloud :: Eureka</name>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-kubernetes-discovery</artifactId>
+            <artifactId>spring-cloud-commons</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-commons</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <scope>annotationProcessor</scope>
         </dependency>
 
-
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>annotationProcessor</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
         </dependency>
-
 
     </dependencies>
 

clouds/eureka/src/main/java/io/github/toquery/k8s/K8sCloudEureka.java → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-eureka/src/main/java/io/github/toquery/k8s/ExampleSpringCloudKubernetesEureka.java

@@ -7,9 +7,9 @@
 
 @SpringBootApplication
 @EnableEurekaServer
-public class K8sCloudEureka {
+public class ExampleSpringCloudKubernetesEureka {
 
     public static void main(String[] args) {
-        SpringApplication.run(K8sCloudEureka.class, args);
+        SpringApplication.run(ExampleSpringCloudKubernetesEureka.class, args);
     }
 }

clouds/gateway/pom.xml → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-gateway/pom.xml

@@ -29,11 +29,33 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
         </dependency>
-
-
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>annotationProcessor</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <scope>annotationProcessor</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.zipkin.reporter2</groupId>
+            <artifactId>zipkin-reporter-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
 

clouds/zipkin/src/main/java/io/github/toquery/k8s/K8sCloudZipkin.java → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-gateway/src/main/java/io/github/toquery/k8s/ExampleSpringCloudKubernetesGateway.java

@@ -7,9 +7,9 @@
 
 @SpringBootApplication
 @EnableDiscoveryClient
-public class K8sCloudZipkin {
+public class ExampleSpringCloudKubernetesGateway {
 
     public static void main(String[] args) {
-        SpringApplication.run(K8sCloudZipkin.class, args);
+        SpringApplication.run(ExampleSpringCloudKubernetesGateway.class, args);
     }
 }

clouds/eureka/pom.xml → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-zipkin/pom.xml

@@ -9,27 +9,28 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>example-spring-cloud-kubernetes-cloud-eureka</artifactId>
-    <name>Spring Cloud Kubernetes :: Cloud :: Eureka</name>
+    <artifactId>example-spring-cloud-kubernetes-cloud-zipkin</artifactId>
+    <name>Spring Cloud Kubernetes :: Cloud :: Zipkin</name>
 
     <dependencies>
-
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
         </dependency>
 
+
+
     </dependencies>
 
     <build>

clouds/gateway/src/main/java/io/github/toquery/k8s/K8sCloudGateway.java → example-spring-cloud-kubernetes-clouds/example-spring-cloud-kubernetes-cloud-zipkin/src/main/java/io/github/toquery/k8s/ExampleSpringCloudKubernetesZipkin.java

@@ -7,9 +7,9 @@
 
 @SpringBootApplication
 @EnableDiscoveryClient
-public class K8sCloudGateway {
+public class ExampleSpringCloudKubernetesZipkin {
 
     public static void main(String[] args) {
-        SpringApplication.run(K8sCloudGateway.class, args);
+        SpringApplication.run(ExampleSpringCloudKubernetesZipkin.class, args);
     }
 }

clouds/pom.xml → example-spring-cloud-kubernetes-clouds/pom.xml

@@ -17,10 +17,10 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>gateway</module>
-        <module>admin</module>
-        <module>zipkin</module>
-        <module>eureka</module>
+        <module>example-spring-cloud-kubernetes-cloud-gateway</module>
+        <module>example-spring-cloud-kubernetes-cloud-admin</module>
+        <module>example-spring-cloud-kubernetes-cloud-zipkin</module>
+        <module>example-spring-cloud-kubernetes-cloud-eureka</module>
     </modules>
 
     <!--