Skip to content

Commit cb9d890

Browse files
HTHouHTHou
authored
Fix license issue and unify line break (#16)
1 parent 5211c9c commit cb9d890

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3981
-3146
lines changed

‎.dockerignore‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
**/.classpath
2-
**/.dockerignore
3-
**/.env
4-
**/.git
5-
**/.gitignore
6-
**/.project
7-
**/.settings
8-
**/.toolstarget
9-
**/.vs
10-
**/.vscode
11-
**/*.*proj.user
12-
**/*.dbmdl
13-
**/*.jfm
14-
**/azds.yaml
15-
**/bin
16-
**/charts
17-
**/docker-compose*
18-
**/Dockerfile*
19-
**/node_modules
20-
**/npm-debug.log
21-
**/obj
22-
**/secrets.dev.yaml
23-
**/values.dev.yaml
24-
LICENSE
25-
README.md
1+
**/.classpath
2+
**/.dockerignore
3+
**/.env
4+
**/.git
5+
**/.gitignore
6+
**/.project
7+
**/.settings
8+
**/.toolstarget
9+
**/.vs
10+
**/.vscode
11+
**/*.*proj.user
12+
**/*.dbmdl
13+
**/*.jfm
14+
**/azds.yaml
15+
**/bin
16+
**/charts
17+
**/docker-compose*
18+
**/Dockerfile*
19+
**/node_modules
20+
**/npm-debug.log
21+
**/obj
22+
**/secrets.dev.yaml
23+
**/values.dev.yaml
24+
LICENSE
25+
README.md

‎.gitattributes‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
* text=auto eol=lf

‎.github/workflows/dotnet.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ jobs:
2222
dotnet-version: '6.0.x'
2323
- name: Restore dependencies
2424
run: dotnet restore "src/Apache.IoTDB/Apache.IoTDB.csproj"
25+
- name: Check License Header
26+
# skywalking-eyes doesn't support windows
27+
if: runner.os == 'Linux'
28+
uses: apache/[email protected]
2529
- name: Build
2630
run: dotnet build --no-restore "src/Apache.IoTDB/Apache.IoTDB.csproj"
2731
- name: Test

‎.licenserc.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
header:
19+
license:
20+
spdx-id: Apache-2.0
21+
copyright-owner: Apache Software Foundation
22+
23+
paths-ignore:
24+
- 'docs'
25+
- 'src/Apache.IoTDB/Rpc/Generated'
26+
- '**/*.md'
27+
- '**/*.yml'
28+
- '**/*.json'
29+
- '**/*.csproj'
30+
- '**/*.dcproj'
31+
- 'LICENSE'
32+
- 'Apache.IoTDB.sln'
33+
- '.gitignore'
34+
- '.dockerignore'
35+
36+
comment: on-failure

‎Apache-IoTDB-Client-CSharp-UserCase/Apache-IoTDB-Client-CSharp-UserCase.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<PackageReference Include="Apache.IoTDB" Version="1.0.0.3" />
1212
</ItemGroup>
1313

14-
</Project>
14+
</Project>

‎Apache-IoTDB-Client-CSharp-UserCase/Program.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
120
using System;
221
using System.Collections.Generic;
322
using System.Threading;

‎Apache.IoTDB.sln‎

Lines changed: 129 additions & 129 deletions
Large diffs are not rendered by default.

‎LICENSE‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -199,38 +199,3 @@ Apache License
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202-
203-
--------------------------------------------------------------------------------
204-
APACHE IOTDB SUBCOMPONENTS
205-
--------------------------------------------------------------------------------
206-
207-
The following class is copied from maven-wrapper (https://github.com/takari/maven-wrapper),
208-
which is under Apache License 2.0:
209-
210-
./.mvn/wrapper/MavenWrapperDownloader.java
211-
212-
--------------------------------------------------------------------------------
213-
214-
The following class is modified from Apache commons-collections
215-
216-
./tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java
217-
Relevant pr is: https://github.com/apache/commons-collections/pull/83/
218-
219-
--------------------------------------------------------------------------------
220-
221-
The following files include code modified from Michael Burman's gorilla-tsc project.
222-
223-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java
224-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java
225-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java
226-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java
227-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java
228-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java
229-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java
230-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java
231-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java
232-
./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java
233-
234-
Copyright: 2016-2018 Michael Burman and/or other contributors
235-
Project page: https://github.com/burmanm/gorilla-tsc
236-
License: http://www.apache.org/licenses/LICENSE-2.0

‎docker-compose.dcproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
3-
<PropertyGroup Label="Globals">
4-
<ProjectVersion>2.1</ProjectVersion>
5-
<DockerTargetOS>Linux</DockerTargetOS>
6-
<ProjectGuid>4d457769-80cb-401f-9155-c3125c04facd</ProjectGuid>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<None Include="docker-compose.override.yml">
10-
<DependentUpon>docker-compose.yml</DependentUpon>
11-
</None>
12-
<None Include="docker-compose.yml" />
13-
<None Include=".dockerignore" />
14-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
3+
<PropertyGroup Label="Globals">
4+
<ProjectVersion>2.1</ProjectVersion>
5+
<DockerTargetOS>Linux</DockerTargetOS>
6+
<ProjectGuid>4d457769-80cb-401f-9155-c3125c04facd</ProjectGuid>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<None Include="docker-compose.override.yml">
10+
<DependentUpon>docker-compose.yml</DependentUpon>
11+
</None>
12+
<None Include="docker-compose.yml" />
13+
<None Include=".dockerignore" />
14+
</ItemGroup>
1515
</Project>

‎docker-compose.override.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: '3.4'
1+
version: '3.4'

0 commit comments

Comments
 (0)