You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/04/02 15:15:54 UTC

[shardingsphere] branch master updated: Merge the open source protocol files and modify the address of the spotless protocol files (#24960)

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new ef84730043a Merge the open source protocol files and modify the address of the spotless protocol files (#24960)
ef84730043a is described below

commit ef84730043a029d8b517701ab93f5e4b1db35e09
Author: 马称 <ma...@163.com>
AuthorDate: Sun Apr 2 23:15:47 2023 +0800

    Merge the open source protocol files and modify the address of the spotless protocol files (#24960)
---
 pom.xml                      |  2 +-
 src/resources/copyright.txt  |  1 +
 src/resources/license-header | 17 -----------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f777f1c5f8..15b78f77e69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -917,7 +917,7 @@
                             <file>src/resources/spotless.xml</file>
                         </eclipse>
                         <licenseHeader>
-                            <file>src/resources/license-header</file>
+                            <file>src/resources/copyright.txt</file>
                         </licenseHeader>
                     </java>
                     <pom>
diff --git a/src/resources/copyright.txt b/src/resources/copyright.txt
index 2944f981947..6a9c064171d 100644
--- a/src/resources/copyright.txt
+++ b/src/resources/copyright.txt
@@ -14,3 +14,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
diff --git a/src/resources/license-header b/src/resources/license-header
deleted file mode 100644
index 6a9c064171d..00000000000
--- a/src/resources/license-header
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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.
- */
-