You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/12 01:35:27 UTC
[incubator-linkis] branch dev-1.2.0 updated: fix: fix Github repos page License display with Unknown licenses found (#2715)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new 993545916 fix: fix Github repos page License display with Unknown licenses found (#2715)
993545916 is described below
commit 993545916412e06d16b9cda382c0b5ab8b038f84
Author: Jack Xu <xu...@126.com>
AuthorDate: Fri Aug 12 09:35:20 2022 +0800
fix: fix Github repos page License display with Unknown licenses found (#2715)
fix #2701
---
tool/code-style-idea.xml | 57 +++++++++++++++++++++++++++++++++++
license-header => tool/license-header | 1 +
tool/modify_license.sh | 8 +++--
3 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/tool/code-style-idea.xml b/tool/code-style-idea.xml
new file mode 100644
index 000000000..e959c8e2f
--- /dev/null
+++ b/tool/code-style-idea.xml
@@ -0,0 +1,57 @@
+<!--
+ ~ 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.
+ -->
+
+<code_scheme name="Linkis" version="173">
+ <JavaCodeStyleSettings>
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="IMPORT_LAYOUT_TABLE">
+ <value>
+ <package name="org.apache.linkis" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org.apache" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org.springframework" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="java" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="scala" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="true" />
+ </value>
+ </option>
+ </JavaCodeStyleSettings>
+ <codeStyleSettings language="JAVA">
+ <option name="RIGHT_MARGIN" value="100" />
+ <indentOptions>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="2" />
+ </indentOptions>
+ </codeStyleSettings>
+ <codeStyleSettings language="XML">
+ <indentOptions>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="2" />
+ </indentOptions>
+ </codeStyleSettings>
+</code_scheme>
\ No newline at end of file
diff --git a/license-header b/tool/license-header
similarity index 99%
rename from license-header
rename to tool/license-header
index 3e7c6c26f..29400e587 100644
--- a/license-header
+++ b/tool/license-header
@@ -14,3 +14,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
diff --git a/tool/modify_license.sh b/tool/modify_license.sh
index f977bade5..8f4f270d5 100644
--- a/tool/modify_license.sh
+++ b/tool/modify_license.sh
@@ -6,7 +6,9 @@
# 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
+#
+# 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.
@@ -65,7 +67,9 @@ sh_license='''# \
# 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\
+#\
+# 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.\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org