[Java] fix license format conflict with checkstyle (#16)

* test ci * fix ci script * remove fury-benchmark
apache · May 3, 2023 · 5bb4c61 · 5bb4c61
1 parent eb3dfb4
commit 5bb4c61
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 10 deletions.
diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml
@@ -21,4 +21,4 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: 'temurin'
       - name: Build with Maven
-        run: .ci/run_ci.sh java${{ matrix.java-version }}
+        run: ./ci/run_ci.sh java${{ matrix.java-version }}
diff --git a/ci/run_ci.sh b/ci/run_ci.sh
@@ -46,7 +46,7 @@ case $1 in
       # check naming and others
       mvn -T16 checkstyle:check
       set +e
-      mvn -T16 test -pl '!fury-format,!fury-testsuite,!fury-benchmark'
+      mvn -T16 test -pl '!fury-format,!fury-testsuite'
       testcode=$?
       if [[ $testcode -ne 0 ]]; then
         exit $testcode

diff --git a/java/HEADER b/java/HEADER
@@ -1,4 +1,4 @@
-Copyright 2023 FURY.
+Copyright ${license.git.copyrightYears} The Fury authors
 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.

diff --git a/java/fury-core/src/main/java/io/fury/Fury.java b/java/fury-core/src/main/java/io/fury/Fury.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 FURY.
+ * Copyright 2023 The Fury authors
  * 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.

diff --git a/java/fury-core/src/test/java/io/fury/FuryTest.java b/java/fury-core/src/test/java/io/fury/FuryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 FURY.
+ * Copyright 2023 The Fury authors
  * 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.
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.fury;
 
 public class FuryTest {}
diff --git a/java/fury-format/src/main/java/io/fury/format/row/Row.java b/java/fury-format/src/main/java/io/fury/format/row/Row.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 FURY.
+ * Copyright 2023 The Fury authors
  * 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.

diff --git a/java/fury-format/src/test/java/io/fury/format/row/RowTest.java b/java/fury-format/src/test/java/io/fury/format/row/RowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 FURY.
+ * Copyright 2023 The Fury authors
  * 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.
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.fury.format.row;
 
 public class RowTest {}
diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java b/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 FURY.
+ * Copyright 2023 The Fury authors
  * 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.

diff --git a/java/license-format.xml b/java/license-format.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<additionalHeaders>
+  <SLASHSTART_WITH_BLANKLINE_STYLE>
+    <firstLine><![CDATA[/*]]></firstLine>
+    <beforeEachLine><![CDATA[ * ]]></beforeEachLine>
+    <endLine><![CDATA[ */EOL]]></endLine>
+    <firstLineDetectionPattern><![CDATA[(EOL)*(\s|\t)*/\*.*$]]></firstLineDetectionPattern>
+    <lastLineDetectionPattern><![CDATA[.*\*/(\s|\t)*$]]></lastLineDetectionPattern>
+    <allowBlankLines>false</allowBlankLines>
+    <isMultiline>true</isMultiline>
+    <padLines>false</padLines>
+  </SLASHSTART_WITH_BLANKLINE_STYLE>
+</additionalHeaders>
diff --git a/java/pom.xml b/java/pom.xml
@@ -33,7 +33,7 @@
     <arrow.version>5.0.0</arrow.version>
     <jackson-bom.version>2.13.2.20220328</jackson-bom.version>
     <commons_codec.version>1.13</commons_codec.version>
-    <license.maven.plugin>3.0</license.maven.plugin>
+    <license.maven.plugin>4.2</license.maven.plugin>
   </properties>
 
   <dependencyManagement>
@@ -233,17 +233,34 @@
           </execution>
         </executions>
         <configuration>
+          <properties>
+            <project.inceptionYear>2023</project.inceptionYear>
+          </properties>
           <quiet>true</quiet>
           <header>HEADER</header>
           <includes>
             <include>**/src/main/java/**</include>
             <include>**/src/test/java/**</include>
           </includes>
+          <excludes>
+            <exclude>**/util/Platform.java</exclude>
+          </excludes>
           <strictCheck>true</strictCheck>
+          <headerDefinitions>
+            <headerDefinition>license-format.xml</headerDefinition>
+          </headerDefinitions>
           <mapping>
-            <java>SLASHSTAR_STYLE</java>
+            <java>SLASHSTART_WITH_BLANKLINE_STYLE</java>
           </mapping>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.mycila</groupId>
+            <artifactId>license-maven-plugin-git</artifactId>
+            <!-- make sure same version as license-maven-plugin -->
+            <version>${license.maven.plugin}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>