From 7bde2ff4de716abc24711f15f6ac136056f6060b Mon Sep 17 00:00:00 2001
From: Dmitriy Belyaev <dbelyaev@users.noreply.github.com>
Date: Tue, 17 Oct 2023 07:35:30 +0200
Subject: [PATCH 1/6] convert indent to spaces

---
 pom.xml | 135 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 69 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index 939d25f..73629e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <groupId>de.neuland-bfi</groupId>
-	<artifactId>spring-pug4j</artifactId>
+    <artifactId>spring-pug4j</artifactId>
     <version>3.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
-	<name>spring-pug4j</name>
-	<description>Spring interface to the Pug4J compiler (formerly known as spring-jade4j)</description>
+    <name>spring-pug4j</name>
+    <description>Spring interface to the Pug4J compiler (formerly known as spring-jade4j)</description>
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>9</version>
     </parent>
-    
+
     <url>https://github.com/neuland/spring-pug4j</url>
 
     <issueManagement>
@@ -58,12 +59,12 @@
         </developer>
     </developers>
 
-	<properties>
-		<org.springframework.version>6.0.3</org.springframework.version>
-		<servlet-api-version>6.0.0</servlet-api-version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <properties>
+        <org.springframework.version>6.0.3</org.springframework.version>
+        <servlet-api-version>6.0.0</servlet-api-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>8</maven.compiler.release>
-	</properties>
+    </properties>
 
     <profiles>
         <profile>
@@ -95,7 +96,7 @@
         </profile>
     </profiles>
 
-	<build>
+    <build>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -110,12 +111,12 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-		<plugins>
-			<plugin>
+        <plugins>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
-			</plugin>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -138,7 +139,7 @@
                     </execution>
                 </executions>
             </plugin>
-             <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.4.1</version>
@@ -160,54 +161,56 @@
                     <execution>
                         <id>deploy</id>
                         <phase>deploy</phase>
-                        <goals><goal>deploy</goal></goals>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
 
-	<dependencies>
+    <dependencies>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <version>${servlet-api-version}</version>
             <scope>provided</scope>
         </dependency>
-		<dependency>
-			<groupId>de.neuland-bfi</groupId>
-			<artifactId>pug4j</artifactId>
-			<version>2.0.6</version>
-		</dependency>
-
-		<!-- Spring framework -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${org.springframework.version}</version>
+        <dependency>
+            <groupId>de.neuland-bfi</groupId>
+            <artifactId>pug4j</artifactId>
+            <version>2.0.6</version>
+        </dependency>
+
+        <!-- Spring framework -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${org.springframework.version}</version>
             <scope>provided</scope>
-		</dependency>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework.version}</version>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${org.springframework.version}</version>
             <scope>provided</scope>
-		</dependency>
+        </dependency>
 
-		<dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-			<version>${org.springframework.version}</version>
+            <version>${org.springframework.version}</version>
             <scope>provided</scope>
-		</dependency>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${org.springframework.version}</version>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${org.springframework.version}</version>
             <scope>provided</scope>
-		</dependency>
+        </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
@@ -215,26 +218,26 @@
             <version>2.11.0</version>
         </dependency>
 
-		<!-- Other dependencies -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>2.0.6</version>
-		</dependency>
-
-		<!-- Test -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>2.0.6</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
-			<scope>test</scope>
-		</dependency>
+        <!-- Other dependencies -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.6</version>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

From 5b5bb1e818b7345ddf3b0cc4eb62100a3c1b2bad Mon Sep 17 00:00:00 2001
From: Dmitriy Belyaev <dbelyaev@users.noreply.github.com>
Date: Tue, 17 Oct 2023 07:36:28 +0200
Subject: [PATCH 2/6] remove unused import

---
 .../neuland/pug4j/spring/template/SpringTemplateLoaderTest.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/de/neuland/pug4j/spring/template/SpringTemplateLoaderTest.java b/src/test/java/de/neuland/pug4j/spring/template/SpringTemplateLoaderTest.java
index 2be6928..31c05c5 100644
--- a/src/test/java/de/neuland/pug4j/spring/template/SpringTemplateLoaderTest.java
+++ b/src/test/java/de/neuland/pug4j/spring/template/SpringTemplateLoaderTest.java
@@ -7,7 +7,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 
 import static org.junit.Assert.*;

From 55a7af2fbaad2dc84f654117806009581d24de67 Mon Sep 17 00:00:00 2001
From: Dmitriy Belyaev <dbelyaev@users.noreply.github.com>
Date: Tue, 17 Oct 2023 07:38:41 +0200
Subject: [PATCH 3/6] extract deps versions as properties

---
 pom.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73629e6..9df085a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,12 @@
         <servlet-api-version>6.0.0</servlet-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>8</maven.compiler.release>
+        <slf4j-simple.version>2.0.6</slf4j-simple.version>
+        <slf4j-api.version>2.0.6</slf4j-api.version>
+        <commons-io.version>2.11.0</commons-io.version>
+        <junit.version>4.13.2</junit.version>
+        <mockito-core.version>4.11.0</mockito-core.version>
+        <pug4j.version>2.0.6</pug4j.version>
     </properties>
 
     <profiles>
@@ -180,7 +186,7 @@
         <dependency>
             <groupId>de.neuland-bfi</groupId>
             <artifactId>pug4j</artifactId>
-            <version>2.0.6</version>
+            <version>${pug4j.version}</version>
         </dependency>
 
         <!-- Spring framework -->
@@ -215,33 +221,33 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>${commons-io.version}</version>
         </dependency>
 
         <!-- Other dependencies -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.6</version>
+            <version>${slf4j-api.version}</version>
         </dependency>
 
         <!-- Test -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.6</version>
+            <version>${slf4j-simple.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.11.0</version>
+            <version>${mockito-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 7d914048bd61ac6bf4ad7a8c03d723e115324d25 Mon Sep 17 00:00:00 2001
From: Dmitriy Belyaev <dbelyaev@users.noreply.github.com>
Date: Tue, 17 Oct 2023 07:41:14 +0200
Subject: [PATCH 4/6] upgrade dependencies to latest

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9df085a..13d8078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,16 +60,16 @@
     </developers>
 
     <properties>
-        <org.springframework.version>6.0.3</org.springframework.version>
+        <org.springframework.version>6.0.13</org.springframework.version>
         <servlet-api-version>6.0.0</servlet-api-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.release>8</maven.compiler.release>
-        <slf4j-simple.version>2.0.6</slf4j-simple.version>
-        <slf4j-api.version>2.0.6</slf4j-api.version>
-        <commons-io.version>2.11.0</commons-io.version>
+        <slf4j-simple.version>2.0.9</slf4j-simple.version>
+        <slf4j-api.version>2.0.9</slf4j-api.version>
+        <commons-io.version>2.14.0</commons-io.version>
         <junit.version>4.13.2</junit.version>
-        <mockito-core.version>4.11.0</mockito-core.version>
-        <pug4j.version>2.0.6</pug4j.version>
+        <mockito-core.version>5.6.0</mockito-core.version>
+        <pug4j.version>2.1.0</pug4j.version>
     </properties>
 
     <profiles>

From 41ef6a8e0941af8aef5dc9b08b21a652e3ddd32c Mon Sep 17 00:00:00 2001
From: Dmitriy Belyaev <dbelyaev@users.noreply.github.com>
Date: Tue, 17 Oct 2023 07:43:48 +0200
Subject: [PATCH 5/6] extract plugins versions as properties

---
 pom.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13d8078..e3a3e23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,13 @@
         <junit.version>4.13.2</junit.version>
         <mockito-core.version>5.6.0</mockito-core.version>
         <pug4j.version>2.1.0</pug4j.version>
+        <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
+        <maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
     </properties>
 
     <profiles>
@@ -86,7 +93,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>${maven-gpg-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -108,7 +115,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
+                    <version>${maven-release-plugin.version}</version>
                     <configuration>
                         <mavenExecutorId>forked-path</mavenExecutorId>
                         <useReleaseProfile>false</useReleaseProfile>
@@ -121,12 +128,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>${maven-compiler-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <useFile>false</useFile>
                     <trimStackTrace>false</trimStackTrace>
@@ -135,7 +142,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -148,7 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>${maven-javadoc-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -162,7 +169,7 @@
                 <!-- explicitly define maven-deploy-plugin after other to force exec order -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${maven-deploy-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>deploy</id>

From 6916cf040d7db4ae0bbfe073a64f0a3604a68a7b Mon Sep 17 00:00:00 2001
From: Dmitriy Belyaev <dbelyaev@users.noreply.github.com>
Date: Tue, 17 Oct 2023 07:44:30 +0200
Subject: [PATCH 6/6] upgrade plugins to latest

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e3a3e23..d35ccd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,12 +71,12 @@
         <mockito-core.version>5.6.0</mockito-core.version>
         <pug4j.version>2.1.0</pug4j.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
-        <maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
     </properties>
 
     <profiles>