You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by li...@apache.org on 2019/01/25 01:54:26 UTC
[incubator-iotdb] branch master updated: ASF Header: remove the
rest '2019 Apache IoTDB(incubating)...' (#30)
This is an automated email from the ASF dual-hosted git repository.
liukun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2c03bb4 ASF Header: remove the rest '2019 Apache IoTDB(incubating)...' (#30)
2c03bb4 is described below
commit 2c03bb48904ecd7e6f05284be8d88a42143c22a8
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Fri Jan 25 09:54:22 2019 +0800
ASF Header: remove the rest '2019 Apache IoTDB(incubating)...' (#30)
---
.travis.yml | 24 +++++++++++++---------
Jenkinsfile | 13 ++++++------
checkstyle.xml | 1 -
iotdb/src/main/thrift/ServerService.thrift | 3 +--
pom.xml | 2 +-
.../scala/org/apache/iotdb/tsfile/Converter.scala | 16 +--------------
.../org/apache/iotdb/tsfile/DefaultSource.scala | 16 +--------------
.../apache/iotdb/tsfile/TsFileOutputWriter.scala | 16 +--------------
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 16 +--------------
.../scala/org/apache/iotdb/tsfile/package.scala | 16 +--------------
.../cn/edu/tsinghua/tsfile/ConverterTest.scala | 16 +--------------
.../scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala | 16 +--------------
.../resources/tsfile-format.properties.template | 13 ++++++------
13 files changed, 35 insertions(+), 133 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index de62552..93ff8c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,21 @@
+#!/bin/sh
#
-# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
-#
-# 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
+# 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.
+# 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.
#
# Since we don't have osx test environment, we use travis-ci to test on osx.
diff --git a/Jenkinsfile b/Jenkinsfile
index 10f3687..1571ad8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,6 @@
#!groovy
/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
* 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
@@ -13,11 +11,12 @@
*
* 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.
*/
pipeline {
diff --git a/checkstyle.xml b/checkstyle.xml
index 07ad0ba..5145a13 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/iotdb/src/main/thrift/ServerService.thrift b/iotdb/src/main/thrift/ServerService.thrift
index 5507c56..cdcc47c 100755
--- a/iotdb/src/main/thrift/ServerService.thrift
+++ b/iotdb/src/main/thrift/ServerService.thrift
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
namespace java org.apache.iotdb.db.postback.receiver
typedef i32 int
diff --git a/pom.xml b/pom.xml
index c6d2bf1..bbdbfa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,7 +307,7 @@
<!-- use mvn license:remove to remove license header; mvn license:format -->
<!-- we do not recommend using the plugin because it maybe out of control
(adding headers in some files that you do not want) -->
- <!-- <plugin>
+ <!--<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
index 0ca5aeb..5307e73 100755
--- a/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
+++ b/spark/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb.tsfile
import java.util
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala
index 1b2a800..85bed7c 100755
--- a/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala
+++ b/spark/src/main/scala/org/apache/iotdb/tsfile/DefaultSource.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb.tsfile
import java.io.{ObjectInputStream, ObjectOutputStream, _}
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala
index 3a17f6d..c4cbb9b 100644
--- a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala
+++ b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileOutputWriter.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb.tsfile
private[tsfile] class TsFileOutputWriter(
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala
index 1b9e2ef..3fef0a0 100644
--- a/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala
+++ b/spark/src/main/scala/org/apache/iotdb/tsfile/TsFileWriterFactory.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb.tsfile
private[tsfile] class TsFileWriterFactory(options: Map[String, String], columnNames: ArrayBuffer[String]) extends OutputWriterFactory {
diff --git a/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala b/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala
index c8e17b4..99753c8 100755
--- a/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala
+++ b/spark/src/main/scala/org/apache/iotdb/tsfile/package.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb
package object tsfile {
diff --git a/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala b/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala
index 55713be..1604266 100644
--- a/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala
+++ b/spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb.tsfile
import java.io.File
diff --git a/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala b/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala
index 93bf848..9b897db 100644
--- a/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala
+++ b/spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala
@@ -16,21 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
- * Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
- *
- * 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 org.apache.iotdb.tsfile
import java.io.File
diff --git a/tsfile/src/main/resources/tsfile-format.properties.template b/tsfile/src/main/resources/tsfile-format.properties.template
index 796be06..fb2c04f 100644
--- a/tsfile/src/main/resources/tsfile-format.properties.template
+++ b/tsfile/src/main/resources/tsfile-format.properties.template
@@ -1,6 +1,4 @@
#
-# Copyright © 2019 Apache IoTDB(incubating) (dev@iotdb.apache.org)
-#
# 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
@@ -11,11 +9,12 @@
#
# 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.
#