You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by vg...@apache.org on 2024/02/23 08:58:44 UTC
(incubator-hugegraph) branch pd-store updated (b7f8b5673 -> 9fc3788d9)
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a change to branch pd-store
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
from b7f8b5673 fix(server): clean up the code (#2456)
new 168cf69ac fix: protobuf file header (#2448)
new 9fc3788d9 chore: improve license header checker confs and pre-check header when validating (#2445)
The 2 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.
Summary of changes:
.github/workflows/licence-checker.yml | 2 +-
.licenserc.yaml | 39 ++++++++++++----------
.../src/main/resources/proto/raft.proto | 18 +++++-----
pom.xml | 22 +++++++++++-
4 files changed, 52 insertions(+), 29 deletions(-)
(incubator-hugegraph) 01/02: fix: protobuf file header (#2448)
Posted by vg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a commit to branch pd-store
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 168cf69ac7c36606e5fb82254a13f1794f881983
Author: V_Galaxy <vg...@apache.org>
AuthorDate: Fri Feb 23 16:39:30 2024 +0800
fix: protobuf file header (#2448)
---
.../hugegraph-core/src/main/resources/proto/raft.proto | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hugegraph-server/hugegraph-core/src/main/resources/proto/raft.proto b/hugegraph-server/hugegraph-core/src/main/resources/proto/raft.proto
index b3591bea2..90403ce2d 100644
--- a/hugegraph-server/hugegraph-core/src/main/resources/proto/raft.proto
+++ b/hugegraph-server/hugegraph-core/src/main/resources/proto/raft.proto
@@ -1,18 +1,18 @@
/*
* 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
+ * 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.
+ * 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.
*/
syntax="proto2";
(incubator-hugegraph) 02/02: chore: improve license header checker confs and pre-check header when validating (#2445)
Posted by vg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a commit to branch pd-store
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 9fc3788d9ccc056d305683fc683593bb35431c85
Author: V_Galaxy <vg...@apache.org>
AuthorDate: Fri Feb 23 16:42:01 2024 +0800
chore: improve license header checker confs and pre-check header when validating (#2445)
* improve license header checker confs
* typo
* verify -> validate
* update rat exclude files
* empty commit
* update rat exclude files
* update rat exclude files
---
.github/workflows/licence-checker.yml | 2 +-
.licenserc.yaml | 39 +++++++++++++++++++----------------
pom.xml | 22 +++++++++++++++++++-
3 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml
index 7a8e5dcca..43ce6adf7 100644
--- a/.github/workflows/licence-checker.yml
+++ b/.github/workflows/licence-checker.yml
@@ -24,7 +24,7 @@ jobs:
token: ${{ github.token }}
config: .licenserc.yaml
- - name: License check(RAT)
+ - name: License Check (RAT)
run: |
mvn apache-rat:check -ntp
find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 809a6afb4..05b21db85 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -26,7 +26,9 @@ header: # `header` section is configurations for source codes license header.
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.
@@ -34,20 +36,20 @@ header: # `header` section is configurations for source codes license header.
limitations under the License.
# `pattern` is optional regexp if all the file headers are the same as `license` or the license of `spdx-id` and `copyright-owner`.
pattern: |
- Licensed to the Apache Software Foundation under one or more contributor
- license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright
- ownership. The Apache Software Foundation 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 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.
paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**'].
- '**'
@@ -89,14 +91,15 @@ header: # `header` section is configurations for source codes license header.
- '**/META-INF/MANIFEST.MF'
- '.repository/**'
- '**/.flattened-pom.xml'
- - '**/optimize/HugeScriptTraversal.java'
- - '**/type/Nameable.java'
- - '**/define/Cardinality.java'
- - '**/util/StringEncoding.java'
# TODO: temporarily added to the ignore list, need handle them before releases ( ↓ )
+ - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java'
+ - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java'
+ - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java'
+ - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java'
+ - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java'
+ - 'hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java'
- 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java'
- 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java'
- - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java'
- 'hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/metrics/ProcfsEntry.java'
- 'hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/metrics/ProcfsReader.java'
- 'hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/metrics/ProcfsSmaps.java'
diff --git a/pom.xml b/pom.xml
index b2528e3da..7442ff196 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
<exclude>**/*.map</exclude>
<exclude>**/*.properties</exclude>
<exclude>dist/**/*</exclude>
- <exclude>**/assembly/static/bin/hugegraph.service</exclude>
+ <exclude>**/bin/hugegraph.service</exclude>
<exclude>**/swagger-ui/**/*</exclude>
<exclude>scripts/dev/reviewers</exclude>
<exclude>scripts/dev/reviewers</exclude>
@@ -176,6 +176,11 @@
<!-- Maven -->
<exclude>.repository/**</exclude>
<exclude>**/.flattened-pom.xml</exclude>
+ <!-- Test generated data -->
+ <exclude>**/rocksdb-*/**</exclude>
+ <exclude>**/hbase-*/**</exclude>
+ <exclude>**/apache-cassandra-*/**</exclude>
+ <exclude>**/pid</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
</configuration>
@@ -208,6 +213,21 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>license-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<profiles>