[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 506c3c3 Update License 506c3c3 is described below commit 506c3c302a18d133edcfe4d2f9ffb5c8031bd4b4 Author: mercyblitz AuthorDate: Thu Jun 21 11:45:19 2018 +0800 Update License --- dubbo-spring-boot-actuator/pom.xml | 17 - dubbo-spring-boot-autoconfigure/pom.xml| 17 - dubbo-spring-boot-parent/pom.xml | 18 -- .../dubbo-spring-boot-sample-api/pom.xml | 17 - .../dubbo-spring-boot-sample-consumer/pom.xml | 17 - .../dubbo-spring-boot-sample-provider/pom.xml | 17 - dubbo-spring-boot-samples/pom.xml | 17 - dubbo-spring-boot-starter/pom.xml | 17 - pom.xml| 16 9 files changed, 144 insertions(+), 9 deletions(-) diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index a73c7cf..079bd07 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -1,4 +1,19 @@ - + 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;> diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index 54e0a4d..043310c 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -1,4 +1,19 @@ - + 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;> diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 97999b9..0682e3d 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -1,4 +1,19 @@ - + 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;> @@ -315,7 +330,6 @@ **/.project **/target/** **/*.log -pom.xml CODE_OF_CONDUCT.md .codecov.yml .travis.yml diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml index bfa59b7..971c9c1 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/pom.xml @@ -1,4 +1,19 @@ - + 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;> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml index c1b6594..3af5864 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-consumer/pom.xml @@ -1,4 +1,19 @@ - + 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;> diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml index 070e3dc..647cf2d 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-provider/pom.xml @@ -1,4 +1,19 @@ - + 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;> diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index 44a40da..16da5b0 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -1,4 +1,19 @@ - + 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;> diff --git
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (3a06a8f -> 31395a4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 3a06a8f Add exclude add 75e7310 Merge pull request #191 from apache/0.1.x add e2ba6f0 0.1.x (#197) new 31395a4 Merge branch '0.1.1-release' into 0.1.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Add exclude
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 3a06a8f Add exclude 3a06a8f is described below commit 3a06a8ff837435bcd90117ec855f456dd890cbf1 Author: mercyblitz AuthorDate: Thu Jun 21 11:36:23 2018 +0800 Add exclude --- dubbo-spring-boot-parent/pom.xml | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index a9aa681..97999b9 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -1,17 +1,4 @@ - + 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;> @@ -328,6 +315,7 @@ **/.project **/target/** **/*.log +pom.xml CODE_OF_CONDUCT.md .codecov.yml .travis.yml
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 53790bb Update License 53790bb is described below commit 53790bb62f72c66412542fa76cbe7cee124a6d0c Author: mercyblitz AuthorDate: Thu Jun 21 11:34:13 2018 +0800 Update License --- dubbo-spring-boot-parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 4dc85ef..a9aa681 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -11,8 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> - + --> 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;>
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 6834b7a Update License 6834b7a is described below commit 6834b7aa8454f2877689f1e665b40005c4d61260 Author: mercyblitz AuthorDate: Thu Jun 21 11:27:17 2018 +0800 Update License --- dubbo-spring-boot-parent/pom.xml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 18e0917..4dc85ef 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -1,3 +1,17 @@ + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update License position
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 230ce18 Update License position 230ce18 is described below commit 230ce18e544397f9e037839fb55efeccf469a717 Author: mercyblitz AuthorDate: Thu Jun 21 11:22:59 2018 +0800 Update License position --- .../main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java index f57c8e4..59bdfc1 100644 --- a/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java +++ b/dubbo-spring-boot-samples/dubbo-spring-boot-sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java @@ -1,4 +1,4 @@ -package com.alibaba.boot.dubbo.demo.consumer;/* +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -14,6 +14,7 @@ package com.alibaba.boot.dubbo.demo.consumer;/* * See the License for the specific language governing permissions and * limitations under the License. */ +package com.alibaba.boot.dubbo.demo.consumer; /** * Demo Service interface
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated: Update excludes (#195)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0-release by this push: new 3cc4c6b Update excludes (#195) 3cc4c6b is described below commit 3cc4c6b1a709764ec7d66c6c775ca146b43c208b Author: 小马哥 AuthorDate: Thu Jun 21 10:53:23 2018 +0800 Update excludes (#195)
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update excludes
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new c94eab4 Update excludes c94eab4 is described below commit c94eab445be6f92e519d177b4fa52955677f79ef Author: mercyblitz AuthorDate: Thu Jun 21 10:50:09 2018 +0800 Update excludes --- dubbo-spring-boot-parent/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 2321321..c3a79bd 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -336,8 +336,13 @@ PULL_REQUEST_TEMPLATE.md CONTRIBUTING.md README.md +README_CN.md **/codestyle/* **/resources/META-INF/** +**/*.factories +**/*.provides +**/*.properties +**/*.json
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update excludes
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.1.x by this push: new 3da1097 Update excludes 3da1097 is described below commit 3da1097d6b17d4fd72a44114164a0b4efe3a1767 Author: mercyblitz AuthorDate: Thu Jun 21 10:31:16 2018 +0800 Update excludes --- dubbo-spring-boot-parent/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index cd6a73b..18e0917 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -321,8 +321,13 @@ PULL_REQUEST_TEMPLATE.md CONTRIBUTING.md README.md +README_CN.md **/codestyle/* **/resources/META-INF/** +**/*.factories +**/*.provides +**/*.properties +**/*.json
[incubator-dubbo-spring-boot-project] branch master updated: 0.2.0 release (#194)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new f8c7eb2 0.2.0 release (#194)
f8c7eb2 is described below
commit f8c7eb200ea618c9faa7cadc2add6540d943ac67
Author: 小马哥
AuthorDate: Wed Jun 20 18:37:28 2018 +0800
0.2.0 release (#194)
* Update travis-ci configuration
* Fix test cases
* Fix CI issue
* Fix CI issue
* Update rat configuration
* Update DubboAutoConfigurationOnMultipleConfigTest.java
---
.travis.yml| 2 +-
...DubboAutoConfigurationOnMultipleConfigTest.java | 3 +-
dubbo-spring-boot-parent/pom.xml | 72 --
3 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index be807fe..958ca14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,4 +9,4 @@ jdk:
script: "mvn clean package"
after_success:
- - bash <(curl -s https://codecov.io/bash) -t
89f70bf5-4d6b-4759-8da0-dfab7881fd3e
+ - bash <(curl -s https://codecov.io/bash) -t
89f70bf5-4d6b-4759-8da0-dfab7881fd3e
\ No newline at end of file
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
index 2d7b004..ee93509 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
@@ -266,10 +266,9 @@ public class DubboAutoConfigurationOnMultipleConfigTest {
Assert.assertNotNull(multipleDubboConfigConfiguration);
}
-@Ignore
@Test
public void testSingleDubboConfigConfiguration() {
-Assert.assertNull(singleDubboConfigConfiguration);
+Assert.assertNotNull(singleDubboConfigConfiguration);
}
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index 5e44781..52beb08 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -33,13 +33,25 @@
1.8
+1.8
+1.8
UTF-8
UTF-8
-2.0.2.RELEASE
+2.0.3.RELEASE
2.6.2
0.2
3.4.9
2.12.0
+
+-server -Xms256m -Xmx512m -XX:PermSize=64m
-XX:MaxPermSize=128m -Dfile.encoding=UTF-8
+-Djava.net.preferIPv4Stack=true
+
+
+
+3.0.2
+3.6.0
+3.0.1
+0.8.1
1.5
0.12
0.8.1
@@ -193,6 +205,7 @@
org.apache.maven.plugins
maven-jar-plugin
+${maven-jar-plugin.version}
true
@@ -201,18 +214,51 @@
true
true
+
+
${project.version}
+
${project.version}
+
+
org.apache.maven.plugins
maven-compiler-plugin
+${maven-compiler-plugin.version}
-${java.version}
-${java.version}
-true
+-proc:none
+true
+${java.source.version}
+${java.target.version}
+${file.encoding}
+
+
+org.jacoco
+jacoco-maven-plugin
+${maven-jacoco-plugin.version}
+
+
+jacoco-initialize
+
+prepare-agent
+
+
+jacocoArgLine
+
+
+
+jacoco-site
+package
+
+report
+
+
+
+
+
org.apache.maven.plugins
maven-enforcer-plugin
@@ -225,7 +271,7 @@
-[1.7,)
+[1.8,)
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated (2aa8d95 -> 975f483)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a change to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 2aa8d95 Merge branch 'master' into 0.2.0-release add 975f483 Update DubboAutoConfigurationOnMultipleConfigTest.java No new revisions were added by this update. Summary of changes: .../dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 1 - 1 file changed, 1 deletion(-)
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated (5f15ff1 -> 2aa8d95)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 5f15ff1 Merge pull request #193 from apache/0.2.0 add dbe6d5f Merge pull request #181 from apache/0.2.0-release add f470547 add ci and codecov plugin add aaa89a2 add java 7 add 096e487 update shell add 9381eff revert ./mvnw add 4efac58 igonre test temporary add d7ac80b remomv jdk7 because springboot2 doee not support it add a656c14 Merge pull request #189 from lovepoem/add_ci_and_test_coverage add 7193cf7 Update codecov configuration add c4f29f2 Update .travis.yml new 2aa8d95 Merge branch 'master' into 0.2.0-release The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 6 README_CN.md | 6 ...DubboAutoConfigurationOnMultipleConfigTest.java | 3 ++ dubbo-spring-boot-parent/pom.xml | 36 ++ pom.xml| 26 ++-- 5 files changed, 75 insertions(+), 2 deletions(-)
[incubator-dubbo-spring-boot-project] 01/01: Merge branch 'master' into 0.2.0-release
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.0-release
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
commit 2aa8d95276112e7b22b82bba4c5e1e2eefb9c9a6
Merge: 5f15ff1 c4f29f2
Author: 小马哥
AuthorDate: Wed Jun 20 17:56:32 2018 +0800
Merge branch 'master' into 0.2.0-release
README.md | 6
README_CN.md | 6
...DubboAutoConfigurationOnMultipleConfigTest.java | 3 ++
dubbo-spring-boot-parent/pom.xml | 36 ++
pom.xml| 26 ++--
5 files changed, 75 insertions(+), 2 deletions(-)
diff --cc
dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
index 2852166,2d7b004..9115c6c
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
@@@ -264,9 -266,10 +266,10 @@@ public class DubboAutoConfigurationOnMu
Assert.assertNotNull(multipleDubboConfigConfiguration);
}
+ @Ignore
@Test
public void testSingleDubboConfigConfiguration() {
-Assert.assertNull(singleDubboConfigConfiguration);
+Assert.assertNotNull(singleDubboConfigConfiguration);
}
diff --cc dubbo-spring-boot-parent/pom.xml
index 2321321,5e44781..52beb08
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@@ -42,18 -40,11 +42,21 @@@
0.2
3.4.9
2.12.0
+
+-server -Xms256m -Xmx512m -XX:PermSize=64m
-XX:MaxPermSize=128m -Dfile.encoding=UTF-8
+-Djava.net.preferIPv4Stack=true
+
+
+
+3.0.2
+3.6.0
+3.0.1
+0.8.1
1.5
0.12
+ 0.8.1
+ 3.0.1
+ 2.22.0
@@@ -284,8 -241,12 +287,13 @@@
org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven_surefire_version}
+
+
+ org.apache.maven.plugins
maven-source-plugin
+${maven-source-plugin.version}
attach-sources
@@@ -330,14 -303,15 +361,19 @@@
**/.project
**/target/**
**/*.log
+CODE_OF_CONDUCT.md
.codecov.yml
.travis.yml
+PULL_REQUEST_TEMPLATE.md
+CONTRIBUTING.md
README.md
+ README_CN.md
**/codestyle/*
+**/resources/META-INF/**
+ **/*.factories
+ **/*.provides
+ **/*.properties
+ **/*.json
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Update maven plugins
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.1.x
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.1.x by this push:
new c62d0ee Update maven plugins
c62d0ee is described below
commit c62d0ee9d19c72b98c1c7f14e879a92d4a9fc0fa
Author: mercyblitz
AuthorDate: Wed Jun 20 17:50:32 2018 +0800
Update maven plugins
---
dubbo-spring-boot-parent/pom.xml | 111 +++
1 file changed, 100 insertions(+), 11 deletions(-)
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index 4b5e48e..cd6a73b 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -18,18 +18,27 @@
1.7
+1.7
+1.7
UTF-8
UTF-8
-1.5.13.RELEASE
+1.5.14.RELEASE
2.6.2
0.2
3.4.9
2.12.0
+
+-server -Xms256m -Xmx512m -XX:PermSize=64m
-XX:MaxPermSize=128m -Dfile.encoding=UTF-8
+-Djava.net.preferIPv4Stack=true
+
+
+
+3.0.2
+3.6.0
+3.0.1
+0.8.1
1.5
-3.0.2
-3.6.0
-3.0.1
-3.0.0-M1
+0.12
@@ -178,7 +187,7 @@
org.apache.maven.plugins
maven-jar-plugin
-${maven-jar.version}
+${maven-jar-plugin.version}
true
@@ -187,22 +196,54 @@
true
true
+
+
${project.version}
+
${project.version}
+
+
org.apache.maven.plugins
maven-compiler-plugin
-${maven-compiler.version}
+${maven-compiler-plugin.version}
-${java.version}
-${java.version}
+-proc:none
+true
+${java.source.version}
+${java.target.version}
+${file.encoding}
+
+
+org.jacoco
+jacoco-maven-plugin
+${maven-jacoco-plugin.version}
+
+
+jacoco-initialize
+
+prepare-agent
+
+
+jacocoArgLine
+
+
+
+jacoco-site
+package
+
+report
+
+
+
+
+
org.apache.maven.plugins
maven-enforcer-plugin
-${maven-enforcer.version}
enforce-rules
@@ -229,7 +270,7 @@
org.apache.maven.plugins
maven-source-plugin
-${maven-source.version}
+${maven-source-plugin.version}
attach-sources
@@ -239,6 +280,54 @@
+
+org.apache.rat
+apache-rat-plugin
+${apache-rat-plugin.version}
+
+
+verify.rat
+verify
+
+check
+
+
+
+**/*.versionsBackup
+**/.idea/
+**/*.iml
+**/*.txt
+**/*.load
+**/*.flex
+**/*.fc
+**/*.javascript
+**/*.properties
+**/*.thrift
+**/*.sh
+**/*.bat
+**/*.md
+.git/
+.gitignore
+
+.repository/
+**/.settings/*
+**/.classpath
+**/.project
+**/target/**
+
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #193 from apache/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 5f15ff1eb8df051add11b363030b695170327dd9 Merge: ba2dfc9 547a8fc Author: 小马哥 AuthorDate: Wed Jun 20 17:46:17 2018 +0800 Merge pull request #193 from apache/0.2.0 0.2.0 .travis.yml| 7 +- ...DubboAutoConfigurationOnMultipleConfigTest.java | 2 +- dubbo-spring-boot-parent/pom.xml | 75 +++--- 3 files changed, 73 insertions(+), 11 deletions(-)
[incubator-dubbo-spring-boot-project] branch 0.2.0-release updated (ba2dfc9 -> 5f15ff1)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from ba2dfc9 Merge pull request #192 from apache/0.2.0 add e8e2ff1 Fix test cases add e216ee1 Fix CI issue add d1c7b73 Fix CI issue add 547a8fc Update rat configuration new 5f15ff1 Merge pull request #193 from apache/0.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml| 7 +- ...DubboAutoConfigurationOnMultipleConfigTest.java | 2 +- dubbo-spring-boot-parent/pom.xml | 75 +++--- 3 files changed, 73 insertions(+), 11 deletions(-)
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update rat configuration
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 547a8fc Update rat configuration 547a8fc is described below commit 547a8fc618a2eeae5947be3c69261a2a9ab93b20 Author: mercyblitz AuthorDate: Wed Jun 20 17:39:28 2018 +0800 Update rat configuration --- dubbo-spring-boot-parent/pom.xml | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index b9a9c03..2321321 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -308,8 +308,19 @@ +**/*.versionsBackup **/.idea/ **/*.iml +**/*.txt +**/*.load +**/*.flex +**/*.fc +**/*.javascript +**/*.properties +**/*.thrift +**/*.sh +**/*.bat +**/*.md .git/ .gitignore @@ -319,13 +330,14 @@ **/.project **/target/** **/*.log +CODE_OF_CONDUCT.md .codecov.yml .travis.yml +PULL_REQUEST_TEMPLATE.md +CONTRIBUTING.md README.md **/codestyle/* -**/*.factories -**/*.provides -**/*.properties +**/resources/META-INF/**
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fix CI issue
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.0
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.2.0 by this push:
new d1c7b73 Fix CI issue
d1c7b73 is described below
commit d1c7b734a10af0c9ca1865f800f3376117f896d5
Author: mercyblitz
AuthorDate: Wed Jun 20 17:05:38 2018 +0800
Fix CI issue
---
dubbo-spring-boot-actuator/README.md | 4 +-
dubbo-spring-boot-actuator/pom.xml | 2 +-
dubbo-spring-boot-autoconfigure/pom.xml| 2 +-
dubbo-spring-boot-parent/pom.xml | 62 ++
.../dubbo-spring-boot-sample-api/pom.xml | 2 +-
.../dubbo-spring-boot-sample-consumer/pom.xml | 2 +-
.../dubbo-spring-boot-sample-provider/pom.xml | 2 +-
dubbo-spring-boot-samples/pom.xml | 2 +-
dubbo-spring-boot-starter/pom.xml | 2 +-
pom.xml| 2 +-
10 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/dubbo-spring-boot-actuator/README.md
b/dubbo-spring-boot-actuator/README.md
index 81d7b1a..103aa7d 100644
--- a/dubbo-spring-boot-actuator/README.md
+++ b/dubbo-spring-boot-actuator/README.md
@@ -33,7 +33,7 @@ You can introduce the latest `dubbo-spring-boot-actuator` to
your project by ad
com.alibaba.boot
dubbo-spring-boot-actuator
-0.2.0-SNAPSHOT
+0.2.0
```
If your project failed to resolve the dependency, try to add the following
repository:
@@ -184,7 +184,7 @@ Actuator endpoint `dubbo` supports Actuator Endpoints :
{
"timestamp": 1516623290166,
"versions": {
-"dubbo-spring-boot": "0.2.0-SNAPSHOT"
+"dubbo-spring-boot": "0.2.0"
"dubbo": "2.6.2"
},
"urls": {
diff --git a/dubbo-spring-boot-actuator/pom.xml
b/dubbo-spring-boot-actuator/pom.xml
index 9dc507b..1d2c648 100644
--- a/dubbo-spring-boot-actuator/pom.xml
+++ b/dubbo-spring-boot-actuator/pom.xml
@@ -20,7 +20,7 @@
dubbo-spring-boot-parent
com.alibaba.boot
-0.2.0-SNAPSHOT
+0.2.0
../dubbo-spring-boot-parent/pom.xml
4.0.0
diff --git a/dubbo-spring-boot-autoconfigure/pom.xml
b/dubbo-spring-boot-autoconfigure/pom.xml
index 30a2f8d..602ee77 100644
--- a/dubbo-spring-boot-autoconfigure/pom.xml
+++ b/dubbo-spring-boot-autoconfigure/pom.xml
@@ -20,7 +20,7 @@
com.alibaba.boot
dubbo-spring-boot-parent
-0.2.0-SNAPSHOT
+0.2.0
../dubbo-spring-boot-parent
4.0.0
diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index e70db99..b9a9c03 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -20,7 +20,7 @@
com.alibaba.boot
dubbo-spring-boot-project
-0.2.0-SNAPSHOT
+0.2.0
../pom.xml
@@ -33,13 +33,25 @@
1.8
+1.8
+1.8
UTF-8
UTF-8
-2.0.2.RELEASE
+2.0.3.RELEASE
2.6.2
0.2
3.4.9
2.12.0
+
+-server -Xms256m -Xmx512m -XX:PermSize=64m
-XX:MaxPermSize=128m -Dfile.encoding=UTF-8
+-Djava.net.preferIPv4Stack=true
+
+
+
+3.0.2
+3.6.0
+3.0.1
+0.8.1
1.5
0.12
@@ -190,6 +202,7 @@
org.apache.maven.plugins
maven-jar-plugin
+${maven-jar-plugin.version}
true
@@ -198,25 +211,51 @@
true
true
+
+
${project.version}
+
${project.version}
+
+
org.apache.maven.plugins
maven-compiler-plugin
+${maven-compiler-plugin.version}
-${java.version}
-${java.version}
-true
+-proc:none
+true
+${java.source.version}
+${java.target.version}
+${file.encoding}
+
-maven-surefire-plugin
-2.20.1
-
---add-modules java.xml.bind
-
+org.jacoco
+jacoco-maven-plugin
+${maven-jacoco-plugin.version}
+
+
+jacoco-initialize
+
+prepare-agent
+
+
+
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fix CI issue
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new e216ee1 Fix CI issue e216ee1 is described below commit e216ee180d9db6c1ef75239616a1bcdbad703b81 Author: mercyblitz AuthorDate: Wed Jun 20 16:44:55 2018 +0800 Fix CI issue --- .travis.yml | 7 +-- dubbo-spring-boot-parent/pom.xml | 7 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef16343..958ca14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,12 @@ language: java +sudo: false # faster builds + jdk: +- oraclejdk10 +- oraclejdk9 - oraclejdk8 -- openjdk7 -script: mvn clean package +script: "mvn clean package" after_success: - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e \ No newline at end of file diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index 048ec3a..e70db99 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -211,6 +211,13 @@ +maven-surefire-plugin +2.20.1 + +--add-modules java.xml.bind + + + org.apache.maven.plugins maven-enforcer-plugin
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Fix test cases
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.0
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.2.0 by this push:
new e8e2ff1 Fix test cases
e8e2ff1 is described below
commit e8e2ff1f608da5c47685c18f73d383d1bc32ab93
Author: mercyblitz
AuthorDate: Wed Jun 20 16:25:32 2018 +0800
Fix test cases
---
.../dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
index 75c950c..2852166 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
@@ -266,7 +266,7 @@ public class DubboAutoConfigurationOnMultipleConfigTest {
@Test
public void testSingleDubboConfigConfiguration() {
-Assert.assertNull(singleDubboConfigConfiguration);
+Assert.assertNotNull(singleDubboConfigConfiguration);
}
[incubator-dubbo-spring-boot-project] branch 0.1.x updated: Fix test cases
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.1.x
in repository
https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.1.x by this push:
new 144bd39 Fix test cases
144bd39 is described below
commit 144bd397b442042d620fb30d41203b1329e8ab18
Author: mercyblitz
AuthorDate: Wed Jun 20 16:22:53 2018 +0800
Fix test cases
---
.../dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
index 75c950c..2852166 100644
---
a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
+++
b/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java
@@ -266,7 +266,7 @@ public class DubboAutoConfigurationOnMultipleConfigTest {
@Test
public void testSingleDubboConfigConfiguration() {
-Assert.assertNull(singleDubboConfigConfiguration);
+Assert.assertNotNull(singleDubboConfigConfiguration);
}
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #191 from apache/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.1-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 75e73101384337f24fe9cb4f428da18c46a4a613 Merge: fa9110d 1739ce1 Author: 小马哥 AuthorDate: Wed Jun 20 16:15:48 2018 +0800 Merge pull request #191 from apache/0.1.x 0.1.x .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Update travis-ci configuration
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/0.2.0 by this push: new 27c4008 Update travis-ci configuration 27c4008 is described below commit 27c4008e89bec6ccbcd73f4db67fb124fb8bc6eb Author: mercyblitz AuthorDate: Wed Jun 20 16:14:42 2018 +0800 Update travis-ci configuration --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9764b2b..ef16343 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,6 @@ jdk: - openjdk7 script: mvn clean package + +after_success: + - bash <(curl -s https://codecov.io/bash) -t 89f70bf5-4d6b-4759-8da0-dfab7881fd3e \ No newline at end of file
