Upgrade spring and lombok (#285)

* Bump lombok from 1.18.10 to 1.18.12

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.10 to 1.18.12.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.10...v1.18.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump spring-boot.version from 2.1.9.RELEASE to 2.2.5.RELEASE

Bumps `spring-boot.version` from 2.1.9.RELEASE to 2.2.5.RELEASE.

Updates `spring-boot-dependencies` from 2.1.9.RELEASE to 2.2.5.RELEASE
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.1.9.RELEASE...v2.2.5.RELEASE)

Updates `spring-boot-maven-plugin` from 2.1.9.RELEASE to 2.2.5.RELEASE
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.1.9.RELEASE...v2.2.5.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Configuration Properties no longer appears to work with File or Path

The base path also appears to have changed when running builder to be within the builder project.

* [changelog] updated

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

CHANGELOG.org

@@ -5,14 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-* [5.4.0] - 2020-03-17
+* [5.4.0] - 2020-03-18
 
 ** Changed
 
    - Replace Jenkins with Github Actions for CI (#282)
 
+** Removed
+
+   - Disable sevntu (#284)
+
 ** Dependencies
 
+ * Bump spring-boot.version from 2.1.9.RELEASE to 2.2.5.RELEASE (#279)
+ * Bump lombok from 1.18.10 to 1.18.12 (#272)
  * Bump checkstyle from 8.20 to 8.29 (#268)
  * Bump tiles-maven-plugin from 2.15 to 2.16 (#256)
  * Bump maven-checkstyle-plugin from 3.1.0 to 3.1.1 (#274)

builder/pom.xml

@@ -27,9 +27,9 @@
         <checkstyle.version>8.30</checkstyle.version>
         <sevntu.version>1.37.1</sevntu.version>
         <sevntu-plugin.version>1.35.0</sevntu-plugin.version>
-        <lombok.version>1.18.10</lombok.version>
+        <lombok.version>1.18.12</lombok.version>
         <spring-platform.version>Brussels-SR6</spring-platform.version>
-        <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
+        <spring-boot.version>2.2.5.RELEASE</spring-boot.version>
         <mapstream.version>3.2.7</mapstream.version>
         <map-builder.version>1.0.0</map-builder.version>
         <mockito.version>3.3.3</mockito.version>

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/OutputProperties.java

@@ -32,5 +32,5 @@ class OutputProperties {
     /**
      * The README.md file.
      */
-    private Path readme;
+    private String readme;
 }

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/ReadmeWriter.java

@@ -5,6 +5,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 /**
  * Writes the README file.
@@ -25,7 +26,7 @@ class ReadmeWriter implements CommandLineRunner {
     public void run(final String... args) throws Exception {
         Path templatePath = templateProperties.getReadmeTemplate();
         String templateBody = fileReader.read(templatePath);
-        Path outputPath = outputProperties.getReadme();
+        Path outputPath = Paths.get(outputProperties.getReadme());
         String outputBody = readmeBuilder.build(templateBody);
         fileWriter.write(outputPath, outputBody);
     }

builder/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 output:
-    directory: ruleset/src/main/resources/net/kemitix
+    directory: ../ruleset/src/main/resources/net/kemitix
     ruleset-files:
         DISABLED: checkstyle-0-disabled.xml
         LAYOUT: checkstyle-1-layout.xml
@@ -7,11 +7,11 @@ output:
         JAVADOC: checkstyle-3-javadoc.xml
         TWEAKS: checkstyle-4-tweaks.xml
         COMPLEXITY: checkstyle-5-complexity.xml
-    readme: README.md
+    readme: ../README.md
 template:
-    checkstyle-xml: builder/src/main/resources/checkstyle-template.xml
+    checkstyle-xml: src/main/resources/checkstyle-template.xml
-    readme-template: builder/src/main/resources/README-template.md
+    readme-template: src/main/resources/README-template.md
-    readme-fragments: builder/src/main/resources/rules
+    readme-fragments: src/main/resources/rules
 sources:
     -
         name: checkstyle

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/OutputPropertiesTest.java

@@ -27,7 +27,7 @@ public class OutputPropertiesTest {
         //given
         val directory = Paths.get("directory");
         val rulesetFiles = new HashMap<RuleLevel, String>();
-        val readme = Paths.get("readme.md");
+        val readme = "readme.md";
         //when
         outputProperties.setDirectory(directory);
         outputProperties.setRulesetFiles(rulesetFiles);

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/ReadmeWriterTest.java

@@ -1,25 +1,16 @@
 package net.kemitix.checkstyle.ruleset.builder;
 
-import lombok.val;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
+import java.nio.file.Paths;
 import java.util.UUID;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
 
@@ -47,8 +38,7 @@ public class ReadmeWriterTest {
 
     @Mock
     private Path templatePath;
-    @Mock
+    private String outputPath = UUID.randomUUID().toString();
-    private Path outputPath;
     private String templateBody = UUID.randomUUID().toString();
     private String formattedOutput = UUID.randomUUID().toString();
 
@@ -73,7 +63,7 @@ public class ReadmeWriterTest {
         //when
         readmeWriter.run();
         //then
-        verify(fileWriter).write(outputPath, formattedOutput);
+        verify(fileWriter).write(Paths.get(outputPath), formattedOutput);
     }
 
 }