Skip to content

Commit e1258a0

Browse files
salesonsaleson
authored
Merge pull request #27 from SpringCloud/A
A
2 parents 6ec620d + 78eb0ed commit e1258a0

File tree

213 files changed

+2830
-2940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+2830
-2940
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Spring Cloud Gray - 微服务灰度路由中间件
1+
# Spring Cloud Gray - 微服务灰度中间件
22

33

44
[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)

‎doc/img/gray-all.png‎

-533 KB
Loading

‎doc/img/gray.png‎

-367 KB
Loading

‎doc/img/springcloud-gray-decision.png‎

-205 KB
Loading

‎doc/img/springcloud-gray-instance.png‎

-180 KB
Loading

‎doc/img/springcloud-gray-policy.png‎

-191 KB
Loading

‎doc/img/springcloud-gray-service.png‎

-167 KB
Loading

‎doc/img/springcloud-gray-track.png‎

-175 KB
Loading

‎pom.xml‎

Lines changed: 100 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<groupId>cn.springcloud.gray</groupId>
1313
<artifactId>spring-cloud-gray</artifactId>
1414
<packaging>pom</packaging>
15-
<version>A.1.0.10</version>
15+
<version>A.1.1.0-SNAPSHOT</version>
1616
<url>https://github.com/SpringCloud/spring-cloud-gray</url>
1717
<organization>
1818
<name>Spring Cloud中国社区</name>
@@ -27,9 +27,7 @@
2727
</developer>
2828
</developers>
2929
<modules>
30-
3130
<module>spring-cloud-gray-dependencies</module>
32-
3331
<module>spring-cloud-gray-core</module>
3432
<module>spring-cloud-gray-server</module>
3533
<module>spring-cloud-gray-client</module>
@@ -40,9 +38,10 @@
4038
<module>spring-cloud-gray-utils</module>
4139
<module>spring-cloud-gray-starter-dependencies</module>
4240
<module>spring-cloud-starter-gray-eureka-server</module>
41+
<module>spring-cloud-gray-server-plugins</module>
42+
<module>spring-cloud-gray-plugins</module>
4343
</modules>
4444

45-
4645
<licenses>
4746
<license>
4847
<name>The Apache Software License, Version 2.0</name>
@@ -62,7 +61,7 @@
6261
<maven.compiler.source>1.8</maven.compiler.source>
6362
<maven.compiler.target>1.8</maven.compiler.target>
6463
<java.version>1.8</java.version>
65-
<spring-cloud.version>Edgware.SR5</spring-cloud.version>
64+
<spring-cloud.version>Edgware.SR6</spring-cloud.version>
6665
<springfox.version>2.9.2</springfox.version>
6766
<lombok.version>1.18.8</lombok.version>
6867
<slf4j.version>1.7.26</slf4j.version>
@@ -72,6 +71,7 @@
7271
<mapstruct.version>1.1.0.Final</mapstruct.version>
7372
<caffeine.version>2.7.0</caffeine.version>
7473
<aspectj.version>1.8.13</aspectj.version>
74+
<querydsl.version>4.2.1</querydsl.version>
7575
</properties>
7676

7777

@@ -152,6 +152,61 @@
152152
<version>${project.version}</version>
153153
</dependency>
154154

155+
156+
157+
158+
<!-- gray client plugins start -->
159+
160+
<dependency>
161+
<groupId>cn.springcloud.gray</groupId>
162+
<artifactId>spring-cloud-gray-plugin-webmvc</artifactId>
163+
<version>${project.version}</version>
164+
</dependency>
165+
166+
<dependency>
167+
<groupId>cn.springcloud.gray</groupId>
168+
<artifactId>spring-cloud-gray-plugin-eureka</artifactId>
169+
<version>${project.version}</version>
170+
</dependency>
171+
172+
<dependency>
173+
<groupId>cn.springcloud.gray</groupId>
174+
<artifactId>spring-cloud-gray-plugin-feign</artifactId>
175+
<version>${project.version}</version>
176+
</dependency>
177+
178+
<dependency>
179+
<groupId>cn.springcloud.gray</groupId>
180+
<artifactId>spring-cloud-gray-plugin-zuul</artifactId>
181+
<version>${project.version}</version>
182+
</dependency>
183+
184+
<dependency>
185+
<groupId>cn.springcloud.gray</groupId>
186+
<artifactId>spring-cloud-gray-plugin-event-stream</artifactId>
187+
<version>${project.version}</version>
188+
</dependency>
189+
190+
<!-- gray client plugins end -->
191+
192+
193+
<!-- gray server plugins start -->
194+
195+
<dependency>
196+
<groupId>cn.springcloud.gray</groupId>
197+
<artifactId>spring-cloud-gray-server-plugin-eureka</artifactId>
198+
<version>${project.version}</version>
199+
</dependency>
200+
201+
<dependency>
202+
<groupId>cn.springcloud.gray</groupId>
203+
<artifactId>spring-cloud-gray-server-plugin-event-stream</artifactId>
204+
<version>${project.version}</version>
205+
</dependency>
206+
207+
<!-- gray server plugins end -->
208+
209+
155210
<dependency>
156211
<groupId>org.aspectj</groupId>
157212
<artifactId>aspectjrt</artifactId>
@@ -241,42 +296,25 @@
241296
<artifactId>javax.interceptor-api</artifactId>
242297
<version>1.2.2</version>
243298
</dependency>
244-
</dependencies>
245299

300+
<dependency>
301+
<groupId>com.querydsl</groupId>
302+
<artifactId>querydsl-apt</artifactId>
303+
<version>${querydsl.version}</version>
304+
<scope>provided</scope>
305+
</dependency>
246306

307+
<dependency>
308+
<groupId>com.querydsl</groupId>
309+
<artifactId>querydsl-jpa</artifactId>
310+
<version>${querydsl.version}</version>
311+
</dependency>
312+
</dependencies>
247313
</dependencyManagement>
248314

249315
<build>
250316
<defaultGoal>spring-boot:run</defaultGoal>
251317
<plugins>
252-
<!-- Source -->
253-
<plugin>
254-
<groupId>org.apache.maven.plugins</groupId>
255-
<artifactId>maven-source-plugin</artifactId>
256-
<version>2.2.1</version>
257-
<executions>
258-
<execution>
259-
<phase>package</phase>
260-
<goals>
261-
<goal>jar-no-fork</goal>
262-
</goals>
263-
</execution>
264-
</executions>
265-
</plugin>
266-
<!-- Javadoc -->
267-
<plugin>
268-
<groupId>org.apache.maven.plugins</groupId>
269-
<artifactId>maven-javadoc-plugin</artifactId>
270-
<version>2.9.1</version>
271-
<executions>
272-
<execution>
273-
<phase>package</phase>
274-
<goals>
275-
<goal>jar</goal>
276-
</goals>
277-
</execution>
278-
</executions>
279-
</plugin>
280318
<!-- Compile -->
281319
<plugin>
282320
<groupId>org.apache.maven.plugins</groupId>
@@ -305,6 +343,34 @@
305343
<id>sonatype-oss-release</id>
306344
<build>
307345
<plugins>
346+
<!-- Source -->
347+
<plugin>
348+
<groupId>org.apache.maven.plugins</groupId>
349+
<artifactId>maven-source-plugin</artifactId>
350+
<version>2.2.1</version>
351+
<executions>
352+
<execution>
353+
<phase>package</phase>
354+
<goals>
355+
<goal>jar-no-fork</goal>
356+
</goals>
357+
</execution>
358+
</executions>
359+
</plugin>
360+
<!-- Javadoc -->
361+
<plugin>
362+
<groupId>org.apache.maven.plugins</groupId>
363+
<artifactId>maven-javadoc-plugin</artifactId>
364+
<version>2.9.1</version>
365+
<executions>
366+
<execution>
367+
<phase>package</phase>
368+
<goals>
369+
<goal>jar</goal>
370+
</goals>
371+
</execution>
372+
</executions>
373+
</plugin>
308374
<!-- GPG -->
309375
<plugin>
310376
<groupId>org.apache.maven.plugins</groupId>

‎spring-cloud-gray-client-netflix/pom.xml‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-gray</artifactId>
77
<groupId>cn.springcloud.gray</groupId>
8-
<version>A.1.0.10</version>
8+
<version>A.1.1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -32,6 +32,12 @@
3232
<dependency>
3333
<groupId>io.github.openfeign</groupId>
3434
<artifactId>feign-hystrix</artifactId>
35+
<exclusions>
36+
<exclusion>
37+
<artifactId>jsr305</artifactId>
38+
<groupId>com.google.code.findbugs</groupId>
39+
</exclusion>
40+
</exclusions>
3541
</dependency>
3642
<dependency>
3743
<groupId>io.github.openfeign</groupId>
@@ -46,62 +52,89 @@
4652
<artifactId>spring-cloud-context</artifactId>
4753
</dependency>
4854

49-
<dependency>
50-
<groupId>org.springframework.cloud</groupId>
51-
<artifactId>spring-cloud-netflix-eureka-client</artifactId>
52-
</dependency>
55+
<!-- <dependency>-->
56+
<!-- <groupId>org.springframework.cloud</groupId>-->
57+
<!-- <artifactId>spring-cloud-netflix-eureka-client</artifactId>-->
58+
<!-- </dependency>-->
5359
<dependency>
5460
<groupId>org.springframework.boot</groupId>
5561
<artifactId>spring-boot-configuration-processor</artifactId>
5662
<optional>true</optional>
5763
</dependency>
58-
<dependency>
59-
<groupId>com.netflix.eureka</groupId>
60-
<artifactId>eureka-client</artifactId>
61-
</dependency>
64+
<!-- <dependency>-->
65+
<!-- <groupId>com.netflix.eureka</groupId>-->
66+
<!-- <artifactId>eureka-client</artifactId>-->
67+
<!-- </dependency>-->
6268
<dependency>
6369
<groupId>com.netflix.ribbon</groupId>
6470
<artifactId>ribbon-eureka</artifactId>
71+
<optional>true</optional>
6572
</dependency>
6673
<dependency>
6774
<groupId>com.netflix.ribbon</groupId>
6875
<artifactId>ribbon-loadbalancer</artifactId>
76+
<optional>true</optional>
6977
</dependency>
7078
<dependency>
7179
<groupId>com.netflix.ribbon</groupId>
7280
<artifactId>ribbon-core</artifactId>
81+
<optional>true</optional>
7382
</dependency>
7483
<dependency>
7584
<groupId>com.netflix.zuul</groupId>
7685
<artifactId>zuul-core</artifactId>
86+
<optional>true</optional>
87+
<exclusions>
88+
<exclusion>
89+
<artifactId>commons-io</artifactId>
90+
<groupId>commons-io</groupId>
91+
</exclusion>
92+
</exclusions>
7793
</dependency>
7894
<dependency>
7995
<groupId>org.projectlombok</groupId>
8096
<artifactId>lombok</artifactId>
97+
<optional>true</optional>
8198
</dependency>
8299
<dependency>
83100
<groupId>javax.servlet</groupId>
84101
<artifactId>javax.servlet-api</artifactId>
102+
<optional>true</optional>
85103
</dependency>
86104
<dependency>
87105
<groupId>org.slf4j</groupId>
88106
<artifactId>slf4j-api</artifactId>
107+
<optional>true</optional>
89108
</dependency>
90109
<dependency>
91110
<groupId>commons-io</groupId>
92111
<artifactId>commons-io</artifactId>
112+
<optional>true</optional>
93113
</dependency>
94114
<dependency>
95115
<groupId>org.apache.commons</groupId>
96116
<artifactId>commons-lang3</artifactId>
117+
<optional>true</optional>
97118
</dependency>
98119
<dependency>
99120
<groupId>com.google.guava</groupId>
100121
<artifactId>guava</artifactId>
122+
<exclusions>
123+
<exclusion>
124+
<artifactId>error_prone_annotations</artifactId>
125+
<groupId>com.google.errorprone</groupId>
126+
</exclusion>
127+
<exclusion>
128+
<artifactId>checker-qual</artifactId>
129+
<groupId>org.checkerframework</groupId>
130+
</exclusion>
131+
</exclusions>
132+
<optional>true</optional>
101133
</dependency>
102134
<dependency>
103135
<groupId>org.aspectj</groupId>
104136
<artifactId>aspectjrt</artifactId>
137+
<optional>true</optional>
105138
</dependency>
106139

107140

0 commit comments

Comments
 (0)