You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/26 13:01:51 UTC
[incubator-servicecomb-java-chassis] branch master updated (50802c8
-> 40afa61)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 50802c8 Excluded the google style file from src release kit
new bf8fb56 SCB-431 Clean up the Rat setting and updated the header of RedisSession java
new 40e0236 SCB-431 Added the rat check to the travis CI
new 40afa61 SCB-431 Updated the license header of bmi application.yaml
The 3 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:
.../apache/servicecomb/demo/perf/RedisSession.java | 13 +++++----
pom.xml | 11 ++++----
.../bmi/webapp/src/main/resources/application.yaml | 33 +++++++++++-----------
scripts/travis.sh | 1 +
4 files changed, 31 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.
[incubator-servicecomb-java-chassis] 03/03: SCB-431 Updated the
license header of bmi application.yaml
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 40afa61936979ec98e47b257ee069a0dd85e8e06
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Mar 26 12:47:17 2018 +0800
SCB-431 Updated the license header of bmi application.yaml
---
.../bmi/webapp/src/main/resources/application.yaml | 33 +++++++++++-----------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/samples/bmi/webapp/src/main/resources/application.yaml b/samples/bmi/webapp/src/main/resources/application.yaml
index a1a82bb..0c901dc 100644
--- a/samples/bmi/webapp/src/main/resources/application.yaml
+++ b/samples/bmi/webapp/src/main/resources/application.yaml
@@ -1,18 +1,19 @@
-#
-# Copyright 2017 Huawei Technologies Co., Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
+## ---------------------------------------------------------------------------
+## 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.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## 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.
+## ---------------------------------------------------------------------------
zuul:
routes:
@@ -28,4 +29,4 @@ server:
servicecomb:
tracing:
- enabled: false
\ No newline at end of file
+ enabled: false
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.
[incubator-servicecomb-java-chassis] 01/03: SCB-431 Clean up the
Rat setting and updated the header of RedisSession java
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit bf8fb56320ac6eca64db01879ac9e1282ff38abb
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Mar 26 10:20:59 2018 +0800
SCB-431 Clean up the Rat setting and updated the header of RedisSession java
---
.../java/org/apache/servicecomb/demo/perf/RedisSession.java | 13 +++++++------
pom.xml | 11 ++++++-----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/RedisSession.java b/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/RedisSession.java
index 5f6b896..f9d657f 100644
--- a/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/RedisSession.java
+++ b/demo/perf/src/main/java/org/apache/servicecomb/demo/perf/RedisSession.java
@@ -1,11 +1,12 @@
/*
- * Copyright 2017 Huawei Technologies Co., Ltd
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/pom.xml b/pom.xml
index ec34a81..9f231e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,15 +209,16 @@
<exclude>**/*.md</exclude>
<excldue>**/*.MD</excldue>
<exclude>**/target/*</exclude>
+ <!-- Skip the code style configuration file -->
+ <exclude>**/etc/eclipse-java-google-style.xml</exclude>
+ <exclude>**/etc/intellij-java-google-style.xml</exclude>
<!-- Skip the ssl configuration files -->
<exculde>**/resources/ssl/**</exculde>
- <!-- Skip the protobuf files -->
- <exclude>**/*.proto</exclude>
- <!-- Skip the idl files -->
- <exclude>**/*.idl</exclude>
+ <!-- SKip the licenses files -->
+ <exclude>**/src/release/licenses/**</exclude>
<!-- Skip the demo log files -->
<exclude>**/logs/**.log</exclude>
- <!-- Skip the source files which are copied from vertx -->
+ <!-- Skip the source files which are forked from vertx -->
<exclude>**/io/vertx/ext/web/impl/MimeTypesUtils.java</exclude>
<exclude>**/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java</exclude>
</excludes>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.
[incubator-servicecomb-java-chassis] 02/03: SCB-431 Added the rat
check to the travis CI
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 40e0236ed47544f2e35371cd96d89b5350df1fd2
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Mar 26 10:21:17 2018 +0800
SCB-431 Added the rat check to the travis CI
---
scripts/travis.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 77112a8..fea030a 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -31,6 +31,7 @@ if [ "$1" == "install" ]; then
if [ "$TAGGEDCOMMIT" == "true" ]; then
echo "Skipping the installation as it is tagged commit"
else
+ mvn apache-rat:check -Pit,samples,distribution
mvn clean install -Ddocker.showLogs -Pdocker -Pjacoco -Pit -Pcoverage coveralls:report
if [ $? == 0 ]; then
echo "${green}Installation Success..${reset}"
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.