This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch pre-1.0 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 92402448ce3e90fe8cc15a31b7ceabbe4ace7eb4 Author: Willem Jiang <jiangni...@huawei.com> AuthorDate: Sat Mar 24 10:09:11 2018 +0800 Excluded the google style file from src release kit --- etc/eclipse-java-google-style.xml | 17 ----------------- etc/intellij-java-google-style.xml | 17 ----------------- java-chassis-distribution/src/assembly/src.xml | 5 ++++- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/etc/eclipse-java-google-style.xml b/etc/eclipse-java-google-style.xml index 648bc73..3c01f05 100644 --- a/etc/eclipse-java-google-style.xml +++ b/etc/eclipse-java-google-style.xml @@ -1,22 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- - ~ 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. - --> - -<!-- ~ Creative Commons Google Style Guides by Google is licensed under CC BY 3.0 / changed right margin ~ https://github.com/google/styleguide ~ diff --git a/etc/intellij-java-google-style.xml b/etc/intellij-java-google-style.xml index 44de8ee..172c9de 100644 --- a/etc/intellij-java-google-style.xml +++ b/etc/intellij-java-google-style.xml @@ -1,22 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ 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. - --> - -<!-- ~ Creative Commons Google Style Guides by Google is licensed under CC BY 3.0 / changed right margin ~ https://github.com/google/styleguide ~ diff --git a/java-chassis-distribution/src/assembly/src.xml b/java-chassis-distribution/src/assembly/src.xml index a8b9f05..e06d7b2 100644 --- a/java-chassis-distribution/src/assembly/src.xml +++ b/java-chassis-distribution/src/assembly/src.xml @@ -29,8 +29,11 @@ <includes> <include>**/*</include> </includes> - <!-- excludes the binary files --> <excludes> + <!--exclude the style files which use CC License from source distribution--> + <exclude>etc/eclipse-java-google-style.xml</exclude> + <exclude>etc/intellij-java-google-style.xml</exclude> + <!-- excludes the binary files --> <exclude>**/eclipse-classes/**</exclude> <exclude>**/target/**</exclude> <exclude>**/build/**</exclude> -- To stop receiving notification emails like this one, please contact ningji...@apache.org.