You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/11/19 09:00:35 UTC
[incubator-iotdb] branch rel/0.9 updated: change maven-wrapper
header to ASF and remove LICENSE
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.9 by this push:
new 615f67c change maven-wrapper header to ASF and remove LICENSE
615f67c is described below
commit 615f67cbcce87b020b9de22650863d7382e8eee2
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Nov 19 16:59:25 2019 +0800
change maven-wrapper header to ASF and remove LICENSE
(cherry picked from commit d45fa1f1eebbb02d524ea1dbc57ef5bcd6262fe5)
---
.mvn/wrapper/MavenWrapperDownloader.java | 26 ++++++++++++++------------
LICENSE | 8 --------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index 7b3af06..afb969b 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -1,19 +1,21 @@
/*
- * Copyright 2007-present the original author or authors.
+ * 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,
- * 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.
+ * 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.
*/
-
import java.util.Properties;
public class MavenWrapperDownloader {
diff --git a/LICENSE b/LICENSE
index 41bd3d0..820bcc8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -215,14 +215,6 @@ The following classes are modified from Apache Hive, which is under Apache Licen
./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseException.java
./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
-
-------------
-
-The following class is modified from maven-wrapper (https://github.com/takari/maven-wrapper),
-which is under Apache License 2.0:
-
-./.mvn/wrapper/MavenWrapperDownloader.java
-
------------
The following class is modified from Apache commons-collections