From f42dd3436d62a3ed3a7ad40e402339c9b43f1b24 Mon Sep 17 00:00:00 2001 From: KomachiSion <263976490@qq.com> Date: Fri, 12 Jun 2020 15:44:51 +0800 Subject: [PATCH] For #2873, unified copyrights for nacos-common. --- common/license | 15 ----------- common/pom.xml | 25 +++++++++++-------- .../alibaba/nacos/common/utils/MapUtils.java | 2 -- .../nacos/common/utils/MD5UtilsTest.java | 2 +- .../nacos/common/utils/MapUtilsTest.java | 18 ++++++++++++- resources/copyright | 14 +++++++++++ 6 files changed, 46 insertions(+), 30 deletions(-) delete mode 100644 common/license create mode 100644 resources/copyright diff --git a/common/license b/common/license deleted file mode 100644 index e2ccce1fa..000000000 --- a/common/license +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding 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. - */ \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index d59268a2b..2557a0d61 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,16 +1,19 @@ + ~ Copyright 1999-2018 Alibaba Group Holding 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. + --> diff --git a/common/src/main/java/com/alibaba/nacos/common/utils/MapUtils.java b/common/src/main/java/com/alibaba/nacos/common/utils/MapUtils.java index 97044ea21..97e0737b1 100644 --- a/common/src/main/java/com/alibaba/nacos/common/utils/MapUtils.java +++ b/common/src/main/java/com/alibaba/nacos/common/utils/MapUtils.java @@ -1,5 +1,4 @@ /* - * * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +12,6 @@ * 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. - * */ package com.alibaba.nacos.common.utils; diff --git a/common/src/test/java/com/alibaba/nacos/common/utils/MD5UtilsTest.java b/common/src/test/java/com/alibaba/nacos/common/utils/MD5UtilsTest.java index ffe76c1fb..0f3eee773 100644 --- a/common/src/test/java/com/alibaba/nacos/common/utils/MD5UtilsTest.java +++ b/common/src/test/java/com/alibaba/nacos/common/utils/MD5UtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2019 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/common/src/test/java/com/alibaba/nacos/common/utils/MapUtilsTest.java b/common/src/test/java/com/alibaba/nacos/common/utils/MapUtilsTest.java index 40d59fe02..8ade9b8b7 100644 --- a/common/src/test/java/com/alibaba/nacos/common/utils/MapUtilsTest.java +++ b/common/src/test/java/com/alibaba/nacos/common/utils/MapUtilsTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding 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. + */ + package com.alibaba.nacos.common.utils; import org.junit.Assert; @@ -47,4 +63,4 @@ public class MapUtilsTest { Assert.assertTrue(map.containsKey("key-map")); } -} \ No newline at end of file +} diff --git a/resources/copyright b/resources/copyright new file mode 100644 index 000000000..b7cc70113 --- /dev/null +++ b/resources/copyright @@ -0,0 +1,14 @@ + +Copyright 1999-2018 Alibaba Group Holding 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.