Merge pull request #101 from hazendaz/master

hazendaz · web-flow · commit cdd37cc5676e · 2021-05-08T19:01:43.000-04:00
Update maven to 3.8.1, formatting license header
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2015-2020 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriver.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriver.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfig.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@
 import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
 
 import freemarker.template.Configuration;
-import freemarker.template.Version;
 
 /**
  * Configuration class for {@link FreeMarkerLanguageDriver}.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java b/src/main/java/org/mybatis/scripting/freemarker/FreeMarkerSqlSource.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/GeneratedParamsTemplateModel.java b/src/main/java/org/mybatis/scripting/freemarker/GeneratedParamsTemplateModel.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/MyBatisParamDirective.java b/src/main/java/org/mybatis/scripting/freemarker/MyBatisParamDirective.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java b/src/main/java/org/mybatis/scripting/freemarker/ParamObjectAdapter.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/scripting/freemarker/support/TemplateFilePathProvider.java b/src/main/java/org/mybatis/scripting/freemarker/support/TemplateFilePathProvider.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/CustomizedDataContextMapper.java b/src/test/java/org/mybatis/scripting/freemarker/CustomizedDataContextMapper.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/CustomizedDataContextTest.java b/src/test/java/org/mybatis/scripting/freemarker/CustomizedDataContextTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/FreeMarkerInAnnotationsTest.java b/src/test/java/org/mybatis/scripting/freemarker/FreeMarkerInAnnotationsTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/FreeMarkerInXmlTest.java b/src/test/java/org/mybatis/scripting/freemarker/FreeMarkerInXmlTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfigTest.java b/src/test/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriverConfigTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/InvalidFreeMarkerSettingTest.java b/src/test/java/org/mybatis/scripting/freemarker/InvalidFreeMarkerSettingTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/Name.java b/src/test/java/org/mybatis/scripting/freemarker/Name.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2017 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/NameMapper.java b/src/test/java/org/mybatis/scripting/freemarker/NameMapper.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/NameParam.java b/src/test/java/org/mybatis/scripting/freemarker/NameParam.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2017 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/PreparedParam.java b/src/test/java/org/mybatis/scripting/freemarker/PreparedParam.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2017 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/PreparedParamsMapper.java b/src/test/java/org/mybatis/scripting/freemarker/PreparedParamsMapper.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/PreparedParamsTest.java b/src/test/java/org/mybatis/scripting/freemarker/PreparedParamsTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2020 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/TemplateFilePathProviderMapper.java b/src/test/java/org/mybatis/scripting/freemarker/TemplateFilePathProviderMapper.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/TemplateFilePathProviderMapperTest.java b/src/test/java/org/mybatis/scripting/freemarker/TemplateFilePathProviderMapperTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/support/BaseMapper.java b/src/test/java/org/mybatis/scripting/freemarker/support/BaseMapper.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/support/TemplateFilePathProviderTest.java b/src/test/java/org/mybatis/scripting/freemarker/support/TemplateFilePathProviderTest.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/scripting/freemarker/support/TestMapper.java b/src/test/java/org/mybatis/scripting/freemarker/support/TestMapper.java
@@ -1,5 +1,5 @@
-/**
- *    Copyright 2015-2019 the original author or authors.
+/*
+ *    Copyright 2015-2021 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip`
	`1`	`+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip`
`2`	`2`	`wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-/**`
`2`		`- * Copyright 2015-2020 the original author or authors.`
	`1`	`+/*`
	`2`	`+ * Copyright 2015-2021 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`