You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/10/14 00:52:14 UTC
[incubator-iotdb] branch cherry-pick-from-rel0.8 created (now
672e1a5)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch cherry-pick-from-rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 672e1a5 change scm in pom from https to git protocol
This branch includes the following new commits:
new ef1cd27 change hive's copyright from 2019 to 2018 for being consistent with github.com/apache/hive NOTICE file
new 18d6f16 add apache-rat for .checkstyle file
new 672e1a5 change scm in pom from https to git protocol
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 02/03: add apache-rat for .checkstyle file
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-pick-from-rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 18d6f161c4da9afdf543994ace4903c5226d5461
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Sep 29 21:22:19 2019 +0800
add apache-rat for .checkstyle file
---
.checkstyle | 20 ++++++++++++++++++++
pom.xml | 2 --
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/.checkstyle b/.checkstyle
index c3770a3..8cb2e95 100644
--- a/.checkstyle
+++ b/.checkstyle
@@ -1,4 +1,24 @@
<?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.
+
+-->
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
<local-check-config name="google" location="checkstyle.xml" type="project" description="">
diff --git a/pom.xml b/pom.xml
index 164cc6c..e97a3e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,8 +465,6 @@
<exclude>licenses/*</exclude>
<!-- generated by Github -->
<exclude>.github/**</exclude>
- <!--Checkstyle files -->
- <exclude>.checkstyle</exclude>
<!--Generated by Apache Release -->
<exclude>local-snapshots-dir/**</exclude>
<!-- JSON can't contain comments and therefore no Apache header -->
[incubator-iotdb] 03/03: change scm in pom from https to git
protocol
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-pick-from-rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 672e1a5240afe503a98863c6a31fa37c4d8c6fa3
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Oct 14 08:51:45 2019 +0800
change scm in pom from https to git protocol
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index e97a3e9..4df42de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
</license>
</licenses>
<scm>
- <connection>scm:git:https://github.com/apache/incubator-iotdb.git</connection>
- <developerConnection>scm:git:https://github.com/apache/incubator-iotdb.git</developerConnection>
- <url>https://github.com/apache/incubator-iotdb</url>
+ <connection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/apache/incubator-iotdb.git</developerConnection>
+ <url>ssh://git@github.com:apache/incubator-iotdb.git</url>
<tag>rel/0.8</tag>
</scm>
<modules>
[incubator-iotdb] 01/03: change hive's copyright from 2019 to 2018
for being consistent with github.com/apache/hive NOTICE file
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch cherry-pick-from-rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ef1cd272ac7fc86c538be8d9e3d92012b4672de6
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sat Oct 5 18:05:20 2019 +0800
change hive's copyright from 2019 to 2018 for being consistent with github.com/apache/hive NOTICE file
---
NOTICE | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/NOTICE b/NOTICE
index abc3834..154d3c7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,7 +10,7 @@ IoTDB project uses 4 Chinese Patents:
* 201711384490X
* 201810111712.9
* 201711322631.5
-* 201711319331
+* 201711319331.1
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.
@@ -20,7 +20,7 @@ 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'
Apache Hive
-Copyright 2008-2019 The Apache Software Foundation
+Copyright 2008-2018 The Apache Software Foundation
This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
\ No newline at end of file
+Foundation (http://www.apache.org/).