Merge branch 'master' of https://github.com/Maiklins/tutorials into JAVA-7244-Review_log_statements_for_projects

 Conflicts:

	algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java

algorithms-genetic/pom.xml

@@ -50,4 +50,4 @@
         <commons-codec.version>1.11</commons-codec.version>
     </properties>
 
-</project>
+</project>

algorithms-miscellaneous-5/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-commons</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -53,7 +53,6 @@
         <commons-codec.version>1.11</commons-codec.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <guava.version>28.1-jre</guava.version>
-        <junit.platform.version>1.6.0</junit.platform.version>
     </properties>
 
 </project>

algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/prim/PrimUnitTest.java

@@ -1,10 +1,10 @@
 package com.baeldung.algorithms.prim;
 
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-
 public class PrimUnitTest {
 
     @Test

algorithms-miscellaneous-6/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-commons</artifactId>
-            <version>${junit.platform.version}</version>
+            <version>${junit-platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -46,7 +46,6 @@
     <properties>
         <guava.version>28.1-jre</guava.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
-        <junit.platform.version>1.6.0</junit.platform.version>
         <commons-math3.version>3.6.1</commons-math3.version>
     </properties>
 

algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java

@@ -29,11 +29,13 @@ public class Graph {
         stack.push(start);
         while (!stack.isEmpty()) {
             int current = stack.pop();
-            isVisited[current] = true;
-            visit(current);
-            for (int dest : adjVertices.get(current)) {
-                if (!isVisited[dest])
-                    stack.push(dest);
+            if(!isVisited[current]){
+                isVisited[current] = true;
+                visit(current);
+                for (int dest : adjVertices.get(current)) {
+                    if (!isVisited[dest])
+                        stack.push(dest);
+                }
             }
         }
     }

algorithms-searching/src/main/java/com/baeldung/algorithms/suffixtree/SuffixTree.java

@@ -8,7 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SuffixTree {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(SuffixTree.class);
+
     private static final String WORD_TERMINATION = "$";
     private static final int POSITION_UNDEFINED = -1;
     private Node root;

algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java

@@ -2,7 +2,6 @@ package com.baeldung.algorithms.dfs;
 
 import java.util.List;
 
-import com.baeldung.algorithms.dfs.Graph;
 import org.junit.Test;
 
 public class GraphUnitTest {

algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java

@@ -10,7 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class QuadTreeSearchUnitTest {
-    
+
     private static final Logger LOGGER = LoggerFactory.getLogger(QuadTreeSearchUnitTest.class);
 
     private static QuadTree quadTree;
@@ -20,7 +20,7 @@ public class QuadTreeSearchUnitTest {
         Region area = new Region(0, 0, 400, 400);
         quadTree = new QuadTree(area);
 
-        float[][] points = new float[][] { { 21, 25 }, { 55, 53 }, { 70, 318 }, { 98, 302 }, 
+        float[][] points = new float[][] { { 21, 25 }, { 55, 53 }, { 70, 318 }, { 98, 302 },
             { 49, 229 }, { 135, 229 }, { 224, 292 }, { 206, 321 }, { 197, 258 }, { 245, 238 } };
 
         for (int i = 0; i < points.length; i++) {
@@ -35,26 +35,28 @@ public class QuadTreeSearchUnitTest {
     public void givenQuadTree_whenSearchingForRange_thenReturn1MatchingItem() {
         Region searchArea = new Region(200, 200, 250, 250);
         List<Point> result = quadTree.search(searchArea, null, "");
+
         LOGGER.debug(result.toString());
         LOGGER.debug(quadTree.printSearchTraversePath());
-       
+
         Assert.assertEquals(1, result.size());
-        Assert.assertArrayEquals(new float[] { 245, 238 }, 
+        Assert.assertArrayEquals(new float[] { 245, 238 },
             new float[]{result.get(0).getX(), result.get(0).getY() }, 0);
     }
-    
+
     @Test
     public void givenQuadTree_whenSearchingForRange_thenReturn2MatchingItems() {
         Region searchArea = new Region(0, 0, 100, 100);
         List<Point> result = quadTree.search(searchArea, null, "");
+
         LOGGER.debug(result.toString());
         LOGGER.debug(quadTree.printSearchTraversePath());
-        
+
         Assert.assertEquals(2, result.size());
-        Assert.assertArrayEquals(new float[] { 21, 25 }, 
+        Assert.assertArrayEquals(new float[] { 21, 25 },
             new float[]{result.get(0).getX(), result.get(0).getY() }, 0);
-        Assert.assertArrayEquals(new float[] { 55, 53 }, 
+        Assert.assertArrayEquals(new float[] { 55, 53 },
             new float[]{result.get(1).getX(), result.get(1).getY() }, 0);
-        
+
     }
 }

algorithms-sorting-2/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter-api.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -47,7 +47,6 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
-        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
     </properties>
 
 </project>

algorithms-sorting/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter-api.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -48,7 +48,6 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
-        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
     </properties>
 
 </project>

annotations/annotation-processing/pom.xml

@@ -10,7 +10,6 @@
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
         <artifactId>annotations</artifactId>
-        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>

annotations/annotation-user/pom.xml

@@ -10,7 +10,6 @@
         <groupId>com.baeldung</groupId>
         <artifactId>annotations</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>

apache-kafka/README.md

@@ -3,7 +3,7 @@
 This module contains articles about Apache Kafka.
 
 ### Relevant articles
-- [Kafka Streams vs Kafka Consumer](https://www.baeldung.com/java-kafka-streams-vs-kafka-consumer)
+- [Kafka Streams vs. Kafka Consumer](https://www.baeldung.com/java-kafka-streams-vs-kafka-consumer)
 - [Kafka Topic Creation Using Java](https://www.baeldung.com/kafka-topic-creation)
 - [Using Kafka MockConsumer](https://www.baeldung.com/kafka-mockconsumer)
 - [Using Kafka MockProducer](https://www.baeldung.com/kafka-mockproducer)

apache-kafka/pom.xml

@@ -161,6 +161,12 @@
             <artifactId>spark-cassandra-connector-java_2.11</artifactId>
             <version>${com.datastax.spark.spark-cassandra-connector-java.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <properties>
@@ -175,6 +181,7 @@
         <graphframes.version>0.8.1-spark3.0-s_2.12</graphframes.version>
         <com.datastax.spark.spark-cassandra-connector.version>2.5.2</com.datastax.spark.spark-cassandra-connector.version>
         <com.datastax.spark.spark-cassandra-connector-java.version>1.6.0-M1</com.datastax.spark.spark-cassandra-connector-java.version>
+        <lombok.version>1.18.20</lombok.version>
     </properties>
 
 </project>

apache-kafka/src/main/java/com/baeldung/kafka/dto/MessageDto.java

@@ -0,0 +1,15 @@
+package com.baeldung.kafka.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class MessageDto {
+    private String message;
+    private String version;
+}

apache-kafka/src/main/java/com/baeldung/kafka/serdes/CustomDeserializer.java

@@ -0,0 +1,35 @@
+package com.baeldung.kafka.serdes;
+
+import com.baeldung.kafka.dto.MessageDto;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Deserializer;
+
+import java.util.Map;
+
+public class CustomDeserializer implements Deserializer<MessageDto> {
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public void configure(Map<String, ?> configs, boolean isKey) {
+    }
+
+    @Override
+    public MessageDto deserialize(String topic, byte[] data) {
+        try {
+            if (data == null){
+                System.out.println("Null received at deserializing");
+                return null;
+            }
+            System.out.println("Deserializing...");
+            return objectMapper.readValue(new String(data, "UTF-8"), MessageDto.class);
+        } catch (Exception e) {
+            throw new SerializationException("Error when deserializing byte[] to MessageDto");
+        }
+    }
+
+    @Override
+    public void close() {
+    }
+}

apache-kafka/src/main/java/com/baeldung/kafka/serdes/CustomSerializer.java

@@ -0,0 +1,34 @@
+package com.baeldung.kafka.serdes;
+
+import com.baeldung.kafka.dto.MessageDto;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Serializer;
+
+import java.util.Map;
+
+public class CustomSerializer implements Serializer<MessageDto> {
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public void configure(Map<String, ?> configs, boolean isKey) {
+    }
+
+    @Override
+    public byte[] serialize(String topic, MessageDto data) {
+        try {
+            if (data == null){
+                System.out.println("Null received at serializing");
+                return null;
+            }
+            System.out.println("Serializing...");
+            return objectMapper.writeValueAsBytes(data);
+        } catch (Exception e) {
+            throw new SerializationException("Error when serializing MessageDto to byte[]");
+        }
+    }
+
+    @Override
+    public void close() {
+    }
+}

apache-kafka/src/test/java/com/baeldung/kafka/admin/KafkaTopicApplicationLiveTest.java

@@ -12,8 +12,10 @@ import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+// This live test needs a running Docker instance so that a kafka container can be created 
+
 @Testcontainers
-class KafkaTopicApplicationIntegrationTest {
+class KafkaTopicApplicationLiveTest {
 
     @Container
     private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"));

apache-kafka/src/test/java/com/baeldung/kafka/serdes/KafkaSerDesLiveTest.java

@@ -0,0 +1,94 @@
+package com.baeldung.kafka.serdes;
+
+import com.baeldung.kafka.dto.MessageDto;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.Assert.assertEquals;
+
+// This live test needs a Docker instance running so that kafka container can be created
+
+public class KafkaSerDesLiveTest {
+    private static final String CONSUMER_APP_ID = "consumer_id";
+    private static final String CONSUMER_GROUP_ID = "group_id";
+
+    @ClassRule
+    public static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"));
+    private final String TOPIC = "mytopic";
+
+    private static KafkaConsumer<String, MessageDto> createKafkaConsumer() {
+
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers());
+        props.put(ConsumerConfig.CLIENT_ID_CONFIG, CONSUMER_APP_ID);
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, CONSUMER_GROUP_ID);
+        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "com.baeldung.kafka.serdes.CustomDeserializer");
+
+        return new KafkaConsumer<>(props);
+
+    }
+
+    private static KafkaProducer<String, MessageDto> createKafkaProducer() {
+
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers());
+        props.put(ProducerConfig.CLIENT_ID_CONFIG, CONSUMER_APP_ID);
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, "com.baeldung.kafka.serdes.CustomSerializer");
+
+        return new KafkaProducer(props);
+
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @Test
+    public void givenKafkaClientShouldSerializeAndDeserialize() throws InterruptedException {
+
+        MessageDto msgProd = MessageDto.builder().message("test").version("1.0").build();
+
+        KafkaProducer<String, MessageDto> producer = createKafkaProducer();
+        producer.send(new ProducerRecord<String, MessageDto>(TOPIC, "1", msgProd));
+        System.out.println("Message sent " + msgProd);
+        producer.close();
+
+        Thread.sleep(2000);
+
+        AtomicReference<MessageDto> msgCons = new AtomicReference<>();
+
+        KafkaConsumer<String, MessageDto> consumer = createKafkaConsumer();
+        consumer.subscribe(Arrays.asList(TOPIC));
+
+        ConsumerRecords<String, MessageDto> records = consumer.poll(Duration.ofSeconds(1));
+        records.forEach(record -> {
+            msgCons.set(record.value());
+            System.out.println("Message received " + record.value());
+        });
+
+        consumer.close();
+
+        assertEquals(msgProd, msgCons.get());
+
+    }
+
+}
+
+

apache-kafka/src/test/java/com/baeldung/kafka/streamsvsconsumer/KafkaStreamsLiveTest.java

@@ -44,6 +44,8 @@ import static org.apache.kafka.clients.consumer.ConsumerConfig.BOOTSTRAP_SERVERS
 import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
 import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
 
+// This live test needs a Docker instance running so that kafka container can be created
+
 public class KafkaStreamsLiveTest {
     private final String LEFT_TOPIC = "left-stream-topic";
     private final String RIGHT_TOPIC = "right-stream-topic";

apache-libraries/pom.xml

@@ -133,6 +133,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.jayway.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -196,7 +201,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <avro.version>1.8.2</avro.version>
-        <slf4j.version>1.7.25</slf4j.version>
         <beam.version>2.19.0</beam.version>
         <assertj.version>3.9.0</assertj.version>
         <bval.version>1.1.2</bval.version>

apache-libraries/src/main/resources/log4j2.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.apache.meecrowave" level="warn">
+            <AppenderRef ref="Console"/>
+        </Logger>
+
+        <Root level="info">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>

apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java

@@ -10,7 +10,6 @@ import com.baeldung.apache.beam.intro.WordCount;
 public class WordCountUnitTest {
     
     @Test
-    // @Ignore
     public void givenInputFile_whenWordCountRuns_thenJobFinishWithoutError() {
         boolean jobDone = WordCount.wordCount("src/test/resources/wordcount.txt", "target/output");
         assertTrue(jobDone);

apache-poi/src/main/java/com/baeldung/poi/excel/multilinetext/MultilineText.java

@@ -0,0 +1,18 @@
+package com.baeldung.poi.excel.multilinetext;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+
+public class MultilineText {
+    public void formatMultilineText(Cell cell, int cellNumber) {
+        cell.getRow()
+            .setHeightInPoints(cell.getSheet()
+                .getDefaultRowHeightInPoints() * 2);
+        CellStyle cellStyle = cell.getSheet()
+            .getWorkbook()
+            .createCellStyle();
+        cellStyle.setWrapText(true);
+        cell.setCellStyle(cellStyle);
+    }
+}

apache-poi/src/test/java/com/baeldung/poi/excel/multilinetext/MultilineTextUnitTest.java

@@ -0,0 +1,69 @@
+package com.baeldung.poi.excel.multilinetext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.Before;
+import org.junit.Test;
+
+public class MultilineTextUnitTest {
+    private static String FILE_NAME = "com/baeldung/poi/excel/multilinetext/MultilineTextTest.xlsx";
+    private static final String NEW_FILE_NAME = "MultilineTextTest_output.xlsx";
+    private static final int STRING_ROW_INDEX = 1;
+    private static final int STRING_CELL_INDEX = 0;
+
+    private String fileLocation;
+
+    @Before
+    public void setup() throws IOException, URISyntaxException {
+        fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME)
+            .toURI())
+            .toString();
+    }
+
+    @Test
+    public void givenMultilineTextCell_whenFormated_thenMultilineTextVisible() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        sheet.createRow(STRING_ROW_INDEX);
+        Row row = sheet.getRow(STRING_ROW_INDEX);
+        Cell cell = row.createCell(STRING_CELL_INDEX);
+
+        cell.setCellValue("Hello \n world!");
+        MultilineText multilineText = new MultilineText();
+        multilineText.formatMultilineText(cell, STRING_CELL_INDEX);
+
+        FileOutputStream outputStream = new FileOutputStream(NEW_FILE_NAME);
+        workbook.write(outputStream);
+        outputStream.close();
+
+        File file = new File(NEW_FILE_NAME);
+        FileInputStream fileInputStream = new FileInputStream(file);
+        Workbook testWorkbook = new XSSFWorkbook(fileInputStream);
+        assertTrue(row.getHeightInPoints() == testWorkbook.getSheetAt(0)
+            .getRow(STRING_ROW_INDEX)
+            .getHeightInPoints());
+        DataFormatter formatter = new DataFormatter();
+        assertEquals("Hello \n world!", formatter.formatCellValue(testWorkbook.getSheetAt(0)
+            .getRow(STRING_ROW_INDEX)
+            .getCell(STRING_CELL_INDEX)));
+        testWorkbook.close();
+        fileInputStream.close();
+        file.delete();
+
+        workbook.close();
+    }
+}

apache-shiro/pom.xml

@@ -39,10 +39,6 @@
             <scope>runtime</scope>
         </dependency>
         <!-- spring-sec -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>

apache-spark/src/main/resources/log4j.properties

@@ -0,0 +1,42 @@
+#
+# 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.
+#
+
+# Set everything to be logged to the console
+log4j.rootCategory=WARN, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
+
+# Set the default spark-shell log level to WARN. When running the spark-shell, the
+# log level for this class is used to overwrite the root logger's log level, so that
+# the user can have different defaults for the shell and regular Spark apps.
+log4j.logger.org.apache.spark.repl.Main=WARN
+
+# Settings to quiet third party logs that are too verbose
+log4j.logger.org.spark_project.jetty=WARN
+log4j.logger.org.spark_project.jetty.util.component.AbstractLifeCycle=ERROR
+log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
+log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
+
+# SPARK-9183: Settings to avoid annoying messages when looking up nonexistent UDFs in SparkSQL with Hive support
+log4j.logger.org.apache.hadoop.hive.metastore.RetryingHMSHandler=FATAL
+log4j.logger.org.apache.hadoop.hive.ql.exec.FunctionRegistry=ERROR
+
+# Parquet related logging
+log4j.logger.org.apache.parquet.CorruptStatistics=ERROR
+log4j.logger.parquet.CorruptStatistics=ERROR

apache-tapestry/pom.xml

@@ -32,7 +32,6 @@
         <!-- Uncomment this to add support for file uploads: -->
         <!-- <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> 
             <version>${tapestry-release-version}</version> </dependency> -->
-
         <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the 
             tests) will fail, preventing Maven from packaging the WAR. Tapestry includes a large number of testing 
             facilities designed for use with TestNG (http://testng.org/), so it's recommended. -->
@@ -110,8 +109,6 @@
         </plugins>
     </build>
 
-    <reporting />
-
     <repositories>
         <repository>
             <id>jboss</id>

apache-thrift/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${org.slf4j.slf4j-simple.version}</version>
+            <version>${org.slf4j.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -61,7 +61,6 @@
     <properties>
         <thrift.version>0.10.0</thrift.version>
         <maven-thrift.version>0.1.11</maven-thrift.version>
-        <org.slf4j.slf4j-simple.version>1.7.12</org.slf4j.slf4j-simple.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
     </properties>