Merge pull request #1027 from hazendaz/master

Update jdks in GHA and normalize end of file markers

.github/workflows/ci.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 19, 20-ea]
+        java: [11, 17, 20, 21-ea]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 4

.github/workflows/coveralls.yaml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'

.github/workflows/eclipse-ci.yaml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [17, 19, 20-ea]
+        java: [17, 20, 21-ea]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 4

core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/jdk14/Jdk14LoggingLogFactory.java

@@ -23,4 +23,4 @@ public class Jdk14LoggingLogFactory implements AbstractLogFactory {
     public Log getLog(Class<?> clazz) {
         return new Jdk14LoggingImpl(clazz);
     }
-}
+}

core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/nologging/NoLoggingLogFactory.java

@@ -23,4 +23,4 @@ public class NoLoggingLogFactory implements AbstractLogFactory {
     public Log getLog(Class<?> clazz) {
         return new NoLoggingImpl();
     }
-}
+}

core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jLoggingLogFactory.java

@@ -23,4 +23,4 @@ public class Slf4jLoggingLogFactory implements AbstractLogFactory {
     public Log getLog(Class<?> clazz) {
         return new Slf4jImpl(clazz);
     }
-}
+}

core/mybatis-generator-core/src/main/resources/org/mybatis/generator/config/xml/mybatis-generator-config_1_0.dtd

@@ -252,4 +252,4 @@
 <!ELEMENT commentGenerator (property*)>
 <!ATTLIST commentGenerator
   type CDATA #IMPLIED>
-
+

core/mybatis-generator-core/src/site/xhtml/afterRunning.xhtml

@@ -83,4 +83,4 @@ elements after the <code>&lt;mappers&gt;</code> element.</p>
 in the manner applicable for your environment.</p>
 
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/migratingFromAbator.xhtml

@@ -92,4 +92,4 @@ and should be easy to deduce from the description of the XML changes.</p>
     this interface for some other execution environment, you will need to rework your implementation.</li>
 </ul>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/migratingFromIbator.xhtml

@@ -57,4 +57,4 @@ and should be easy to deduce from the description of the XML changes.</p>
     to <code>clientXXX</code>.</li>
 </ul>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/running/running.xhtml

@@ -57,4 +57,4 @@ web site page for information on installing the Eclipse plugin.</p>
      directory structure.  MBG will create these subdirectories if necessary.</li>
 </ul>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/running/runningFromCmdLine.xhtml

@@ -92,4 +92,4 @@
    java -cp mybatis-generator-core-x.x.x.jar org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite
 </pre>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/running/runningWithAnt.xhtml

@@ -113,4 +113,4 @@
    </li>
 </ul>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/running/runningWithEclipse.xhtml

@@ -71,4 +71,4 @@
   MyBatis Generator in eclipse will not overwrite any custom changes you make to the objects it generates.  You can
   run it over and over again without fear of losing custom changes.</p>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/running/runningWithMaven.xhtml

@@ -338,4 +338,4 @@ and that directory will be created if it doesn't already exist.  If not set to "
 <code>targetProject</code> will be interpreted as normal by MBG - it must be set
 to a directory that already exists.</p>
 </body>
-</html>
+</html>

core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml

@@ -934,4 +934,4 @@ will always be updated.</p>
   </li>
 </ul>
 </body>
-</html>
+</html>

core/mybatis-generator-systests-domtests/readme.md

@@ -25,4 +25,4 @@ The project hooks a code generation step into the standard Maven lifecycle.  We
 * [generate-test-sources phase] Your generator classes are executed and the output is added to the test
   source path
 * [test-compile phase] The output of your generator is compiled.  If it fails, it will break the build.  This is the primary test of generated code - that it compiles.  Any other tests you add to src/test/java are also compiled
-* [test phase] Any tests you create are executed.  You can write tests to execute your generated code if you so desire
+* [test phase] Any tests you create are executed.  You can write tests to execute your generated code if you so desire

eclipse/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.core/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.core.tests/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.core.tests/src/org/mybatis/generator/eclipse/core/tests/merge/resources/AwfulTable.java.src

@@ -613,4 +613,4 @@ public class AwfulTable extends AwfulTableKey {
         result = prime * result + ((getDbClass() == null) ? 0 : getDbClass().hashCode());
         return result;
     }
-}
+}

eclipse/org.mybatis.generator.eclipse.core.tests/src/org/mybatis/generator/eclipse/core/tests/merge/resources/AwfulTableExample.java.src

@@ -1415,4 +1415,4 @@ public class AwfulTableExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

eclipse/org.mybatis.generator.eclipse.core.tests/src/org/mybatis/generator/eclipse/core/tests/merge/resources/AwfulTableMapper.java.src

@@ -169,4 +169,4 @@ public interface AwfulTableMapper {
         "where \"CuStOmEr iD\" = #{customerId,jdbcType=INTEGER}"
     })
     int updateByPrimaryKey(AwfulTable record);
-}
+}

eclipse/org.mybatis.generator.eclipse.core/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.doc/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.site/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.test.utilities.tests/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.test.utilities.tests/src/org/mybatis/generator/eclipse/test/tests/resources/OuterClass.java.src

@@ -80,4 +80,4 @@ class SecondOuterClass {
     public void setId(int id) {
         this.id = id;
     }
-}
+}

eclipse/org.mybatis.generator.eclipse.test.utilities/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.ui.tests/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jLoggingLogFactory.java

@@ -24,4 +24,4 @@ public class Slf4jLoggingLogFactory implements AbstractLogFactory {
     public Log getLog(Class<?> clazz) {
         return new Slf4jImpl(clazz);
     }
-}
+}

eclipse/org.mybatis.generator.eclipse.ui/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/org.mybatis.generator.eclipse.ui/src/org/mybatis/generator/eclipse/ui/wizards/NewConfigFileWizard.java

@@ -210,4 +210,4 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
     public void init(IWorkbench workbench, ISelection selection) {
         this.selection = selection;
     }
-}
+}

eclipse/org.mybatis.generator.eclipse.ui/src/org/mybatis/generator/eclipse/ui/wizards/NewConfigFileWizardPage1.java

@@ -237,4 +237,4 @@ public String getLocation() {
     public String getFileName() {
         return fileText.getText();
     }
-}
+}

eclipse/org.mybatis.generator/license.txt

@@ -11,4 +11,4 @@
    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.
-
+

eclipse/releng/2021-06.target

@@ -11,4 +11,4 @@
 		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-</target>
+</target>