Satisfy com.mycila:license-maven-plugin:4.2.

contrib/storage-kafka/pom.xml

@@ -32,7 +32,7 @@
 
   <properties>
     <kafka.version>2.8.2</kafka.version>
-    <kafka.TestSuite>**/TestKafkaSuit.class</kafka.TestSuite>
+    <kafka.TestSuite>**/TestKafkaSuite.class</kafka.TestSuite>
   </properties>
 
   <repositories>

contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaFilterPushdownTest.java

@@ -24,8 +24,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static org.apache.drill.exec.store.kafka.TestKafkaSuit.NUM_JSON_MSG;
-import static org.apache.drill.exec.store.kafka.TestKafkaSuit.embeddedKafkaCluster;
+import static org.apache.drill.exec.store.kafka.TestKafkaSuite.NUM_JSON_MSG;
+import static org.apache.drill.exec.store.kafka.TestKafkaSuite.embeddedKafkaCluster;
 import static org.junit.Assert.assertEquals;
 
 @Category({KafkaStorageTest.class, SlowTest.class})
@@ -36,7 +36,7 @@ public class KafkaFilterPushdownTest extends KafkaTestBase {
 
   @BeforeClass
   public static void setup() throws Exception {
-    TestKafkaSuit.createTopicHelper(TestQueryConstants.JSON_PUSHDOWN_TOPIC, NUM_PARTITIONS);
+    TestKafkaSuite.createTopicHelper(TestQueryConstants.JSON_PUSHDOWN_TOPIC, NUM_PARTITIONS);
     KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(),
       StringSerializer.class);
     generator.populateJsonMsgWithTimestamps(TestQueryConstants.JSON_PUSHDOWN_TOPIC, NUM_JSON_MSG);

contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java

@@ -41,7 +41,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.apache.drill.exec.store.kafka.TestKafkaSuit.embeddedKafkaCluster;
+import static org.apache.drill.exec.store.kafka.TestKafkaSuite.embeddedKafkaCluster;
 import static org.junit.Assert.fail;
 
 @FixMethodOrder(MethodSorters.JVM)
@@ -76,7 +76,7 @@ public void testResultLimit() throws Exception {
   @Test
   public void testResultCount() {
     String queryString = String.format(TestQueryConstants.MSG_SELECT_QUERY, TestQueryConstants.JSON_TOPIC);
-    runKafkaSQLVerifyCount(queryString, TestKafkaSuit.NUM_JSON_MSG);
+    runKafkaSQLVerifyCount(queryString, TestKafkaSuite.NUM_JSON_MSG);
   }
 
   @Test
@@ -91,7 +91,7 @@ public void testAvroResultCount() {
               KafkaAvroDeserializer.class.getName());
 
       String queryString = String.format(TestQueryConstants.MSG_SELECT_QUERY, TestQueryConstants.AVRO_TOPIC);
-      runKafkaSQLVerifyCount(queryString, TestKafkaSuit.NUM_JSON_MSG);
+      runKafkaSQLVerifyCount(queryString, TestKafkaSuite.NUM_JSON_MSG);
     } finally {
       client.resetSession(ExecConstants.KAFKA_RECORD_READER);
     }
@@ -209,7 +209,7 @@ public void testPhysicalPlanSubmissionAvro() throws Exception {
   @Test
   public void testOneMessageTopic() throws Exception {
     String topicName = "topicWithOneMessage";
-    TestKafkaSuit.createTopicHelper(topicName, 1);
+    TestKafkaSuite.createTopicHelper(topicName, 1);
     KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
     generator.populateMessages(topicName, "{\"index\": 1}");
 
@@ -224,7 +224,7 @@ public void testOneMessageTopic() throws Exception {
   @Test
   public void testMalformedRecords() throws Exception {
     String topicName = "topicWithMalFormedMessages";
-    TestKafkaSuit.createTopicHelper(topicName, 1);
+    TestKafkaSuite.createTopicHelper(topicName, 1);
     try {
       KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
       generator.populateMessages(topicName, "Test");
@@ -259,7 +259,7 @@ public void testMalformedRecords() throws Exception {
   @Test
   public void testNanInf() throws Exception {
     String topicName = "topicWithNanInf";
-    TestKafkaSuit.createTopicHelper(topicName, 1);
+    TestKafkaSuite.createTopicHelper(topicName, 1);
     try {
       KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
       generator.populateMessages(topicName, "{\"nan_col\":NaN, \"inf_col\":Infinity}");
@@ -287,7 +287,7 @@ public void testNanInf() throws Exception {
   @Test
   public void testEscapeAnyChar() throws Exception {
     String topicName = "topicWithEscapeAnyChar";
-    TestKafkaSuit.createTopicHelper(topicName, 1);
+    TestKafkaSuite.createTopicHelper(topicName, 1);
     try {
       KafkaMessageGenerator generator = new KafkaMessageGenerator(embeddedKafkaCluster.getKafkaBrokerList(), StringSerializer.class);
       generator.populateMessages(topicName, "{\"name\": \"AB\\\"\\C\"}");

contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaTestBase.java

@@ -43,11 +43,11 @@ public class KafkaTestBase extends ClusterTest {
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     // Make sure this test is only running as part of the suit
-    Assume.assumeTrue(TestKafkaSuit.isRunningSuite());
+    Assume.assumeTrue(TestKafkaSuite.isRunningSuite());
     ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher);
     startCluster(builder);
-    TestKafkaSuit.initKafka();
-    initKafkaStoragePlugin(TestKafkaSuit.embeddedKafkaCluster);
+    TestKafkaSuite.initKafka();
+    initKafkaStoragePlugin(TestKafkaSuite.embeddedKafkaCluster);
   }
 
   public static void initKafkaStoragePlugin(EmbeddedKafkaCluster embeddedKafkaCluster) throws Exception {
@@ -76,8 +76,8 @@ public static long testSql(String sql) {
 
   @AfterClass
   public static void tearDownKafkaTestBase() {
-    if (TestKafkaSuit.isRunningSuite()) {
-      TestKafkaSuit.tearDownCluster();
+    if (TestKafkaSuite.isRunningSuite()) {
+      TestKafkaSuite.tearDownCluster();
     }
   }
 }

contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java

@@ -48,7 +48,7 @@ public void setUp() {
     consumerProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, ByteArrayDeserializer.class);
     consumerProps.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "4");
     kafkaConsumer = new KafkaConsumer<>(consumerProps);
-    subScanSpec = new KafkaPartitionScanSpec(TestQueryConstants.JSON_TOPIC, 0, 0, TestKafkaSuit.NUM_JSON_MSG);
+    subScanSpec = new KafkaPartitionScanSpec(TestQueryConstants.JSON_TOPIC, 0, 0, TestKafkaSuite.NUM_JSON_MSG);
   }
 
   @After
@@ -105,6 +105,6 @@ public void testShouldReturnMessage2() {
       Assert.assertNotNull(consumerRecord);
       ++messageCount;
     }
-    Assert.assertEquals(TestKafkaSuit.NUM_JSON_MSG, messageCount);
+    Assert.assertEquals(TestKafkaSuite.NUM_JSON_MSG, messageCount);
   }
 }

contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java → contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuite.java

@@ -54,11 +54,11 @@
 @Category({KafkaStorageTest.class, SlowTest.class})
 @RunWith(Suite.class)
 @SuiteClasses({KafkaQueriesTest.class, MessageIteratorTest.class, MessageReaderFactoryTest.class, KafkaFilterPushdownTest.class})
-public class TestKafkaSuit extends BaseTest {
+public class TestKafkaSuite extends BaseTest {
 
   private static final Logger logger = LoggerFactory.getLogger(TestKafkaSuit.class);
 
-  private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.conf";
+  private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.jaasconf";
 
   public static EmbeddedKafkaCluster embeddedKafkaCluster;
 
@@ -104,7 +104,7 @@ public static boolean isRunningSuite() {
 
   @AfterClass
   public static void tearDownCluster() {
-    synchronized (TestKafkaSuit.class) {
+    synchronized (TestKafkaSuite.class) {
       if (initCount.decrementAndGet() == 0) {
         if (zkClient != null) {
           zkClient.close();

contrib/storage-kafka/src/test/resources/login.conf → contrib/storage-kafka/src/test/resources/login.jaasconf

@@ -22,4 +22,4 @@
 hadoop_simple {
   org.apache.hadoop.security.login.GenericOSLoginModule required;
   org.apache.hadoop.security.login.HadoopLoginModule required;
-};
+};

exec/java-exec/src/main/codegen/templates/Parser.jj

@@ -1,10 +1,11 @@
 /*
- * 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
+ * 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
  *

exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java

@@ -25,7 +25,7 @@
 
 public class ZookeeperTestUtil {
 
-  private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.conf";
+  private static final String LOGIN_CONF_RESOURCE_PATHNAME = "login.jaasconf";
 
   /**
    * Sets zookeeper server and client SASL test config properties.

exec/java-exec/src/test/resources/login.conf → exec/java-exec/src/test/resources/login.jaasconf

@@ -22,4 +22,4 @@
 hadoop_simple {
   org.apache.hadoop.security.login.GenericOSLoginModule required;
   org.apache.hadoop.security.login.HadoopLoginModule required;
-};
+};

exec/java-exec/src/test/resources/vault/read-vault-secrets.hcl

@@ -1,3 +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
@@ -13,6 +14,7 @@
 // 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.
+//
 
 path "secret/*"
 {