Skip to content
Permalink
Browse files
Merge branch 'master' into dev_merge
  • Loading branch information
jt2594838 committed Aug 12, 2019
2 parents 85785cc + a0e51c9 commit 09a1bf5320b45b070f9751de3f2c2f7e47092730
Showing 93 changed files with 2,456 additions and 811 deletions.
@@ -4,7 +4,6 @@
**/lib/**
**/data/**

tsfile/src/test/resources/perTestInputData
# Eclipse IDE files
**/.classpath
**/.project
@@ -84,4 +83,4 @@ grafana/data/test.csv
tsfile/src/test/resources/*.ts

### Apache release ###
local-snapshots-dir/
local-snapshots-dir/
@@ -1,21 +1,3 @@
/**
* 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.
*/
import java.util.Properties;

public class MavenWrapperDownloader {
@@ -1,21 +1,2 @@
#
# 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.
#

distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
#wrapperUrl=https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
@@ -217,6 +217,6 @@ The following classes are modified from Apache Hive, which is under Apache Licen

------------

The following class is modified from Maven Wrapper, which is under Apache License 2.0:
The following class is modified from Maven Wrapper

./mvn/wrapper/MavenWrapperDownloader.java
./.mvn/wrapper/MavenWrapperDownloader.java
@@ -210,24 +210,6 @@ conditions of the following licenses.

================================================================

The following classes are modified from Apache Hive, which is under Apache License 2.0:

./server/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
./server/src/main/java/org/apache/iotdb/db/sql/parse/AstNode.java
./server/src/main/java/org/apache/iotdb/db/sql/parse/AstNodeOrigin.java
./server/src/main/java/org/apache/iotdb/db/sql/parse/Node.java
./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseDriver.java
./server/src/main/java/org/apache/iotdb/db/sql/parse/ParseError.java
./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, which is under Apache License 2.0:

./mvn/wrapper/MavenWrapperDownloader.java
================================================================

The binary distribution of this product bundles these dependencies under the
following license. See licenses/ for text of these licenses.

39 NOTICE
@@ -1,49 +1,26 @@
Apache IoTDB
Copyright 2018 and onwards The Apache Software Foundation.
Copyright 2019 and onwards The Apache Software Foundation.

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

Export Control Notice
---------------------

This distribution includes cryptographic software. The country in which you currently reside may have
restrictions on the import, possession, use, and/or re-export to another country, of encryption software.
BEFORE using any encryption software, please check your country's laws, regulations and policies concerning
the import, possession, or use, and re-export of encryption software, to see if this is permitted. See
<http://www.wassenaar.org/> for more information.

The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this
software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software
using or performing cryptographic functions with asymmetric algorithms. The form and manner of this Apache
Software Foundation distribution makes it eligible for export under the License Exception ENC Technology
Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for
both object code and source code.

The following provides more details on the included cryptographic software:

This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to
support authentication, and encryption and decryption of data sent across the network between
services.

============================================================================

IoTDB project uses 4 Chinese Patents:
* 201711384490X
* 201810111712.9
* 201711322631.5
* 201711319331.1
* 201711319331

According to the Apache 2.0 License. The owner of the patents, Tsinghua University,
grant the users the right to the use of patent under the requirement of Apache 2.0 License.

============================================================================

This product contains a modified portion of 'Apache Hive', an open source
Java SE, which can be obtained at:
This product contains a modified portion of 'Apache Hive'

* LICENSE:
* https://github.com/apache/hive/blob/master/LICENSE (Apache License 2.0)
* HOMEPAGE:
* https://github.com/apache/hive
Apache Hive
Copyright 2008-2019 The Apache Software Foundation

============================================================================
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
@@ -1,31 +1,10 @@
Apache IoTDB
Copyright 2018 and onwards The Apache Software Foundation.
Copyright 2019 and onwards The Apache Software Foundation.

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

Export Control Notice
---------------------

This distribution includes cryptographic software. The country in which you currently reside may have
restrictions on the import, possession, use, and/or re-export to another country, of encryption software.
BEFORE using any encryption software, please check your country's laws, regulations and policies concerning
the import, possession, or use, and re-export of encryption software, to see if this is permitted. See
<http://www.wassenaar.org/> for more information.

The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this
software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software
using or performing cryptographic functions with asymmetric algorithms. The form and manner of this Apache
Software Foundation distribution makes it eligible for export under the License Exception ENC Technology
Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for
both object code and source code.

The following provides more details on the included cryptographic software:

This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/) to
support authentication, and encryption and decryption of data sent across the network between
services.

============================================================================

IoTDB project uses 4 Chinese Patents:
* 201711384490X
@@ -38,57 +17,10 @@ grant the users the right to the use of patent under the requirement of Apache 2

============================================================================

This product contains a modified portion of 'Apache Hive', an open source
Java SE, which can be obtained at:

* LICENSE:
* https://github.com/apache/hive/blob/master/LICENSE (Apache License 2.0)
* HOMEPAGE:
* https://github.com/apache/hive

============================================================================

The binary distribution of this product bundles binaries of
ch.qos.logback:logback-classic:1.1.11 and ch.qos.logback:logback-core:1.1.11 (https://logback.qos.ch/).
It has the following notices:

Logback: the reliable, generic, fast and flexible logging framework.
Copyright (C) 1999-2017, QOS.ch. All rights reserved.

This program and the accompanying materials are dual-licensed under
either the terms of the Eclipse Public License v1.0 as published by
the Eclipse Foundation

---

The binary distribution of this product bundles binaries of
javax.annotation:javax.annotation-api:1.3.2 (https://github.com/javaee/javax.annotation).
It has the following notices:

NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
LICENSE (CDDL)

The code released under the CDDL shall be governed by the laws of the
State of California (excluding conflict-of-law provisions). Any
litigation relating to this License shall be subject to the jurisdiction
of the Federal Courts of the Northern District of California and the
state courts of the State of California, with venue lying in Santa Clara
County, California.

---

The binary distribution of this product bundles binaries of
javax.activation:javax.activation-api:1.2.0 (https://docs.oracle.com/javase/7/docs/api/javax/activation/package-summary.html).
It has the following notices:

Copyright © 1993, 2018, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms. Also see the documentation redistribution policy.

---

The binary distribution of this product bundles binaries of
javax.xml.bind:jaxb-api:2.4.0-b180725.0427 (https://docs.oracle.com/javase/8/docs/api/javax/xml/bind/JAXB.html).
It has the following notices:
This product contains a modified portion of 'Apache Hive'

Copyright © 1993, 2018, Oracle and/or its affiliates. All rights reserved. Use is subject to license terms. Also see the documentation redistribution policy.
Apache Hive
Copyright 2008-2018 The Apache Software Foundation

---
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).

0 comments on commit 09a1bf5

Please sign in to comment.