Skip to content

Commit

Permalink
update to f sr4 version
Browse files Browse the repository at this point in the history
  • Loading branch information
GreyZeng committed Nov 21, 2022
1 parent 94fcfa3 commit d323678
Show file tree
Hide file tree
Showing 8 changed files with 115 additions and 114 deletions.
8 changes: 5 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.0.9.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>git.snippets</groupId>
Expand All @@ -23,9 +23,11 @@
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-cloud.version>Finchley.SR4</spring-cloud.version>
<common.version>0.0.1-SNAPSHOT</common.version>
</properties>

Expand Down
15 changes: 10 additions & 5 deletions skeleton-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,20 @@
<artifactId>skeleton-common</artifactId>

<dependencies>
<dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.83</version>
</dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.19</version>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion skeleton-config-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<packaging>jar</packaging>
<artifactId>skeleton-config-server</artifactId>

<dependencies>
Expand Down
24 changes: 12 additions & 12 deletions skeleton-data-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<name>skeleton-data-service</name>
<packaging>jar</packaging>
<packaging>jar</packaging>
<artifactId>skeleton-data-service</artifactId>

<dependencies>
<dependency>
<groupId>git.snippets</groupId>
<artifactId>skeleton-common</artifactId>
<version>${parent.version}</version>
<dependency>
<groupId>git.snippets</groupId>
<artifactId>skeleton-common</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
Expand Down
51 changes: 24 additions & 27 deletions skeleton-eureka-server/pom.xml
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
<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>
<parent>
<groupId>git.snippets</groupId>
<artifactId>microservice-skeleton</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>skeleton-eureka-server</artifactId>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
</properties>
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>
<parent>
<groupId>git.snippets</groupId>
<artifactId>microservice-skeleton</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>skeleton-eureka-server</artifactId>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
34 changes: 17 additions & 17 deletions skeleton-hystrix-dashboard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<name>skeleton-hystrix-dashboard</name>
<packaging>jar</packaging>
<packaging>jar</packaging>
<artifactId>skeleton-hystrix-dashboard</artifactId>

<dependencies>
<!----> <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>

<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>


</dependencies>

Expand Down
24 changes: 12 additions & 12 deletions skeleton-user-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<name>skeleton-user-service</name>
<packaging>jar</packaging>
<packaging>jar</packaging>
<artifactId>skeleton-user-service</artifactId>

<dependencies>
<dependency>
<groupId>git.snippets</groupId>
<artifactId>skeleton-common</artifactId>
<version>${parent.version}</version>
<groupId>git.snippets</groupId>
<artifactId>skeleton-common</artifactId>
<version>${parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
</dependency>
Expand Down
71 changes: 34 additions & 37 deletions skeleton-zuul-server/pom.xml
Original file line number Diff line number Diff line change
@@ -1,43 +1,40 @@
<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>
<parent>
<groupId>git.snippets</groupId>
<artifactId>microservice-skeleton</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>skeleton-zuul-server</artifactId>
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>
<parent>
<groupId>git.snippets</groupId>
<artifactId>microservice-skeleton</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>skeleton-zuul-server</artifactId>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>git.snippets</groupId>
<artifactId>skeleton-common</artifactId>
<version>${parent.version}</version>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>git.snippets</groupId>
<artifactId>skeleton-common</artifactId>
<version>${parent.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

0 comments on commit d323678

Please sign in to comment.