Skip to content

Commit

Permalink
Merge pull request #43 from dyc87112/1.0.0-pre
Browse files Browse the repository at this point in the history
1.0.0 pre
  • Loading branch information
dyc87112 authored Jul 27, 2018
2 parents 9ddbada + c89b122 commit 952f43f
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docs/1.0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,4 @@ public class TestController {

- [Spring Cloud构建微服务架构:分布式配置中心](http://blog.didispace.com/spring-cloud-starter-dalston-3/)
- [Spring Cloud构建微服务架构:分布式配置中心(加密与解密)](http://blog.didispace.com/spring-cloud-starter-dalston-3-2)
- [Spring Cloud构建微服务架构:分布式配置中心(高可用与动态刷新)](http://blog.didispace.com/springcloud4-2/)
- [Spring Cloud构建微服务架构:分布式配置中心(高可用与动态刷新)](http://blog.didispace.com/springcloud4-2/)
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
<packaging>pom</packaging>

<name>spring-cloud-config-admin</name>
Expand Down
3 changes: 2 additions & 1 deletion scca-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -75,6 +75,7 @@
<version>2.10.4</version>
<configuration>
<charset>UTF-8</charset>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion scca-discovery-consul/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -77,6 +77,7 @@
<version>2.10.4</version>
<configuration>
<charset>UTF-8</charset>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion scca-discovery-eureka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -76,6 +76,7 @@
<version>2.10.4</version>
<configuration>
<charset>UTF-8</charset>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion scca-persistence-db/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -56,6 +56,7 @@
<version>2.10.4</version>
<configuration>
<charset>UTF-8</charset>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion scca-persistence-git/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -56,6 +56,7 @@
<version>2.10.4</version>
<configuration>
<charset>UTF-8</charset>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion scca-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -129,6 +129,7 @@
<version>2.10.4</version>
<configuration>
<charset>UTF-8</charset>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
Expand Down
20 changes: 12 additions & 8 deletions scca-rest/src/main/generated/swagger-ui/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -686,10 +686,12 @@
"type" : "integer",
"format" : "int64"
}, {
"name" : "value",
"in" : "query",
"required" : true,
"type" : "string"
"in" : "body",
"name" : "body",
"required" : false,
"schema" : {
"type" : "string"
}
} ],
"responses" : {
"200" : {
Expand All @@ -714,10 +716,12 @@
"type" : "integer",
"format" : "int64"
}, {
"name" : "value",
"in" : "query",
"required" : true,
"type" : "string"
"in" : "body",
"name" : "body",
"required" : false,
"schema" : {
"type" : "string"
}
} ],
"responses" : {
"200" : {
Expand Down
2 changes: 1 addition & 1 deletion scca-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>com.didispace</groupId>
<artifactId>spring-cloud-config-admin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-RELEASE</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<maven.test.skip>true</maven.test.skip>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<maven.test.skip>true</maven.test.skip>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.java>1.8</version.java>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
<!--dependencies version-->
<version.spring-boot>1.5.14.RELEASE</version.spring-boot>
<version.spring-cloud>Edgware.SR3</version.spring-cloud>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.java>1.8</version.java>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
<!--dependencies version-->
<version.spring-boot>1.5.14.RELEASE</version.spring-boot>
<version.spring-cloud>Edgware.SR3</version.spring-cloud>
Expand Down
2 changes: 1 addition & 1 deletion scca-use-cases/scca-ui-server-with-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.java>1.8</version.java>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
<!--dependencies version-->
<version.spring-boot>1.5.14.RELEASE</version.spring-boot>
<version.spring-cloud>Edgware.SR3</version.spring-cloud>
Expand Down
2 changes: 1 addition & 1 deletion scca-use-cases/scca-ui-server-with-rest-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.java>1.8</version.java>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
<!--dependencies version-->
<version.spring-boot>1.5.14.RELEASE</version.spring-boot>
<version.spring-cloud>Edgware.SR3</version.spring-cloud>
Expand Down
2 changes: 1 addition & 1 deletion scca-use-cases/scca-ui-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.java>1.8</version.java>
<!--scca version-->
<version.scca>1.0.0-SNAPSHOT</version.scca>
<version.scca>1.0.0-RELEASE</version.scca>
<!--dependencies version-->
<version.spring-boot>1.5.14.RELEASE</version.spring-boot>
<version.spring-cloud>Edgware.SR3</version.spring-cloud>
Expand Down

0 comments on commit 952f43f

Please sign in to comment.